diff options
author | joerg <joerg@pkgsrc.org> | 2017-02-17 17:02:01 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2017-02-17 17:02:01 +0000 |
commit | 8fb504a26ed863f5edff84282647ac57fff79389 (patch) | |
tree | b087f663044b8f779b501209c46739abf9faf947 /emulators | |
parent | 00bff3fc53cdfe5b466b95383645de9bf05f2c99 (diff) | |
download | pkgsrc-8fb504a26ed863f5edff84282647ac57fff79389.tar.gz |
Newer zlib provides its own uncompress2, so rename the version here.
Diffstat (limited to 'emulators')
3 files changed, 47 insertions, 1 deletions
diff --git a/emulators/libretro-pcsx-rearmed/distinfo b/emulators/libretro-pcsx-rearmed/distinfo index 0c7245258ce..2f4b43a512a 100644 --- a/emulators/libretro-pcsx-rearmed/distinfo +++ b/emulators/libretro-pcsx-rearmed/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.4 2015/11/03 20:30:59 agc Exp $ +$NetBSD: distinfo,v 1.5 2017/02/17 17:02:01 joerg Exp $ SHA1 (libretro-pcsx-rearmed-0.22.tar.gz) = bdd2e38aa53c13e557ddc0ccac2bdcea909f9f9d RMD160 (libretro-pcsx-rearmed-0.22.tar.gz) = ea7328498d32d12ee3e4b3504ed1685effecb9a1 SHA512 (libretro-pcsx-rearmed-0.22.tar.gz) = e193e3a8061595a0ffe13d2755b446560687f776e72ffd51db9ba982267353ecf5a4ce82a060806da2d3389e4c6adaa99cddd3b58d29d30f196d9a828bb72d29 Size (libretro-pcsx-rearmed-0.22.tar.gz) = 1153355 bytes +SHA1 (patch-libpcsxcore_cdriso.c) = 31339ba2ea5a812c1172630bfb7ea64bd20ec9ec SHA1 (patch-libpcsxcore_new__dynarec_new__dynarec.c) = 82ec36e064ae4f725379ca889eefe1f60038adc0 +SHA1 (patch-plugins_cdrcimg_cdrcimg.c) = ecaca7dc5dd4ee8ecc19085947795be2112ed8d0 diff --git a/emulators/libretro-pcsx-rearmed/patches/patch-libpcsxcore_cdriso.c b/emulators/libretro-pcsx-rearmed/patches/patch-libpcsxcore_cdriso.c new file mode 100644 index 00000000000..d458a88e3e1 --- /dev/null +++ b/emulators/libretro-pcsx-rearmed/patches/patch-libpcsxcore_cdriso.c @@ -0,0 +1,22 @@ +$NetBSD: patch-libpcsxcore_cdriso.c,v 1.1 2017/02/17 17:02:01 joerg Exp $ + +--- libpcsxcore/cdriso.c.orig 2017-02-17 14:01:16.071768567 +0000 ++++ libpcsxcore/cdriso.c +@@ -1082,7 +1082,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 my_uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size) + { + static z_stream z; + int ret = 0; +@@ -1161,7 +1161,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 = my_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); diff --git a/emulators/libretro-pcsx-rearmed/patches/patch-plugins_cdrcimg_cdrcimg.c b/emulators/libretro-pcsx-rearmed/patches/patch-plugins_cdrcimg_cdrcimg.c new file mode 100644 index 00000000000..69067492b9b --- /dev/null +++ b/emulators/libretro-pcsx-rearmed/patches/patch-plugins_cdrcimg_cdrcimg.c @@ -0,0 +1,22 @@ +$NetBSD: patch-plugins_cdrcimg_cdrcimg.c,v 1.1 2017/02/17 17:02:01 joerg Exp $ + +--- plugins/cdrcimg/cdrcimg.c.orig 2017-02-17 14:01:41.343339778 +0000 ++++ plugins/cdrcimg/cdrcimg.c +@@ -98,7 +98,7 @@ static long CDRgetTD(unsigned char track + return 0; + } + +-int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size) ++static int my_uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size) + { + static z_stream z; + int ret = 0; +@@ -199,7 +199,7 @@ static long CDRreadTrack(unsigned char * + ret = uncompress(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size); + break; + case CDRC_ZLIB2: +- ret = uncompress2(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size); ++ ret = my_uncompress2(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size); + break; + case CDRC_BZ: + ret = pBZ2_bzBuffToBuffDecompress((char *)cdbuffer->raw, (unsigned int *)&cdbuffer_size, |