diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-05-17 10:36:19 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-05-17 10:36:19 +0000 |
| commit | 15bce46eacb33309a358c750792c446c484c6688 (patch) | |
| tree | e3709adf4572399061ea19d554671c73aea89e2c /games-engines | |
| parent | Remove the mask on dev-python/pyopencl (bug #319185). (diff) | |
| download | gentoo-2-15bce46eacb33309a358c750792c446c484c6688.tar.gz gentoo-2-15bce46eacb33309a358c750792c446c484c6688.tar.bz2 gentoo-2-15bce46eacb33309a358c750792c446c484c6688.zip | |
Fix building with libpng14 wrt #320113 by Diego E. Pettenò.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'games-engines')
| -rw-r--r-- | games-engines/exult/ChangeLog | 6 | ||||
| -rw-r--r-- | games-engines/exult/exult-1.2.ebuild | 8 | ||||
| -rw-r--r-- | games-engines/exult/files/exult-1.2-libpng14.patch | 22 |
3 files changed, 32 insertions, 4 deletions
diff --git a/games-engines/exult/ChangeLog b/games-engines/exult/ChangeLog index d77b814b2e33..8e30b1bdd684 100644 --- a/games-engines/exult/ChangeLog +++ b/games-engines/exult/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-engines/exult # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.26 2010/03/18 18:55:22 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.27 2010/05/17 10:36:19 ssuominen Exp $ + + 17 May 2010; Samuli Suominen <ssuominen@gentoo.org> exult-1.2.ebuild, + +files/exult-1.2-libpng14.patch: + Fix building with libpng14 wrt #320113 by Diego E. Pettenò. 18 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org> exult-1.2.ebuild: fix desktop entry issues reported by desktop-file-validate diff --git a/games-engines/exult/exult-1.2.ebuild b/games-engines/exult/exult-1.2.ebuild index 3d9a7a66a3e6..a911761463a3 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 # 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.21 2010/03/18 18:55:22 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.22 2010/05/17 10:36:19 ssuominen Exp $ EAPI=2 inherit eutils autotools multilib games @@ -18,7 +18,8 @@ SLOT="0" KEYWORDS="~amd64 ppc ~sparc x86" IUSE="timidity zlib" -RDEPEND="media-libs/libsdl[audio,video,X] +RDEPEND=">=media-libs/libpng-1.2.43-r2:0 + media-libs/libsdl[audio,video,X] media-libs/sdl-mixer[vorbis,timidity?] timidity? ( >=media-sound/timidity++-2 ) zlib? ( sys-libs/zlib )" @@ -46,7 +47,8 @@ src_prepare() { "${FILESDIR}"/${P}-64bits.patch \ "${FILESDIR}"/${P}-x11link.patch \ "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-gcc44.patch + "${FILESDIR}"/${P}-gcc44.patch \ + "${FILESDIR}"/${P}-libpng14.patch sed -i \ -e "s/u7siinstrics.data/u7siintrinsics.data/" \ usecode/ucxt/data/Makefile.am \ diff --git a/games-engines/exult/files/exult-1.2-libpng14.patch b/games-engines/exult/files/exult-1.2-libpng14.patch new file mode 100644 index 000000000000..7617ad6b9a8e --- /dev/null +++ b/games-engines/exult/files/exult-1.2-libpng14.patch @@ -0,0 +1,22 @@ +http://exult.svn.sourceforge.net/viewvc/exult/exult/trunk/shapes/pngio.cc?r1=3752&r2=5381 + +--- shapes/pngio.cc ++++ shapes/pngio.cc +@@ -89,7 +89,7 @@ + // Indicate we already read something. + png_set_sig_bytes(png, sizeof(sigbuf)); + png_read_info(png, info); // Read in image info. +- unsigned long w, h; ++ png_uint_32 w, h; + int depth, color, interlace; + png_get_IHDR(png, info, &w, &h, &depth, &color, + &interlace, 0, 0); +@@ -316,7 +316,7 @@ + // Indicate we already read something. + png_set_sig_bytes(png, sizeof(sigbuf)); + png_read_info(png, info); // Read in image info. +- unsigned long w, h; ++ png_uint_32 w, h; + int depth, color, interlace; + png_get_IHDR(png, info, &w, &h, &depth, &color, + &interlace, 0, 0); |