From owner-svn-ports-head@freebsd.org Wed Jan 25 19:59:51 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D3881CC12BD; Wed, 25 Jan 2017 19:59:51 +0000 (UTC) (envelope-from martymac@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8334E3D8; Wed, 25 Jan 2017 19:59:51 +0000 (UTC) (envelope-from martymac@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0PJxo05081948; Wed, 25 Jan 2017 19:59:50 GMT (envelope-from martymac@FreeBSD.org) Received: (from martymac@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0PJxoiN081946; Wed, 25 Jan 2017 19:59:50 GMT (envelope-from martymac@FreeBSD.org) Message-Id: <201701251959.v0PJxoiN081946@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: martymac set sender to martymac@FreeBSD.org using -f From: Ganael LAPLANCHE Date: Wed, 25 Jan 2017 19:59:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432459 - in head/emulators/pcsxr: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jan 2017 19:59:51 -0000 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);