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 | df7e4f8e1929027db1c5a633faa592fb98bd89a4 (patch) | |
| tree | 516ce21432c3bb4652120264a0a32c2c5fc79346 /emulators/libretro-pcsx-rearmed/patches | |
| parent | 58c3d82edf74425b80fc067926405da4b9697596 (diff) | |
| download | pkgsrc-df7e4f8e1929027db1c5a633faa592fb98bd89a4.tar.gz | |
Newer zlib provides its own uncompress2, so rename the version here.
Diffstat (limited to 'emulators/libretro-pcsx-rearmed/patches')
| -rw-r--r-- | emulators/libretro-pcsx-rearmed/patches/patch-libpcsxcore_cdriso.c | 22 | ||||
| -rw-r--r-- | emulators/libretro-pcsx-rearmed/patches/patch-plugins_cdrcimg_cdrcimg.c | 22 |
2 files changed, 44 insertions, 0 deletions
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, |