cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflict with uncompress2() provided by recent zlib releases

Browse Source 
ok tb@
This commit is contained in:
jca 2021-07-04 14:55:34 +00:00
parent e43b3c6062
commit af76ad5e4b
3 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emulators/libretro-pcsx-rearmed/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2019/07/12 20:46:09 sthen Exp $ # $OpenBSD: Makefile,v 1.3 2021/07/04 14:55:34 jca Exp $
COMMENT = Sony PlayStation core for retroarch COMMENT = Sony PlayStation core for retroarch
V = 22 V = 22
DISTNAME = libretro-pcsx-rearmed-$V DISTNAME = libretro-pcsx-rearmed-$V
REVISION = 0
GH_ACCOUNT = notaz GH_ACCOUNT = notaz
GH_PROJECT = pcsx_rearmed GH_PROJECT = pcsx_rearmed

25
emulators/libretro-pcsx-rearmed/patches/patch-libpcsxcore_cdriso_c Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-libpcsxcore_cdriso_c,v 1.1 2021/07/04 14:55:34 jca Exp $
Fix conflict with uncompress2() provided by recent zlib releases.
Index: libpcsxcore/cdriso.c
--- libpcsxcore/cdriso.c.orig
+++ libpcsxcore/cdriso.c
@@ -1082,7 +1082,7 @@ static int cdread_sub_mixed(FILE *f, unsigned int base
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, unsigned int bas
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);

25
emulators/libretro-pcsx-rearmed/patches/patch-plugins_cdrcimg_cdrcimg_c Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-plugins_cdrcimg_cdrcimg_c,v 1.1 2021/07/04 14:55:34 jca Exp $
Fix conflict with uncompress2() provided by recent zlib releases.
Index: plugins/cdrcimg/cdrcimg.c
--- plugins/cdrcimg/cdrcimg.c.orig
+++ plugins/cdrcimg/cdrcimg.c
@@ -98,7 +98,7 @@ static long CDRgetTD(unsigned char track, unsigned cha
return 0;
}
-int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
+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 *time)
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,