summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2011-09-14 12:37:51 +0000
committerAlfredo Tupone <tupone@gentoo.org>2011-09-14 12:37:51 +0000
commit122d4f5b6884e0763a1dc6886bcc7a60caeddb05 (patch)
treec33a86e1bb145cbb08d49a23b026aec329bc11ac /games-sports
parentFix building with libpng15 wrt #378351 by Diego Elio Pettenò (diff)
downloadgentoo-2-122d4f5b6884e0763a1dc6886bcc7a60caeddb05.tar.gz
gentoo-2-122d4f5b6884e0763a1dc6886bcc7a60caeddb05.tar.bz2
gentoo-2-122d4f5b6884e0763a1dc6886bcc7a60caeddb05.zip
Build with media-libs/libpng-1.5 Bug #380447
(Portage version: 2.1.10.15/cvs/Linux i686)
Diffstat (limited to 'games-sports')
-rw-r--r--games-sports/gracer/ChangeLog6
-rw-r--r--games-sports/gracer/files/gracer-0.1.5-png15.patch11
-rw-r--r--games-sports/gracer/gracer-0.1.5.ebuild15
3 files changed, 23 insertions, 9 deletions
diff --git a/games-sports/gracer/ChangeLog b/games-sports/gracer/ChangeLog
index 82fbb6d69b32..199bef56947f 100644
--- a/games-sports/gracer/ChangeLog
+++ b/games-sports/gracer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-sports/gracer
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/ChangeLog,v 1.21 2011/02/26 15:32:17 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/ChangeLog,v 1.22 2011/09/14 12:37:51 tupone Exp $
+
+ 14 Sep 2011; Tupone Alfredo <tupone@gentoo.org> gracer-0.1.5.ebuild,
+ +files/gracer-0.1.5-png15.patch:
+ Build with media-libs/libpng-1.5 Bug #380447 by Diego Elio Pettenò
26 Feb 2011; Kevin McCarthy <signals@gentoo.org> gracer-0.1.5.ebuild:
Updated depends from media-libs/jpeg to virtual/jpeg
diff --git a/games-sports/gracer/files/gracer-0.1.5-png15.patch b/games-sports/gracer/files/gracer-0.1.5-png15.patch
new file mode 100644
index 000000000000..1efaec3d6fc6
--- /dev/null
+++ b/games-sports/gracer/files/gracer-0.1.5-png15.patch
@@ -0,0 +1,11 @@
+--- common/gr_texture.c.old 2011-09-14 14:23:46.820207882 +0200
++++ common/gr_texture.c 2011-09-14 14:24:22.861203604 +0200
+@@ -431,7 +431,7 @@
+ if (!info_ptr) {
+ goto ERROR;
+ }
+- if (setjmp (png_ptr->jmpbuf)) {
++ if (setjmp (png_jmpbuf(png_ptr))) {
+ goto ERROR;
+ }
+ png_init_io (png_ptr, file);
diff --git a/games-sports/gracer/gracer-0.1.5.ebuild b/games-sports/gracer/gracer-0.1.5.ebuild
index e41ea51eee6f..6710ea9b72e0 100644
--- a/games-sports/gracer/gracer-0.1.5.ebuild
+++ b/games-sports/gracer/gracer-0.1.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/gracer-0.1.5.ebuild,v 1.21 2011/02/26 15:32:17 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/gracer-0.1.5.ebuild,v 1.22 2011/09/14 12:37:51 tupone Exp $
EAPI=2
inherit eutils games
@@ -25,13 +25,12 @@ DEPEND="x11-libs/libXi
media-libs/libpng
media-libs/plib"
-src_prepare() {
- epatch "${FILESDIR}"/${PV}-gldefs.patch \
- "${FILESDIR}"/${PN}-gcc-3.4.patch \
- "${FILESDIR}/${P}"-gcc41.patch \
- "${FILESDIR}"/${P}-as-needed.patch \
- "${FILESDIR}"/${P}-libpng14.patch
-}
+PATCHES=( "${FILESDIR}"/${PV}-gldefs.patch
+ "${FILESDIR}"/${PN}-gcc-3.4.patch
+ "${FILESDIR}/${P}"-gcc41.patch
+ "${FILESDIR}"/${P}-as-needed.patch
+ "${FILESDIR}"/${P}-libpng14.patch
+ "${FILESDIR}"/${P}-png15.patch )
src_configure() {
egamesconf \