From de2474de319d1595dfe101811239b74a08dc2b0a Mon Sep 17 00:00:00 2001 From: Larry Hajali Date: Sat, 9 May 2015 13:19:02 +0700 Subject: games/desmume: Updated for version 0.9.11. Signed-off-by: Willy Sudiarto Raharjo --- games/desmume/desmume.SlackBuild | 28 +++++++++++++++------------- games/desmume/desmume.info | 6 +++--- games/desmume/glx_3Demu.cpp.patch | 10 ---------- games/desmume/glx_3Demu.h.patch | 9 --------- games/desmume/osmesa-header-fix.patch | 11 +++++++++++ 5 files changed, 29 insertions(+), 35 deletions(-) delete mode 100644 games/desmume/glx_3Demu.cpp.patch delete mode 100644 games/desmume/glx_3Demu.h.patch create mode 100644 games/desmume/osmesa-header-fix.patch (limited to 'games') diff --git a/games/desmume/desmume.SlackBuild b/games/desmume/desmume.SlackBuild index 0328af7223..4e5fec368b 100644 --- a/games/desmume/desmume.SlackBuild +++ b/games/desmume/desmume.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for desmume -# Copyright 2009-2013 Larry Hajali +# Copyright 2009-2015 Larry Hajali # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=desmume -VERSION=${VERSION:-0.9.10} +VERSION=${VERSION:-0.9.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -64,19 +64,21 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Fix end-of-line encoding. -sed -i 's/\r//' AUTHORS +for i in AUTHORS; do + cp -a $i ${i}.new + sed -i 's/\r//' ${i}.new + touch -r $i ${i}.new + mv ${i}.new $i +done -# From upstream. -# http://sourceforge.net/p/desmume/code/4907/ -# http://sourceforge.net/p/desmume/code/4919/ -patch -p3 < $CWD/glx_3Demu.cpp.patch -patch -p3 < $CWD/glx_3Demu.h.patch +# Fix missing header. +patch -p1 < $CWD/osmesa-header-fix.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -97,7 +99,7 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +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 find $PKG/usr/man -type f -exec gzip -9 {} \; diff --git a/games/desmume/desmume.info b/games/desmume/desmume.info index d12312a3e1..b06dd8381e 100644 --- a/games/desmume/desmume.info +++ b/games/desmume/desmume.info @@ -1,8 +1,8 @@ PRGNAM="desmume" -VERSION="0.9.10" +VERSION="0.9.11" HOMEPAGE="http://desmume.org/" -DOWNLOAD="http://downloads.sourceforge.net/desmume/desmume-0.9.10.tar.gz" -MD5SUM="a6aedfe5d6437d481aa9ac5fb5aebbea" +DOWNLOAD="http://downloads.sourceforge.net/desmume/desmume-0.9.11.tar.gz" +MD5SUM="269b5d4ddc5715720469a9d0efc53044" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="OpenAL agg gtkglext soundtouch zziplib" diff --git a/games/desmume/glx_3Demu.cpp.patch b/games/desmume/glx_3Demu.cpp.patch deleted file mode 100644 index a26415cfc6..0000000000 --- a/games/desmume/glx_3Demu.cpp.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/trunk/desmume/src/gtk/glx_3Demu.cpp -+++ b/trunk/desmume/src/gtk/glx_3Demu.cpp -@@ -31,7 +31,7 @@ - static GLXContext ctx; - static GLXPbuffer pbuf; - --void deinit_glx_3Demu(void) -+int deinit_glx_3Demu(void) - { - Display *dpy = glXGetCurrentDisplay(); diff --git a/games/desmume/glx_3Demu.h.patch b/games/desmume/glx_3Demu.h.patch deleted file mode 100644 index 1e51d0098c..0000000000 --- a/games/desmume/glx_3Demu.h.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/trunk/desmume/src/gtk/glx_3Demu.h -+++ b/trunk/desmume/src/gtk/glx_3Demu.h -@@ -20,5 +20,5 @@ - - #ifdef HAVE_GL_GLX - int init_glx_3Demu(void); --void deinit_glx_3Demu(void); -+int deinit_glx_3Demu(void); - #endif diff --git a/games/desmume/osmesa-header-fix.patch b/games/desmume/osmesa-header-fix.patch new file mode 100644 index 0000000000..7ba5bd070f --- /dev/null +++ b/games/desmume/osmesa-header-fix.patch @@ -0,0 +1,11 @@ +diff -Naur desmume-0.9.11.orig/src/gtk/osmesa_3Demu.cpp desmume-0.9.11/src/gtk/osmesa_3Demu.cpp +--- desmume-0.9.11.orig/src/gtk/osmesa_3Demu.cpp 2015-02-14 15:05:26.000000000 +0000 ++++ desmume-0.9.11/src/gtk/osmesa_3Demu.cpp 2015-05-09 02:00:11.279367208 +0000 +@@ -20,6 +20,7 @@ + + #ifdef HAVE_LIBOSMESA + #include ++#include + #include + #include "../OGLRender.h" + #include "osmesa_3Demu.h" -- cgit v1.2.3-80-g2a13