diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2011-04-02 17:45:50 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2011-04-02 17:45:50 +0000 |
| commit | 765deff3083f39ccad6b76d67d583f9995b8f267 (patch) | |
| tree | a354dc293f632b52b917b964e8a4daeed61c7a94 /games-strategy/ufo-ai | |
| parent | Version bump, bug #361273. The bundled libGLU.so.1 is no longer removed in ho... (diff) | |
| download | gentoo-2-765deff3083f39ccad6b76d67d583f9995b8f267.tar.gz gentoo-2-765deff3083f39ccad6b76d67d583f9995b8f267.tar.bz2 gentoo-2-765deff3083f39ccad6b76d67d583f9995b8f267.zip | |
Fix build with media-libs/libpng-1.5 Bug #356843
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Diffstat (limited to 'games-strategy/ufo-ai')
| -rw-r--r-- | games-strategy/ufo-ai/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/ufo-ai/files/ufo-ai-2.3.1-libpng15.patch | 10 | ||||
| -rw-r--r-- | games-strategy/ufo-ai/ufo-ai-2.3.1-r1.ebuild | 3 |
3 files changed, 17 insertions, 2 deletions
diff --git a/games-strategy/ufo-ai/ChangeLog b/games-strategy/ufo-ai/ChangeLog index d0947578b710..645c594f712a 100644 --- a/games-strategy/ufo-ai/ChangeLog +++ b/games-strategy/ufo-ai/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/ufo-ai # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.33 2011/03/23 16:48:32 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.34 2011/04/02 17:45:50 tupone Exp $ + + 02 Apr 2011; Alfredo Tupone <tupone@gentoo.org> ufo-ai-2.3.1-r1.ebuild, + +files/ufo-ai-2.3.1-libpng15.patch: + Fix build with media-libs/libpng-1.5 Bug #356843 by Alexis Ballier 23 Mar 2011; Gilles Dartiguelongue <eva@gentoo.org> ufo-ai-2.3.ebuild, ufo-ai-2.3.1-r1.ebuild: diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.3.1-libpng15.patch b/games-strategy/ufo-ai/files/ufo-ai-2.3.1-libpng15.patch new file mode 100644 index 000000000000..2099f7ab72c0 --- /dev/null +++ b/games-strategy/ufo-ai/files/ufo-ai-2.3.1-libpng15.patch @@ -0,0 +1,10 @@ +--- src/shared/images.c.old 2011-04-02 19:31:52.000000000 +0200 ++++ src/shared/images.c 2011-04-02 19:32:13.000000000 +0200 +@@ -32,6 +32,7 @@ + + #include <jpeglib.h> + #include <png.h> ++#include <zlib.h> + + /** image formats, tried in this order */ + static char *IMAGE_TYPES[] = { "tga", "png", "jpg", NULL }; diff --git a/games-strategy/ufo-ai/ufo-ai-2.3.1-r1.ebuild b/games-strategy/ufo-ai/ufo-ai-2.3.1-r1.ebuild index edaeec194338..6113bca5de9c 100644 --- a/games-strategy/ufo-ai/ufo-ai-2.3.1-r1.ebuild +++ b/games-strategy/ufo-ai/ufo-ai-2.3.1-r1.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-strategy/ufo-ai/ufo-ai-2.3.1-r1.ebuild,v 1.4 2011/03/23 16:48:32 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-2.3.1-r1.ebuild,v 1.5 2011/04/02 17:45:50 tupone Exp $ EAPI=2 inherit eutils flag-o-matic games @@ -54,6 +54,7 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P}-source src_prepare() { + epatch "${FILESDIR}"/${P}-libpng15.patch cp "${DISTDIR}"/1maps.pk3 "${WORKDIR}"/base/ || die mv "${WORKDIR}"/base/ "${S}"/ || die "Moving data failed" } |