multilib/pcsxr: zlib-uncompress2-conflict.patch new

2 files changed, 29 insertions, 0 deletions

diff --git a/multilib/pcsxr/PKGBUILD b/multilib/pcsxr/PKGBUILD
new file mode 100644
index 00000000..09c31882
--- /dev/null
+++ b/multilib/pcsxr/PKGBUILD
@@ -0,0 +1,7 @@
+source+=('zlib-uncompress2-conflict.patch')
+
+prepare() {
+    cd "$srcdir/$pkgname"
+    patch -p1 -i "$srcdir/zlib-uncompress2-conflict.patch"
+}
+md5sums+=('a74a6d8f16b90c1749eb03bb9c1e7bc1')
diff --git a/multilib/pcsxr/zlib-uncompress2-conflict.patch b/multilib/pcsxr/zlib-uncompress2-conflict.patch
new file mode 100644
index 00000000..5d6bd281
--- /dev/null
+++ b/multilib/pcsxr/zlib-uncompress2-conflict.patch
@@ -0,0 +1,22 @@
+diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
+index b7eedea..1dee649 100755
+--- a/libpcsxcore/cdriso.c
++++ b/libpcsxcore/cdriso.c
+@@ -1146,7 +1146,7 @@ static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector)
+ 	return ret;
+ }
+ 
+-static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
++static int cdriso_uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
+ {
+ 	static z_stream z;
+ 	int ret = 0;
+@@ -1225,7 +1225,7 @@ static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector)
+ 	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 = cdriso_uncompress2(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);