summaryrefslogtreecommitdiff
path: root/games/jfsw
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2016-06-08 00:47:50 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-06-08 08:33:37 +0700
commitcd466c87ec47ba8a62f64d29aa3c14ce05428049 (patch)
tree5e0070bb07b2de32a639733ebf7145dbf58eb625 /games/jfsw
parent4136928a177d2fd29c739348674cf4994ee9757f (diff)
downloadslackbuilds-cd466c87ec47ba8a62f64d29aa3c14ce05428049.tar.gz
games/jfsw: Fix build with gcc-5.3.
Signed-off-by: David Spencer <baildon.research@googlemail.com>
Diffstat (limited to 'games/jfsw')
-rw-r--r--games/jfsw/jfsw-use-me.patch19
-rw-r--r--games/jfsw/jfsw.SlackBuild22
-rw-r--r--games/jfsw/jfsw.info8
3 files changed, 34 insertions, 15 deletions
diff --git a/games/jfsw/jfsw-use-me.patch b/games/jfsw/jfsw-use-me.patch
new file mode 100644
index 0000000000..fac46fff2f
--- /dev/null
+++ b/games/jfsw/jfsw-use-me.patch
@@ -0,0 +1,19 @@
+diff -u -r jfsw-orig/jfbuild/src/kplib.c jfsw/jfbuild/src/kplib.c
+--- jfsw-orig/jfbuild/src/kplib.c 2016-02-20 06:31:24.000000000 +0000
++++ jfsw/jfbuild/src/kplib.c 2016-06-08 00:12:21.495980101 +0100
+@@ -181,13 +181,13 @@
+ static int gslidew = 0, gslider = 0, xm, xmn[4], xr0, xr1, xplc, yplc;
+ static INT_PTR nfplace;
+ static int clen[320], cclen[19], bitpos, filt, xsiz, ysiz;
+-static int xsizbpl, ixsiz, ixoff, iyoff, ixstp, iystp, intlac, nbpl, trnsrgb ASMNAME("trnsrgb");
++static int xsizbpl, ixsiz, ixoff, iyoff, ixstp, iystp, intlac, nbpl, __attribute__((used)) trnsrgb ASMNAME("trnsrgb");
+ static int ccind[19] = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
+ static int hxbit[59][2], ibuf0[288], nbuf0[32], ibuf1[32], nbuf1[32];
+ static const unsigned char *filptr;
+ static unsigned char slidebuf[32768], opixbuf0[4], opixbuf1[4];
+ static unsigned char pnginited = 0, olinbuf[65536] ASMNAME("olinbuf"); //WARNING:max xres is: 65536/bpp-1
+-static int gotcmov = -2, abstab10[1024] ASMNAME("abstab10");
++static int gotcmov = -2, __attribute__((used)) abstab10[1024] ASMNAME("abstab10");
+
+ //Variables to speed up dynamic Huffman decoding:
+ #define LOGQHUFSIZ0 9
diff --git a/games/jfsw/jfsw.SlackBuild b/games/jfsw/jfsw.SlackBuild
index a061b0bb4d..12890491f8 100644
--- a/games/jfsw/jfsw.SlackBuild
+++ b/games/jfsw/jfsw.SlackBuild
@@ -44,18 +44,16 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-for TARNAM in \
- jfsw-54912c4964a5d68d4fd68dba1d3affcfe2062766.tar.gz \
- jfaudiolib-ea5613edadcf691a4867a750546f33ef84885fbf.tar.gz \
- jfbuild-b129b7ee9ce468022610dc8194786c0bac1f66ef.tar.gz \
- jfmact-f915216973de73c42c326fdd3b1734ac12316427.tar.gz \
+for SRCNAM in \
+ jfsw-54912c4964a5d68d4fd68dba1d3affcfe2062766 \
+ jfaudiolib-ea5613edadcf691a4867a750546f33ef84885fbf \
+ jfbuild-b129b7ee9ce468022610dc8194786c0bac1f66ef \
+ jfmact-f915216973de73c42c326fdd3b1734ac12316427 \
; do
- SRCNAM=$(echo $TARNAM | sed -e 's/-.*//')
- DERPY_TARNAM=$(echo $TARNAM | sed -e 's/.*-//')
- COMMIT=$(basename $DERPY_TARNAM .tar.gz)
- rm -rf $SRCNAM
- tar xvf $CWD/$TARNAM || tar xvf $CWD/$DERPY_TARNAM
- mv $SRCNAM-$COMMIT $SRCNAM
+ PNAM=$(echo $SRCNAM | sed -e 's/-.*//')
+ rm -rf $SRCNAM $PNAM
+ tar xvf $CWD/$SRCNAM.tar.gz
+ mv $SRCNAM $PNAM
done
cd $PRGNAM
@@ -71,6 +69,8 @@ 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 {} \;
+patch -p1 < $CWD/jfsw-use-me.patch
+
make \
RELEASE=1 \
PREFIX=/usr/share/games/$PRGNAM \
diff --git a/games/jfsw/jfsw.info b/games/jfsw/jfsw.info
index e3b392ec17..a9996bc2d0 100644
--- a/games/jfsw/jfsw.info
+++ b/games/jfsw/jfsw.info
@@ -1,10 +1,10 @@
PRGNAM="jfsw"
VERSION="20160220_54912c4"
HOMEPAGE="http://www.jonof.id.au/jfsw"
-DOWNLOAD="https://github.com/jonof/jfsw/archive/54912c4964a5d68d4fd68dba1d3affcfe2062766.tar.gz \
- https://github.com/jonof/jfaudiolib/archive/ea5613edadcf691a4867a750546f33ef84885fbf.tar.gz \
- https://github.com/jonof/jfbuild/archive/b129b7ee9ce468022610dc8194786c0bac1f66ef.tar.gz \
- https://github.com/jonof/jfmact/archive/f915216973de73c42c326fdd3b1734ac12316427.tar.gz"
+DOWNLOAD="https://github.com/jonof/jfsw/archive/54912c4/jfsw-54912c4964a5d68d4fd68dba1d3affcfe2062766.tar.gz \
+ https://github.com/jonof/jfaudiolib/archive/ea5613e/jfaudiolib-ea5613edadcf691a4867a750546f33ef84885fbf.tar.gz \
+ https://github.com/jonof/jfbuild/archive/b129b7e/jfbuild-b129b7ee9ce468022610dc8194786c0bac1f66ef.tar.gz \
+ https://github.com/jonof/jfmact/archive/f915216/jfmact-f915216973de73c42c326fdd3b1734ac12316427.tar.gz"
MD5SUM="ded58dc228640fbafa8d9cfb155cd783 \
6224b79b42d3a20c31c1a25eedd85702 \
9fab17bb9f119be304d4a8591d5be5d1 \