5 files changed, 76 insertions, 55 deletions
diff --git a/games/dolphin-emu/README b/games/dolphin-emu/README
index e9eac0b60f06..1b0fe654412a 100644
--- a/games/dolphin-emu/README
+++ b/games/dolphin-emu/README
@@ -1,12 +1,11 @@
-Dolphin is a Gamecube, Wii and Triforce (the arcade machine based on
-the Gamecube) emulator which supports many extra features and
-abilities not present on the original consoles. Gamecube and Wii
-compatibility is good - one can expect "mainstream" titles to run;
-lesser known titles can be hit or miss. Triforce compatibility is
-currently limited to a couple of games - others require more of the
-Triforce-specific peripheral devices to be emulated.
+Dolphin is an emulator for two recent Nintendo video game consoles:
+the GameCube and the Wii. It allows PC gamers to enjoy games for these
+two consoles in full HD (1080p) with several enhancements:
+compatibility with all PC controllers, turbo speed, networked
+multiplayer, and even more!
 
-Optional dependencies: SFML, portaudio, soil, miniupnpc, soundtouch, 
-wxGTK3, gtest, and embedtls
+Optional dependencies: SFML, cubeb, fmt, gtest, hidapi, jack, mbedtls,
+miniupnpc, pugixml, qt6
 
-Optional dependencies (not on SBo): xxhash
+If you would like to disable Gameboy Advance controller support, pass
+USEMGBA=OFF to the build script. This will remove the mgba dependecy.
diff --git a/games/dolphin-emu/doinst.sh b/games/dolphin-emu/doinst.sh
index 65c7e2eeb9aa..262eb5a9e5eb 100644
--- a/games/dolphin-emu/doinst.sh
+++ b/games/dolphin-emu/doinst.sh
@@ -2,6 +2,11 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+# If other icon themes are installed, then add to/modify this as needed
 if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
     /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
diff --git a/games/dolphin-emu/dolphin-emu.SlackBuild b/games/dolphin-emu/dolphin-emu.SlackBuild
index 48b5ac42ac1b..11f291c226d4 100644
--- a/games/dolphin-emu/dolphin-emu.SlackBuild
+++ b/games/dolphin-emu/dolphin-emu.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for dolphin-emu
 
+# Copyright 2022 Steven Voges <Oregon, USA>
 # Copyright 2013-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
@@ -25,7 +26,14 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=dolphin-emu
-VERSION=${VERSION:-20210406_5322256}
+SRCNAM=dolphin
+VERSION=${VERSION:-20220903_1088021}
+SRCVER=${SRCVER:-1088021e39750c22ba622ab9e5065ffc32cb0e39}
+LIBSPNG=${LIBSPNG:-dc5b1032c08efac68ad30170f7ccbf0aa8dd55c9}
+MGBA=${MGBA:-40d4c430fc36caeb7ea32fd39624947ed487d2f2}
+SPIRVCROSS=${SPIRVCROSS:-50b4d5389b6a06f86fb63a2848e1a7da6d9755ca}
+ZLIBNG=${ZLIBNG:-a406284705a462939c7a634119884a31b87d6af9}
+USEMGBA=${USEMGBA:-ON}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -38,9 +46,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -49,6 +54,7 @@ fi
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
+DEPS=$TMP/$SRCNAM-$SRCVER/Externals
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -69,9 +75,21 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM/-*/}-$VERSION
-tar xvf $CWD/${PRGNAM/-*/}-$VERSION.tar.?z
-cd ${PRGNAM/-*/}-$VERSION
+rm -rf $SRCNAM-$SRCVER
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+
+tar xvf $CWD/SPIRV-Cross-$SPIRVCROSS.tar.gz -C \
+  $DEPS/spirv_cross/SPIRV-Cross --strip-components 1
+tar xvf $CWD/libspng-$LIBSPNG.tar.gz -C \
+  $DEPS/libspng/libspng --strip-components 1
+if [ ${USEMGBA} = "ON" ]; then
+  tar xvf $CWD/mgba-$MGBA.tar.gz -C \
+    $DEPS/mGBA/mgba --strip-components 1
+fi
+tar xvf $CWD/zlib-ng-$ZLIBNG.tar.gz -C \
+  $DEPS/zlib-ng/zlib-ng --strip-components 1
+
+cd $SRCNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -79,26 +97,21 @@ 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 {} \;
 
-mkdir build
+mkdir -p build
 cd build
-  cmake -G "Unix Makefiles" \
-    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -Dbindir=/usr/games \
-    -Dmandir=/usr/man \
-    -DLIB_INSTALL_DIR=lib${LIBDIRSUFFIX} \
-    -DENABLE_LTO:BOOL=ON \
-    -DUSE_SHARED_GTEST:BOOL=ON \
-    -DUSE_SHARED_ENET:BOOL=ON \
-    -DENABLE_SDL:BOOL=ON \
-    -DINSTALL_LIB_DIR=/usr/lib${LIBDIRSUFFIX} \
+  cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DDISTRIBUTOR="Slackware" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
+    -Dmandir=/usr/man \
+    -DDISTRIBUTOR=SlackBuilds.org \
+    -DENABLE_SDL=ON \
+    -DUSE_MGBA=$USEMGBA \
     -DCMAKE_BUILD_TYPE=Release ..
