aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorM.Dinslage <daedra1980{at}gmail{dot}com>2010-04-18 22:14:00 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-05-15 10:38:24 +0200
commit5a4f2c84d3fd2b274b289c447bb98d9baf7dc060 (patch)
tree28578a28f09cd1f36bc9634f10724f07c9c1632c
parent8c5023e6e1a83a0d43a4570eb3c3aadb59921f84 (diff)
games/mupen64plus: Updated build with patch for gcc 4.4.
-rw-r--r--games/mupen64plus/gcc4.4-build.patch24
-rw-r--r--games/mupen64plus/mupen64plus.SlackBuild3
-rw-r--r--games/mupen64plus/mupen64plus.info5
3 files changed, 29 insertions, 3 deletions
diff --git a/games/mupen64plus/gcc4.4-build.patch b/games/mupen64plus/gcc4.4-build.patch
new file mode 100644
index 0000000000000..10c668a83ca5d
--- /dev/null
+++ b/games/mupen64plus/gcc4.4-build.patch
@@ -0,0 +1,24 @@
+diff -up ./glide64/Combine.cpp.00 ./glide64/Combine.cpp
+--- ./glide64/Combine.cpp.00 2010-01-28 12:08:11.367269059 -0800
++++ ./glide64/Combine.cpp 2010-01-28 12:08:55.142019819 -0800
+@@ -11873,7 +11873,7 @@ void InitCombine ()
+ LOG ("InitCombine() ");
+ memset(&cmb, 0, sizeof(cmb));
+ const char *extensions = grGetString (GR_EXTENSION);
+- if (char * extstr = strstr(extensions, "COMBINE")) {
++ if (char * extstr = (char *) strstr(extensions, "COMBINE")) {
+ if (!strncmp(extstr, "COMBINE", 7)) {
+ LOG ("extensions ");
+ cmb.grColorCombineExt = (GRCOLORCOMBINEEXT) grGetProcAddress("grColorCombineExt");
+diff -up ./glide64/Main.cpp.00 ./glide64/Main.cpp
+--- ./glide64/Main.cpp.00 2010-01-28 11:55:52.981269116 -0800
++++ ./glide64/Main.cpp 2010-01-28 11:59:22.810019317 -0800
+@@ -784,7 +784,7 @@ BOOL InitGfx (BOOL evoodoo_using_window)
+ printf("bebefore2\n");
+ if (settings.fb_hires)
+ {
+- if (char * extstr = strstr(extensions, "TEXTUREBUFFER"))
++ if (char * extstr = (char *) strstr(extensions, "TEXTUREBUFFER"))
+ {
+ if (!strncmp(extstr, "TEXTUREBUFFER", 13))
+ {
diff --git a/games/mupen64plus/mupen64plus.SlackBuild b/games/mupen64plus/mupen64plus.SlackBuild
index 4a35d08365dea..a4dcb5f89eff8 100644
--- a/games/mupen64plus/mupen64plus.SlackBuild
+++ b/games/mupen64plus/mupen64plus.SlackBuild
@@ -26,7 +26,7 @@
PRGNAM=mupen64plus
VERSION=${VERSION:-1.5}
ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
CWD=$(pwd)
@@ -57,6 +57,7 @@ cd $TMP || exit 1
rm -rf Mupen64Plus-1-5-src
tar xzvf $CWD/Mupen64Plus-1-5-src.tar.gz || exit 1
cd Mupen64Plus-1-5-src || exit 1
+patch -p1 < $CWD/gcc4.4-build.patch
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/games/mupen64plus/mupen64plus.info b/games/mupen64plus/mupen64plus.info
index c7380c19bd4a9..f6d8b0a32d449 100644
--- a/games/mupen64plus/mupen64plus.info
+++ b/games/mupen64plus/mupen64plus.info
@@ -6,6 +6,7 @@ MD5SUM="c224b045d343ff02f6f933d328861b01"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="M.Dinslage"
-EMAIL="daedra{at}charter{dot}net"
-APPROVED="pprkut"
+EMAIL="daedra1980{at}gmail{dot}com"
+APPROVED="dsomero"
+