Date: Wed, 25 Jan 2017 19:59:50 +0000 (UTC) From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432459 - in head/emulators/pcsxr: . files Message-ID: <201701251959.v0PJxoiN081946@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: martymac Date: Wed Jan 25 19:59:50 2017 New Revision: 432459 URL: https://svnweb.freebsd.org/changeset/ports/432459 Log: Use zlib's uncompress() function and remove local uncompress2() definition. 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). Added: head/emulators/pcsxr/files/patch-libpcsxcore-cdriso.c (contents, props changed) Modified: head/emulators/pcsxr/Makefile Modified: head/emulators/pcsxr/Makefile ============================================================================== --- head/emulators/pcsxr/Makefile Wed Jan 25 19:07:08 2017 (r432458) +++ head/emulators/pcsxr/Makefile Wed Jan 25 19:59:50 2017 (r432459) @@ -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 Added: head/emulators/pcsxr/files/patch-libpcsxcore-cdriso.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/pcsxr/files/patch-libpcsxcore-cdriso.c Wed Jan 25 19:59:50 2017 (r432459) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701251959.v0PJxoiN081946>