5 files changed, 71 insertions, 37 deletions
diff --git a/games/ppsspp/README b/games/ppsspp/README
index 3cf8d25c73..6c86e86d3b 100644
--- a/games/ppsspp/README
+++ b/games/ppsspp/README
@@ -10,3 +10,5 @@ made for the small screen of the original PSP.
 * Continue where you left off by transferring saves from your real PSP
 
 snappy is an optional dependency.
+
+Pass QT=ON to enable the Qt frontend (requires qt5).
diff --git a/games/ppsspp/ppsspp-qt.desktop b/games/ppsspp/ppsspp-qt.desktop
new file mode 100644
index 0000000000..e89a5f950f
--- /dev/null
+++ b/games/ppsspp/ppsspp-qt.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=ppsspp-qt
+Exec=ppsspp-qt
+Icon=ppsspp
+Type=Application
+Comment=ppsspp (fast and portable PSP emulator)
+Categories=Game
diff --git a/games/ppsspp/ppsspp.SlackBuild b/games/ppsspp/ppsspp.SlackBuild
index 739008e596..efc1380e3b 100644
--- a/games/ppsspp/ppsspp.SlackBuild
+++ b/games/ppsspp/ppsspp.SlackBuild
@@ -23,10 +23,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ppsspp
-VERSION=${VERSION:-2016.10.26_cc37528}
-SRCNAM=$(echo $PRGNAM | tr [a-z] [A-Z])
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+QT=${QT:-OFF}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -61,8 +61,19 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+
+# The submodules are in a separate archive. This is equivalent to
+# git submodule update --init --recursive
+tar xvf $CWD/${PRGNAM}_submodules-${VERSION}.tar.xz
+mv ${PRGNAM}_submodules-${VERSION}/ext/* ext
+rmdir ${PRGNAM}_submodules-${VERSION}/ext
+mv ${PRGNAM}_submodules-${VERSION}/assets/* assets
+rmdir ${PRGNAM}_submodules-${VERSION}/assets
+mv ${PRGNAM}_submodules-${VERSION}/* .
+rmdir ${PRGNAM}_submodules-${VERSION}
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,48 +81,53 @@ 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 {} \;
 
-# cmake 3.6 is required.
-# https://github.com/hrydgard/ppsspp/issues/9087
-sed -i 's/VERSION 3.6/VERSION 2.8.12/' CMakeLists.txt
+# This does build with Slackware 14.2's CMake.
+sed -i 's/VERSION 3.6/VERSION 3.5.2/' CMakeLists.txt
+
+# Don't force explicit ccache invocation.
+sed -i -e '/include(ccache)/d' CMakeLists.txt
 
 mkdir -p build
 cd build
+cmake \
+  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_SKIP_RPATH=TRUE \
+  -Wno-dev \
+  -DCMAKE_BUILD_TYPE=Release ..
+make
+cd ..
+
+if [ "$QT" = "ON" ]; then
+  mkdir build_qt
+  cd build_qt
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_SKIP_RPATH=TRUE \
     -Wno-dev \
+    -DUSING_QT_UI=ON \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-
-  # No install target
-  install -Dm0755 ${SRCNAM}SDL $PKG/usr/games/$PRGNAM
-  mkdir -p $PKG/usr/share/$PRGNAM
-  cp -a assets $PKG/usr/share/$PRGNAM
-cd ..
+  cd ..
+fi
 
 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
 
-# Install hicolor
-for dir in icons/hicolor/* ; do
-  if [ -f $dir/apps/$PRGNAM.png ]; then
-    install -Dm0644 $dir/apps/$PRGNAM.png $PKG/usr/share/$dir/apps/$PRGNAM.png
-  fi
-done
-install -Dm0644 icons/icon-512.svg $PKG/usr/share/pixmaps/$PRGNAM.svg
-
-# Write a desktop file
-mkdir -p $PKG/usr/share/applications
-cat > $PKG/usr/share/applications/$PRGNAM.desktop <<EOF
-[Desktop Entry]
-Name=$SRCNAM
-Exec=$PRGNAM
-Icon=$PRGNAM
-Type=Application
-Comment=$SRCNAM (fast and portable PSP emulator)
-Categories=Game
-EOF
+mkdir -p $PKG/usr/{games,share/{applications,icons/hicolor,pixmaps,ppsspp}}
+cp build/PPSSPPSDL $PKG/usr/games/ppsspp
+cp $CWD/ppsspp.desktop $PKG/usr/share/applications
+cp -r assets $PKG/usr/share/ppsspp
+cp -r icons/hicolor/* $PKG/usr/share/icons/hicolor
+cp icons/icon-512.svg $PKG/usr/share/pixmaps/ppsspp.svg
+
+if [ "$QT" = "ON" ]; then
+  cp build_qt/PPSSPPQt $PKG/usr/games/ppsspp-qt
+  cp $CWD/ppsspp-qt.desktop $PKG/usr/share/applications
+fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE.TXT README.md korean.txt chinese.txt $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/ppsspp/ppsspp.desktop b/games/ppsspp/ppsspp.desktop
new file mode 100644
index 0000000000..74dd7f4cde
--- /dev/null
+++ b/games/ppsspp/ppsspp.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=ppsspp
+Exec=ppsspp
+Icon=ppsspp
+Type=Application
+Comment=ppsspp (fast and portable PSP emulator)
+Categories=Game
diff --git a/games/ppsspp/ppsspp.info b/games/ppsspp/ppsspp.info
index 5abe7da123..879d0f8f35 100644
--- a/games/ppsspp/ppsspp.info
+++ b/games/ppsspp/ppsspp.info
@@ -1,10 +1,12 @@
 PRGNAM="ppsspp"
-VERSION="2016.10.26_cc37528"
+VERSION="1.4"
 HOMEPAGE="http://www.ppsspp.org/"
-DOWNLOAD="http://ks392457.kimsufi.com/orbea/stuff/slackbuilds/src/ppsspp-2016.10.26_cc37528.tar.xz"
-MD5SUM="be5bcbe0d2513b1503abcc6ce577212d"
+DOWNLOAD="https://github.com/hrydgard/ppsspp/archive/v1.4/ppsspp-1.4.tar.gz \
+          http://duganchen.ca/files/sbo_sources/ppsspp_submodules-1.4.tar.xz"
+MD5SUM="4461e8f749a67089dba9c693674a8c9b \
+        4031eaa89766e192a1d0da844a5c896c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2"
-MAINTAINER="Hunter Sezen"
-EMAIL="ovariegata@yahoo.com"
+MAINTAINER="Dugan Chen"
+EMAIL="thedoogster [at] gmail [dot] com"