summaryrefslogtreecommitdiff
path: root/multilib
diff options
context:
space:
mode:
Diffstat (limited to 'multilib')
-rw-r--r--multilib/pcsxr/PKGBUILD7
-rw-r--r--multilib/pcsxr/zlib-uncompress2-conflict.patch22
2 files changed, 0 insertions, 29 deletions
diff --git a/multilib/pcsxr/PKGBUILD b/multilib/pcsxr/PKGBUILD
deleted file mode 100644
index 09c31882..00000000
--- a/multilib/pcsxr/PKGBUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 5d6bd281..00000000
--- a/multilib/pcsxr/zlib-uncompress2-conflict.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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);