From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1E47A139085 for ; Thu, 26 Jan 2017 17:54:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4CF802340AE; Thu, 26 Jan 2017 17:54:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B379E0DEC for ; Thu, 26 Jan 2017 17:54:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 281CC340DD8 for ; Thu, 26 Jan 2017 17:54:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9FB6308C for ; Thu, 26 Jan 2017 17:54:27 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1485453256.fdcb46b955fa352f5a8070babd457a7a0cdc5880.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsxr/, games-emulation/pcsxr/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/pcsxr/files/pcsxr-1.9.94-zlib-uncompress2.patch games-emulation/pcsxr/pcsxr-1.9.94-r1.ebuild X-VCS-Directories: games-emulation/pcsxr/files/ games-emulation/pcsxr/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: fdcb46b955fa352f5a8070babd457a7a0cdc5880 X-VCS-Branch: master Date: Thu, 26 Jan 2017 17:54:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ccdf801c-4038-4e1c-b0e1-d9f94f75803c X-Archives-Hash: 23fb30db957ecd364218e80b7f4e13cf commit: fdcb46b955fa352f5a8070babd457a7a0cdc5880 Author: Michał Górny gentoo org> AuthorDate: Thu Jan 26 17:26:34 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jan 26 17:54:16 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdcb46b9 games-emulation/pcsxr: Fix building against recent zlib, #604382 .../files/pcsxr-1.9.94-zlib-uncompress2.patch | 47 ++++++++++++++++++++++ games-emulation/pcsxr/pcsxr-1.9.94-r1.ebuild | 3 +- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/games-emulation/pcsxr/files/pcsxr-1.9.94-zlib-uncompress2.patch b/games-emulation/pcsxr/files/pcsxr-1.9.94-zlib-uncompress2.patch new file mode 100644 index 00000000..b269185 --- /dev/null +++ b/games-emulation/pcsxr/files/pcsxr-1.9.94-zlib-uncompress2.patch @@ -0,0 +1,47 @@ +From dabb671947ae26942c7ef8a71fef9831e0c1884d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Thu, 26 Jan 2017 18:14:01 +0100 +Subject: [PATCH] Fix build against zlib-1.2.9+ (having uncompress2) + +--- + pcsxr/configure.ac | 3 +++ + pcsxr/libpcsxcore/cdriso.c | 2 ++ + 2 files changed, 5 insertions(+) + +diff --git a/pcsxr/configure.ac b/pcsxr/configure.ac +index 300bb185..128b4f97 100644 +--- a/pcsxr/configure.ac ++++ b/pcsxr/configure.ac +@@ -113,6 +113,9 @@ if test "x$have_xtest" = xno; then + AC_MSG_ERROR([unable to find xtest headers]) + fi + ++AC_CHECK_LIB(z, uncompress2, ++[ AC_DEFINE([HAVE_UNCOMPRESS2], [1], [Define if libz supports uncompress2]) ]) ++ + AM_CONDITIONAL(USE_LIBCDIO, false) + + AC_ARG_ENABLE(libcdio, [ --enable-libcdio use GNU libcdio for CD-ROM support (default=no)], +diff --git a/pcsxr/libpcsxcore/cdriso.c b/pcsxr/libpcsxcore/cdriso.c +index 04e866d9..fb7f28a5 100644 +--- a/pcsxr/libpcsxcore/cdriso.c ++++ b/pcsxr/libpcsxcore/cdriso.c +@@ -1219,6 +1219,7 @@ static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector) + return ret; + } + ++#ifndef HAVE_UNCOMPRESS2 + static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size) + { + static z_stream z; +@@ -1249,6 +1250,7 @@ static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned lo + *out_size -= z.avail_out; + return ret == 1 ? 0 : ret; + } ++#endif + + static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector) + { +-- +2.11.0 + diff --git a/games-emulation/pcsxr/pcsxr-1.9.94-r1.ebuild b/games-emulation/pcsxr/pcsxr-1.9.94-r1.ebuild index 961fc5a..6636d04 100644 --- a/games-emulation/pcsxr/pcsxr-1.9.94-r1.ebuild +++ b/games-emulation/pcsxr/pcsxr-1.9.94-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -54,6 +54,7 @@ S=${WORKDIR}/${PN} src_prepare() { local PATCHES=( "${FILESDIR}"/${P}-disable-sdl2.patch + "${FILESDIR}"/${P}-zlib-uncompress2.patch ) epatch "${PATCHES[@]}"