summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/desmume/desmume.SlackBuild13
-rw-r--r--games/desmume/desmume.info6
-rw-r--r--games/desmume/doinst.sh1
-rw-r--r--games/desmume/glx_3Demu.cpp.patch10
-rw-r--r--games/desmume/glx_3Demu.h.patch9
5 files changed, 32 insertions, 7 deletions
diff --git a/games/desmume/desmume.SlackBuild b/games/desmume/desmume.SlackBuild
index 6e6f0118c1..431465adb0 100644
--- a/games/desmume/desmume.SlackBuild
+++ b/games/desmume/desmume.SlackBuild
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=desmume
-VERSION=${VERSION:-0.9.9}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.9.10}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -60,7 +60,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.tar
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -72,6 +72,12 @@ find -L . \
# Fix end-of-line encoding.
sed -i 's/\r//' AUTHORS
+# 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
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -84,6 +90,7 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-wifi \
--enable-openal \
--enable-glade \
+ --enable-glx \
--with-x \
--build=$ARCH-slackware-linux
diff --git a/games/desmume/desmume.info b/games/desmume/desmume.info
index 3365f8b5b5..711b170d97 100644
--- a/games/desmume/desmume.info
+++ b/games/desmume/desmume.info
@@ -1,8 +1,8 @@
PRGNAM="desmume"
-VERSION="0.9.9"
+VERSION="0.9.10"
HOMEPAGE="http://desmume.org/"
-DOWNLOAD="http://downloads.sourceforge.net/desmume/desmume-0.9.9.tar.gz"
-MD5SUM="458b5f8b3dbb38a47e6d0518f97aa82a"
+DOWNLOAD="http://downloads.sourceforge.net/desmume/desmume-0.9.10.tar.tar"
+MD5SUM="a6aedfe5d6437d481aa9ac5fb5aebbea"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="%README% OpenAL agg gtkglext soundtouch zziplib"
diff --git a/games/desmume/doinst.sh b/games/desmume/doinst.sh
index 4e8ba7071d..5fb28930db 100644
--- a/games/desmume/doinst.sh
+++ b/games/desmume/doinst.sh
@@ -1,4 +1,3 @@
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
-
diff --git a/games/desmume/glx_3Demu.cpp.patch b/games/desmume/glx_3Demu.cpp.patch
new file mode 100644
index 0000000000..a26415cfc6
--- /dev/null
+++ b/games/desmume/glx_3Demu.cpp.patch
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 0000000000..1e51d0098c
--- /dev/null
+++ b/games/desmume/glx_3Demu.h.patch
@@ -0,0 +1,9 @@
+--- 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