3 files changed, 31 insertions, 28 deletions
diff --git a/games/mupen64plus-libretro/README b/games/mupen64plus-libretro/README
index e0313bbe1a..35caa3ac0f 100644
--- a/games/mupen64plus-libretro/README
+++ b/games/mupen64plus-libretro/README
@@ -1,9 +1,14 @@
 Mupen64Plus is a cross-platform plugin-based N64 emulator which is capable of
 accurately playing many games.
 
-Vulkan can be used instead of opengl. This will require both a video card and
-driver that support it, but Slackware does not yet provide any Vulkan support,
-so providing the correct build environment is up to you.
+Mupen64Plus optionally supports using OpenGL ES 2 instead of OpenGL which
+will require support in the libretro frontend, video card and driver. This
+can be done by building Mupen64Plus with:
+  GLES=1 ./mupen64plus-libretro.SlackBuild
+
+Vulkan can be used instead of OpenGL. This will require both a video card and
+driver that supports it, but Slackware does not yet provide any Vulkan support,
+so providing the correct system environment is up to you.
 To build with Vulkan use:
   VULKAN=1 ./mupen64plus.SlackBuild
 
diff --git a/games/mupen64plus-libretro/mupen64plus-libretro.SlackBuild b/games/mupen64plus-libretro/mupen64plus-libretro.SlackBuild
index 98bcdcb39f..dc94902505 100644
--- a/games/mupen64plus-libretro/mupen64plus-libretro.SlackBuild
+++ b/games/mupen64plus-libretro/mupen64plus-libretro.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=mupen64plus-libretro
 LIBNAM=$(echo $PRGNAM | tr - _)
-VERSION=${VERSION:-2016.09.12_5b86c3e}
+VERSION=${VERSION:-2017.02.04_78f37eca}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,25 +46,26 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
-  DYNAREC=x86
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-  DYNAREC=x86
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  DYNAREC=$ARCH
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
-  DYNAREC=$ARCH
 fi
 
 DEBUG=${DEBUG:-0}
+GLES=${GLES:-0}
 VULKAN=${VULKAN:-0}
 if [ "$VULKAN" = "1" ]; then
-  LIBNAM=$(echo $LIBNAM | sed 's/mupen64plus/parallel/')
+  if [ "$DEBUG" = "1" ]; then
+    LIBNAM=$(echo $LIBNAM | sed 's/mupen64plus/parallel_debug/')
+  else
+    LIBNAM=$(echo $LIBNAM | sed 's/mupen64plus/parallel/')
+  fi
   VULKAN_DEBUG=$DEBUG
 else
   VULKAN_DEBUG=0
@@ -85,35 +86,32 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-make WITH_DYNAREC=$DYNAREC \
-  DEBUG=$DEBUG \
+make DEBUG=$DEBUG \
+  GIT_VERSION=${VERSION#*_} \
+  FORCE_GLES=$GLES \
   HAVE_VULKAN=$VULKAN \
   HAVE_VULKAN_DEBUG=$VULKAN_DEBUG
 
 install -Dm0644 $LIBNAM.so $PKG/usr/lib${LIBDIRSUFFIX}/libretro/$LIBNAM.so
 install -Dm0644 $LIBNAM.info $PKG/usr/lib${LIBDIRSUFFIX}/libretro/info/$LIBNAM.info
 
-if [ "${DEBUG:-0}" = "0" ]; then
+if [ "$DEBUG" = "0" ]; then
   find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
     | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 fi
 
-for DOCDIR in glide2gl mupen64plus-core mupen64plus-rsp-cxd4 mupen64plus-rsp-hle mupen64plus-video-angrylion; do
+PLUGIN="glide2gl mupen64plus-core mupen64plus-rsp-* mupen64plus-video-paraLLEl mupen64plus-video-angrylion"
+DOCS="COPYING CREDITS.txt INSTALL LICENSES MAME* README.md README RELEASE todo!.txt"
+
+for DOCDIR in $PLUGIN; do
   mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/$DOCDIR
+  for file in $DOCS; do
+    if [ -f $DOCDIR/$file ]; then
+      cp -a $DOCDIR/$file $PKG/usr/doc/$PRGNAM-$VERSION/$DOCDIR
+    fi
+  done
 done
 cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a glide2gl/todo!.txt $PKG/usr/doc/$PRGNAM-$VERSION/glide2gl
-
-CORE_DOCS="mupen64plus-core/INSTALL mupen64plus-core/LICENSES mupen64plus-core/README mupen64plus-core/RELEASE"
-CXD4_DOCS="mupen64plus-rsp-cxd4/COPYING mupen64plus-rsp-cxd4/README.md"
-HLE_DOCS="mupen64plus-rsp-hle/INSTALL mupen64plus-rsp-hle/LICENSES mupen64plus-rsp-hle/RELEASE"
-
-cp -a $CORE_DOCS $PKG/usr/doc/$PRGNAM-$VERSION/mupen64plus-core
-cp -a $CXD4_DOCS $PKG/usr/doc/$PRGNAM-$VERSION/mupen64plus-rsp-cxd4
-cp -a $HLE_DOCS $PKG/usr/doc/$PRGNAM-$VERSION/mupen64plus-rsp-hle
-
-cp -a mupen64plus-video-angrylion/*.txt $PKG/usr/doc/$PRGNAM-$VERSION/mupen64plus-video-angrylion
-
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/mupen64plus-libretro/mupen64plus-libretro.info b/games/mupen64plus-libretro/mupen64plus-libretro.info
index 546d03af8d..d9760a24b0 100644
--- a/games/mupen64plus-libretro/mupen64plus-libretro.info
+++ b/games/mupen64plus-libretro/mupen64plus-libretro.info
@@ -1,8 +1,8 @@
 PRGNAM="mupen64plus-libretro"
-VERSION="2016.09.12_5b86c3e"
+VERSION="2017.02.04_78f37eca"
 HOMEPAGE="http://www.libretro.com/"
-DOWNLOAD="http://ks392457.kimsufi.com/orbea/stuff/slackbuilds/src/libretro/mupen64plus-libretro-2016.09.12_5b86c3e.tar.xz"
-MD5SUM="6a3fa17d13232ef747f6ed6ef74ff161"
+DOWNLOAD="http://ks392457.kimsufi.com/orbea/stuff/slackbuilds/src/libretro/mupen64plus-libretro-2017.02.04_78f37eca.tar.xz"
+MD5SUM="90cbc72fdea68f8da53d85135e4aedff"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"