diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-15 02:44:46 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-15 02:44:46 +0000 |
| commit | dde54611302c2fd8efb05f3c93e591f00d10ab34 (patch) | |
| tree | cb6c1d626f7927cb0deacf22f07fcf1054d963aa | |
| parent | Fix building with libpng15 wrt #378203 by Diego Elio Pettenò (diff) | |
| download | gentoo-2-dde54611302c2fd8efb05f3c93e591f00d10ab34.tar.gz gentoo-2-dde54611302c2fd8efb05f3c93e591f00d10ab34.tar.bz2 gentoo-2-dde54611302c2fd8efb05f3c93e591f00d10ab34.zip | |
Fix building with libpng15 wrt #380145 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
| -rw-r--r-- | games-engines/exult/ChangeLog | 6 | ||||
| -rw-r--r-- | games-engines/exult/exult-1.2.ebuild | 9 | ||||
| -rw-r--r-- | games-engines/exult/files/exult-1.2-libpng15.patch | 29 |
3 files changed, 39 insertions, 5 deletions
diff --git a/games-engines/exult/ChangeLog b/games-engines/exult/ChangeLog index a44c2160f4ff..f5d519641924 100644 --- a/games-engines/exult/ChangeLog +++ b/games-engines/exult/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-engines/exult # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.28 2011/01/20 21:21:08 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.29 2011/09/15 02:44:46 ssuominen Exp $ + + 15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> exult-1.2.ebuild, + +files/exult-1.2-libpng15.patch: + Fix building with libpng15 wrt #380145 by Diego Elio Pettenò *exult-1.4.9_rc1 (20 Jan 2011) diff --git a/games-engines/exult/exult-1.2.ebuild b/games-engines/exult/exult-1.2.ebuild index a911761463a3..1885043e7a93 100644 --- a/games-engines/exult/exult-1.2.ebuild +++ b/games-engines/exult/exult-1.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.22 2010/05/17 10:36:19 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.23 2011/09/15 02:44:46 ssuominen Exp $ EAPI=2 inherit eutils autotools multilib games @@ -18,7 +18,7 @@ SLOT="0" KEYWORDS="~amd64 ppc ~sparc x86" IUSE="timidity zlib" -RDEPEND=">=media-libs/libpng-1.2.43-r2:0 +RDEPEND=">=media-libs/libpng-1.4 media-libs/libsdl[audio,video,X] media-libs/sdl-mixer[vorbis,timidity?] timidity? ( >=media-sound/timidity++-2 ) @@ -48,7 +48,8 @@ src_prepare() { "${FILESDIR}"/${P}-x11link.patch \ "${FILESDIR}"/${P}-gcc43.patch \ "${FILESDIR}"/${P}-gcc44.patch \ - "${FILESDIR}"/${P}-libpng14.patch + "${FILESDIR}"/${P}-libpng14.patch \ + "${FILESDIR}"/${P}-libpng15.patch sed -i \ -e "s/u7siinstrics.data/u7siintrinsics.data/" \ usecode/ucxt/data/Makefile.am \ diff --git a/games-engines/exult/files/exult-1.2-libpng15.patch b/games-engines/exult/files/exult-1.2-libpng15.patch new file mode 100644 index 000000000000..1577658ce6d6 --- /dev/null +++ b/games-engines/exult/files/exult-1.2-libpng15.patch @@ -0,0 +1,29 @@ +--- shapes/pngio.cc ++++ shapes/pngio.cc +@@ -79,7 +79,7 @@ + } + // Allocate info. structure. + png_infop info = png_create_info_struct(png); +- if (setjmp(png->jmpbuf)) // Handle errors. ++ if (setjmp(png_jmpbuf(png))) // Handle errors. + { + png_destroy_read_struct(&png, &info, 0); + fclose(fp); +@@ -208,7 +208,7 @@ + } + // Allocate info. structure. + png_infop info = png_create_info_struct(png); +- if (setjmp(png->jmpbuf)) // Handle errors. ++ if (setjmp(png_jmpbuf(png))) // Handle errors. + { + png_destroy_write_struct(&png, &info); + fclose(fp); +@@ -306,7 +306,7 @@ + } + // Allocate info. structure. + png_infop info = png_create_info_struct(png); +- if (setjmp(png->jmpbuf)) // Handle errors. ++ if (setjmp(png_jmpbuf(png))) // Handle errors. + { + png_destroy_read_struct(&png, &info, 0); + fclose(fp); |