summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorM.Dinslage <daedra1980{at}gmail{dot}com>2019-07-04 07:51:05 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2019-07-04 07:51:35 +0700
commitb108b53e7c16b0d080483f2c90d0d4ecb7deaae1 (patch)
tree470bc9830e4048aefa75da025e38b07abb891485
parentf7869789e0e1ea9d11fa5f06066e1f5a02295fd7 (diff)
downloadslackbuilds-b108b53e7c16b0d080483f2c90d0d4ecb7deaae1.tar.gz
games/pcsxr: Add upstream patch.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--games/pcsxr/pcsxr-fix-uncompress2.patch21
-rw-r--r--games/pcsxr/pcsxr.SlackBuild4
2 files changed, 24 insertions, 1 deletions
diff --git a/games/pcsxr/pcsxr-fix-uncompress2.patch b/games/pcsxr/pcsxr-fix-uncompress2.patch
new file mode 100644
index 0000000000..88f61da9f5
--- /dev/null
+++ b/games/pcsxr/pcsxr-fix-uncompress2.patch
@@ -0,0 +1,21 @@
+diff -up pcsxr/libpcsxcore/cdriso.c.orig pcsxr/libpcsxcore/cdriso.c
+--- pcsxr/libpcsxcore/cdriso.c.orig 2019-06-30 19:54:58.013320015 -0500
++++ pcsxr/libpcsxcore/cdriso.c 2019-06-30 19:56:05.351320015 -0500
+@@ -913,7 +913,7 @@ static int cdread_sub_mixed(FILE *f, uns
+ return ret;
+ }
+
+-static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
++static int uncompress2_internal(void *out, unsigned long *out_size, void *in, unsigned long in_size)
+ {
+ static z_stream z;
+ int ret = 0;
+@@ -992,7 +992,7 @@ static int cdread_compressed(FILE *f, un
+ if (is_compressed) {
+ cdbuffer_size_expect = sizeof(compr_img->buff_raw[0]) << compr_img->block_shift;
+ cdbuffer_size = cdbuffer_size_expect;
+- ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size);
++ ret = uncompress2_internal(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size);
+ if (ret != 0) {
+ SysPrintf("uncompress failed with %d for block %d, sector %d\n",
+ ret, block, sector);
diff --git a/games/pcsxr/pcsxr.SlackBuild b/games/pcsxr/pcsxr.SlackBuild
index 49eba27447..3be0a3a6d5 100644
--- a/games/pcsxr/pcsxr.SlackBuild
+++ b/games/pcsxr/pcsxr.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=pcsxr
VERSION=${VERSION:-1.9.93}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -69,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/pcsxr-fix-uncompress2.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
LDFLAGS="$SLKLDFLAGS" \