-
-  make VERBOSE=1
-  make install DESTDIR=$PKG
-cd -
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
 
 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
@@ -106,14 +119,10 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-for i in 16 32 64 128; do
-  convert Installer/Dolphin.ico -resize ${i}x${i}! $PRGNAM-${i}.png
-  install -D -m 0644 $PRGNAM-${i}-3.png \
-    $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png
-done
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a license.txt *.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  docs LICENSES/* COPYING Contributing.md Readme.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/dolphin-emu/dolphin-emu.info b/games/dolphin-emu/dolphin-emu.info
index ec31d42594b7..eeeafded0012 100644
--- a/games/dolphin-emu/dolphin-emu.info
+++ b/games/dolphin-emu/dolphin-emu.info
@@ -1,10 +1,18 @@
 PRGNAM="dolphin-emu"
-VERSION="20210406_5322256"
-HOMEPAGE="https://dolphin-emu.org/"
+VERSION="20220903_1088021"
+HOMEPAGE="https://dolphin-emu.org"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="http://ponce.cc/slackware/sources/repo/dolphin-20210406_5322256.tar.xz"
-MD5SUM_x86_64="d0d228fd5b4d3f55a37a779132c7cfa7"
+DOWNLOAD_x86_64="https://github.com/dolphin-emu/dolphin/archive/1088021e39750c22ba622ab9e5065ffc32cb0e39/dolphin-1088021e39750c22ba622ab9e5065ffc32cb0e39.tar.gz \
+                 https://github.com/KhronosGroup/SPIRV-Cross/archive/50b4d5389b6a06f86fb63a2848e1a7da6d9755ca/SPIRV-Cross-50b4d5389b6a06f86fb63a2848e1a7da6d9755ca.tar.gz \
+                 https://github.com/randy408/libspng/archive/dc5b1032c08efac68ad30170f7ccbf0aa8dd55c9/libspng-dc5b1032c08efac68ad30170f7ccbf0aa8dd55c9.tar.gz \
+                 https://github.com/mgba-emu/mgba/archive/40d4c430fc36caeb7ea32fd39624947ed487d2f2/mgba-40d4c430fc36caeb7ea32fd39624947ed487d2f2.tar.gz \
+                 https://github.com/zlib-ng/zlib-ng/archive/a406284705a462939c7a634119884a31b87d6af9/zlib-ng-a406284705a462939c7a634119884a31b87d6af9.tar.gz"
+MD5SUM_x86_64="04264aae02912f3f70973053949ac7ee \
+               ccbd4691aa98e09c48ca52938780f485 \
+               5c563b774605b0bad9f6ed244bd9e14d \
+               640f4014848dbe1e40d09a138956be38 \
+               7d4d0c4d98619529cd9368fa0b6cefda"
 REQUIRES=""
-MAINTAINER="Larry Hajali"
-EMAIL="larryhaja[at]gmail[dot]com"
+MAINTAINER="Steven Voges"
+EMAIL="svoges.sbo@gmail.com"
diff --git a/games/dolphin-emu/slack-desc b/games/dolphin-emu/slack-desc
index 4af1384e50a3..33779215cd34 100644
--- a/games/dolphin-emu/slack-desc
+++ b/games/dolphin-emu/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
            |-----handy-ruler------------------------------------------------------|
-dolphin-emu: dolphin-emu (Gamecube emulator)
+dolphin-emu: dolphin-emu (Gamecube/Wii Emulator)
+dolphin-emu:
+dolphin-emu: Dolphin is a GameCube / Wii emulator, allowing you to play games for
+dolphin-emu: these two platforms on PC with improvements. 
+dolphin-emu:
+dolphin-emu: Homepage: https://dolphin-emu.org
+dolphin-emu:
+dolphin-emu:
+dolphin-emu:
 dolphin-emu:
-dolphin-emu: Dolphin is a Gamecube, Wii and Triforce (the arcade machine based on
-dolphin-emu: the Gamecube) emulator which supports many extra features and
-dolphin-emu: abilities not present on the original consoles. Gamecube and Wii
-dolphin-emu: compatibility is good - one can expect "mainstream" titles to run;
-dolphin-emu: lesser known titles can be hit or miss. Triforce compatibility is
-dolphin-emu: currently limited to a couple of games - others require more of the
-dolphin-emu: Triforce-specific peripheral devices to be emulated.
 dolphin-emu:
-dolphin-emu: Homepage: https://dolphin-emu.org/