5 files changed, 48 insertions, 43 deletions
diff --git a/games/fceux/README b/games/fceux/README
index 0250aa6a2f..8b0cf718e0 100644
--- a/games/fceux/README
+++ b/games/fceux/README
@@ -2,3 +2,5 @@ fceux is a Nintendo Entertainment System (NES), Famicom, and
 Famicom Disk System (FDS) emulator. It supports both PAL
 (European) and NTSC (USA/JPN) modes. It supports both Windows
 and SDL versions for cross compatibility.
+
+Optional dependencies are x264 and x265
diff --git a/games/fceux/fceux.SlackBuild b/games/fceux/fceux.SlackBuild
index af96722a1a..f856ad9b91 100644
--- a/games/fceux/fceux.SlackBuild
+++ b/games/fceux/fceux.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fceux
 
-# Copyright 2016 Matt Dinslage (daedra1980@gmail.com), Springfield, MO, USA
+# Copyright 2021 Matt Dinslage (daedra1980@gmail.com), Springfield, MO, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,36 +22,45 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=fceux
-VERSION=${VERSION:-2.2.3}
+VERSION=${VERSION:-2.6.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="'-O2', '-march=i486', '-mtune=i686'"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="'-O2', '-march=i686', '-mtune=i686'"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="'-O2', '-fPIC'"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="'-O2'"
+  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
@@ -61,7 +70,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.src.tar.?z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -70,20 +79,24 @@ 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 {} \;
 
-# Set our CFLAGS, move man pages, disable debub symbols
-sed -i \
-  -e "s|'-Wall'|${SLKCFLAGS}, '-Wall'|" \
-  -e "s|/share/man/man6/|/man/man6/|" \
-  -e "s|/share/man/man6/|/man/man6/|" \
-  -e "s|symbols', 1|symbols', 0|" \
-  -e "s|release', 0|release', 1|" \
-  SConstruct
-
-scons install -i --prefix=$PKG/usr
-
-# Delete low res icon and replace below, also delete unneeded .dll files
-rm -f $PKG/usr/share/pixmaps/fceux.png
-rm -f $PKG/usr/share/$PRGNAM/*.dll
+# Fix incorrect version name
+sed -i 's/-interim git//g' src/version.h
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+# remove unused files
+rm -rf $PKG/usr/share/$PRGNAM/*.dll
 
 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
@@ -92,15 +105,14 @@ 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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a documentation/* COPYING *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-#Add icon
-cat $CWD/fceux.png > $PKG/usr/share/pixmaps/fceux.png
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/games/fceux/fceux.desktop b/games/fceux/fceux.desktop
deleted file mode 100644
index c21ccf8a6a..0000000000
--- a/games/fceux/fceux.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Fceux
-GenericName=Nintendo/Famicon Emulator
-Exec=fceux
-Terminal=false
-Type=Application
-Categories=Game;Emulator;
-Icon=/usr/share/pixmaps/Nintendo.png
-StartupNotify=false
diff --git a/games/fceux/fceux.info b/games/fceux/fceux.info
index faa83b3399..31e6be5bd4 100644
--- a/games/fceux/fceux.info
+++ b/games/fceux/fceux.info
@@ -1,10 +1,10 @@
 PRGNAM="fceux"
-VERSION="2.2.3"
+VERSION="2.6.6"
 HOMEPAGE="http://fceux.com/web/home.html"
-DOWNLOAD="http://downloads.sourceforge.net/fceultra/fceux-2.2.3.src.tar.gz"
-MD5SUM="8002b161ea3342decce1abcca76db84a"
+DOWNLOAD="https://github.com/TASEmulators/fceux/archive/v2.6.6/fceux-2.6.6.tar.gz"
+MD5SUM="8e1aede624ebe26f0a936daba3b87328"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="libminizip"
 MAINTAINER="M.Dinslage"
 EMAIL="daedra1980@gmail.com"
diff --git a/games/fceux/fceux.png b/games/fceux/fceux.png
deleted file mode 100644
index a9e7823333..0000000000
--- a/games/fceux/fceux.png
+++ /dev/null