mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-14 03:10:47 +00:00
Code Issues Releases Activity

Use zlib's uncompress() function and remove local uncompress2() definition.

Browse Source 
Pcsxr's uncompress2() is similar to zlib's uncompress() but clashes with zlib's new uncompress2() function, available in 12-CURRENT since zlib v1.2.10 (svn r311285).
This commit is contained in:
Ganael LAPLANCHE 2017-01-25 19:59:50 +00:00
parent fbaf26c24a
commit ca7e23155c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=432459
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emulators/pcsxr/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= pcsxr
PORTVERSION= 1.9.94.r87113
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= emulators
MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
LOCAL/martymac

29
emulators/pcsxr/files/patch-libpcsxcore-cdriso.c Normal file
View File

@ -0,0 +1,29 @@
Use zlib's uncompress() function
--- libpcsxcore/cdriso.c.orig 2017-01-21 13:51:48.486985000 +0000
+++ libpcsxcore/cdriso.c 2017-01-21 13:53:55.623314000 +0000
@@ -1210,6 +1210,7 @@
return ret;
}
+#if 0
static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
{
static z_stream z;
@@ -1240,6 +1241,7 @@
*out_size -= z.avail_out;
return ret == 1 ? 0 : ret;
}
+#endif
static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector)
{
@@ -1289,7 +1291,7 @@
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 = uncompress(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);