games/mupen64plus-libretro: Updated for version 2017.07.22_9b01671.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

4 files changed, 49 insertions, 41 deletions

diff --git a/games/mupen64plus-libretro/README b/games/mupen64plus-libretro/README
index 35caa3ac0f406..14ab07f33e7bf 100644
--- a/games/mupen64plus-libretro/README
+++ b/games/mupen64plus-libretro/README
@@ -1,16 +1,25 @@
-Mupen64Plus is a cross-platform plugin-based N64 emulator which is capable of
-accurately playing many games.
+mupen64plus-libretro is mupen64plus + GLideN64 + libretro.
 
-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
+This package was previously called GLupeN64.
+
+How is this different from parallel-n64?
+
+mupen64plus-libretro implements multiple Graphics plugins. There are also
+code modifications that make it different than standalone mupen64plus.
 
-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
+Mupen64Plus uses GLideN64 (a graphics plugin that is not available in
+mupen64plus-libretro). The emulator code itself is identical to
+standalone mupen64plus.
+
+By choosing one graphics plugin (GLideN64), we will be able to keep the
+code in line with upstream, and maintaining the code will be much simpler.
+
+mupen64plus-libretro optionally supports using OpenGL ES 2 and OpenGL ES 3
+instead of OpenGL which will require support in the libretro frontend, video
+card and driver. This can be done by building mupen64plus-libretro with:
+  GLES=1 ./mupen64plus-libretro.SlackBuild
+or
+  GLES3=1 ./mupen64plus-libretro.SlackBuild
 
 To build the debugging symbols use:
   DEBUG=1 ./mupen64plus-libretro.SlackBuild
diff --git a/games/mupen64plus-libretro/mupen64plus-libretro.SlackBuild b/games/mupen64plus-libretro/mupen64plus-libretro.SlackBuild
index dc949025055c5..86554b33f5b7a 100644
--- a/games/mupen64plus-libretro/mupen64plus-libretro.SlackBuild
+++ b/games/mupen64plus-libretro/mupen64plus-libretro.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mupen64plus-libretro
 
-# Copyright 2016 Hunter Sezen
+# Copyright 2017 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mupen64plus-libretro
-LIBNAM=$(echo $PRGNAM | tr - _)
-VERSION=${VERSION:-2017.02.04_78f37eca}
+LIBNAM=$(printf %s "$PRGNAM" | tr - _)
+VERSION=${VERSION:-2017.07.22_9b01671}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,17 +59,7 @@ fi
 
 DEBUG=${DEBUG:-0}
 GLES=${GLES:-0}
-VULKAN=${VULKAN:-0}
-if [ "$VULKAN" = "1" ]; then
-  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
-fi
+GLES3=${GLES3:-0}
 
 set -e
 
@@ -86,32 +76,41 @@ 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 DEBUG=$DEBUG \
-  GIT_VERSION=${VERSION#*_} \
-  FORCE_GLES=$GLES \
-  HAVE_VULKAN=$VULKAN \
-  HAVE_VULKAN_DEBUG=$VULKAN_DEBUG
+make DEBUG="$DEBUG" \
+  GIT_VERSION="${VERSION#*_}" \
+  FORCE_GLES="$GLES" \
+  FORCE_GLES3="$GLES3"
 
 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" ]; 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
 
-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"
+PLUGIN='GLideN64 mupen64plus-core mupen64plus-rsp-cxd4 mupen64plus-rsp-hle'
+DOCS='gpl-2.0.txt COPYING INSTALL LICENSES LICENSE README.md README RELEASE'
 
 for DOCDIR in $PLUGIN; do
   mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/$DOCDIR
+  if [ "$DOCDIR" = GLideN64 ]; then
+    for DIR in GlideHQ Glow gles2n64; do
+      mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/$DOCDIR/$DIR
+      for file in $DOCS; do
+        if [ -f $DOCDIR/licenses/$DIR/$file ]; then
+          cp -a $DOCDIR/licenses/$DIR/$file $PKG/usr/doc/$PRGNAM-$VERSION/$DOCDIR/$DIR
+        fi
+      done
+    done
+  fi
   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 *.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 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 3f8e7377cc347..df3452d8b286c 100644
--- a/games/mupen64plus-libretro/mupen64plus-libretro.info
+++ b/games/mupen64plus-libretro/mupen64plus-libretro.info
@@ -1,8 +1,8 @@
 PRGNAM="mupen64plus-libretro"
-VERSION="2017.02.04_78f37eca"
-HOMEPAGE="https://www.libretro.com/"
-DOWNLOAD="http://ks392457.kimsufi.com/orbea/stuff/slackbuilds/src/libretro/mupen64plus-libretro-2017.02.04_78f37eca.tar.xz"
-MD5SUM="90cbc72fdea68f8da53d85135e4aedff"
+VERSION="2017.07.22_9b01671"
+HOMEPAGE="https://github.com/libretro/mupen64plus-libretro"
+DOWNLOAD="http://ks392457.kimsufi.com/orbea/stuff/slackbuilds/src/libretro/mupen64plus-libretro-2017.07.22_9b01671.tar.xz"
+MD5SUM="8c57271a2262a04e16bf2d9ed0bd5b6a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
diff --git a/games/mupen64plus-libretro/slack-desc b/games/mupen64plus-libretro/slack-desc
index e43ded9098dcd..03e449e962765 100644
--- a/games/mupen64plus-libretro/slack-desc
+++ b/games/mupen64plus-libretro/slack-desc
@@ -6,11 +6,11 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                     |-----handy-ruler------------------------------------------------------|
-mupen64plus-libretro: mupen64plus-libretro (libretro port of Mupen64 Plus)
+mupen64plus-libretro: mupen64plus-libretro (mupen64plus + GLideN64 + libretro)
 mupen64plus-libretro:
-mupen64plus-libretro: Mupen64Plus is a cross-platform plugin-based Nintendo 64 emulator.
+mupen64plus-libretro: Mupen64 Plus libretro core that stays compatible with upstream.
 mupen64plus-libretro:
-mupen64plus-libretro: Homepage: https://www.libretro.com/
+mupen64plus-libretro: Homepage: https://github.com/libretro/mupen64plus-libretro
 mupen64plus-libretro:
 mupen64plus-libretro:
 mupen64plus-libretro: