games/fceux: Updated for version 2.2.0.

Updated underlink patch, cleanups.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

3 files changed, 20 insertions, 28 deletions

diff --git a/games/fceux/fceux-r2668.patch b/games/fceux/fceux-2.2.0-underlink.patch
index 8209efd94129..bdd25d32273c 100644
--- a/games/fceux/fceux-r2668.patch
+++ b/games/fceux/fceux-2.2.0-underlink.patch
@@ -1,31 +1,22 @@
-diff -Naur fceur2668.orig/SConstruct fceur2668/SConstruct
---- fceur2668.orig/SConstruct	2012-09-11 11:58:00.000000000 +0200
-+++ fceur2668/SConstruct	2012-09-17 11:11:09.082042995 +0200
-@@ -19,7 +19,7 @@
-   BoolVariable('LUA',       'Enable Lua support', 1),
+diff -up fceux/SConstruct.00 fceux/SConstruct
+--- fceux/SConstruct.00	2013-01-05 01:02:40.508959444 -0600
++++ fceux/SConstruct	2013-01-05 01:05:40.071959252 -0600
+@@ -22,7 +22,7 @@ opts.AddVariables(
+   BoolVariable('SYSTEM_LUA','Use system lua instead of static lua provided with fceux', 1),
    BoolVariable('NEWPPU',    'Enable new PPU core', 1),
    BoolVariable('CREATE_AVI', 'Enable avi creation support (SDL only)', 1),
--  BoolVariable('LOGO', 'Enable a logoscreen when creating avis (SDL only)', '1'),
-+  BoolVariable('LOGO', 'Enable a logoscreen when creating avis (SDL only)', '0'),
+-  BoolVariable('LOGO', 'Enable a logoscreen when creating avis (SDL only)', 1),
++  BoolVariable('LOGO', 'Enable a logoscreen when creating avis (SDL only)', 0),
    BoolVariable('GTK', 'Enable GTK2 GUI (SDL only)', 1),
    BoolVariable('GTK3', 'Enable GTK3 GUI (SDL only)', 0),
    BoolVariable('CLANG', 'Compile with llvm-clang instead of gcc', 0)
-@@ -30,8 +30,8 @@
- env = Environment(options = opts)
- 
- #### Uncomment this for a public release ###
--# env.Append(CPPDEFINES=["PUBLIC_RELEASE"])
--# env['DEBUG'] = 0
-+env.Append(CPPDEFINES=["PUBLIC_RELEASE"])
-+env['DEBUG'] = 0
- ############################################
- 
- # LSB_FIRST must be off for PPC to compile
-@@ -97,6 +97,7 @@
+@@ -100,6 +100,9 @@ else:
      env.ParseConfig('pkg-config --cflags --libs gtk+-3.0')
      env.Append(CPPDEFINES=["_GTK3"])
      env.Append(CCFLAGS = ["-D_GTK"])
-+  env.Append(LIBS =["-lz","-ldl"])
++  env.Append(LIBS =["-lz"])
++  env.Append(LIBS =["-ldl"])
++  env.Append(LIBS =["-lX11"])  
  
    ### Lua platform defines
    ### Applies to all files even though only lua needs it, but should be ok
diff --git a/games/fceux/fceux.SlackBuild b/games/fceux/fceux.SlackBuild
index 682a580ee79d..7e650d541a89 100644
--- a/games/fceux/fceux.SlackBuild
+++ b/games/fceux/fceux.SlackBuild
@@ -5,7 +5,7 @@
 # Written by M.Dinslage (daedra1980@gmail.com)
 
 PRGNAM=fceux
-VERSION=${VERSION:-r2668}
+VERSION=${VERSION:-2.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -41,9 +41,9 @@ set -e # Exit on most errors
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf fceu$VERSION
+rm -rf $PRGNAM
 tar xvf $CWD/$PRGNAM-$VERSION.src.tar.?z*
-cd fceu$VERSION
+cd $PRGNAM
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -52,7 +52,8 @@ find . \
  -exec chmod 644 {} \;
 
 # Fix underlinking and disable debug with a patch
-patch -p1 < $CWD/fceux-r2668.patch
+patch -p1 < $CWD/fceux-2.2.0-underlink.patch
+
 # Default prefix is /usr, set our CFLAGS
 sed -i \
   -e "s|/local||" \
@@ -76,7 +77,7 @@ cp -a documentation/* COPYING *.txt *.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 #Add icon and application launcher
-mkdir -p $PKG/usr/share/{applications,pixmaps}
+mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 cat $CWD/Nintendo.png > $PKG/usr/share/pixmaps/Nintendo.png
 
diff --git a/games/fceux/fceux.info b/games/fceux/fceux.info
index 57ee14d83392..9a68bf0d8a75 100644
--- a/games/fceux/fceux.info
+++ b/games/fceux/fceux.info
@@ -1,8 +1,8 @@
 PRGNAM="fceux"
-VERSION="r2668"
+VERSION="2.2.0"
 HOMEPAGE="http://fceux.com/web/home.html"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/fceux-r2668.src.tar.xz"
-MD5SUM="42dd2194ddf292baf9a55475faf27d9d"
+DOWNLOAD="http://downloads.sourceforge.net/fceultra/fceux-2.2.0.src.tar.gz"
+MD5SUM="d8ef1c5de018358d34bd6680fa7ba4b9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua scons"