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 | c8ce7b9408db5b132ac9b6490f60b117a105d228 (patch) | |
| tree | 3c2b30a2e13394617ca391889e61a00657b92952 /games-strategy | |
| parent | Version bump, bug #361273. The bundled libGLU.so.1 is no longer removed in ho... (diff) | |
| download | historical-c8ce7b9408db5b132ac9b6490f60b117a105d228.tar.gz historical-c8ce7b9408db5b132ac9b6490f60b117a105d228.tar.bz2 historical-c8ce7b9408db5b132ac9b6490f60b117a105d228.zip | |
Fix build with media-libs/libpng-1.5 Bug #356843
Package-Manager: portage-2.1.9.42/cvs/Linux x86_64
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/ufo-ai/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/ufo-ai/Manifest | 15 | ||||
| -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 |
4 files changed, 30 insertions, 4 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/Manifest b/games-strategy/ufo-ai/Manifest index b84a01b43a4a..b6950029c849 100644 --- a/games-strategy/ufo-ai/Manifest +++ b/games-strategy/ufo-ai/Manifest @@ -1,6 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX ufo-ai-2.3.1-libpng15.patch 309 RMD160 dab2096b23dabe5ae9e136444c5b050644921120 SHA1 1cca3465463c0864642a0b92a7f90aa74fc8bfcd SHA256 4dcc415591476a86fcf2a82f6e18fbef8609dbd8865053445c4f37bdabc8dd89 DIST 1maps.pk3 242016 RMD160 45709c9a28493bc37488c0f960d9b73ceb7f3534 SHA1 b18baa412a1c372dd8b78b525a09d886a61b11c3 SHA256 8cdb8c231c0ba98900d97012b62c5cef72ab5710fe3f087e534496a66f7b0e4e DIST ufoai-2.3.1-data.tar 533196800 RMD160 30ba39315718bccd13ffc56e49719a04b3bbd806 SHA1 a322c3bb92b29a0265567e84b1d3287078cfae91 SHA256 79b302351d22ea55e1d5c2fceed757a518908673c12ac3e7972f541f68c2a9ad DIST ufoai-2.3.1-source.tar.bz2 9847575 RMD160 77a1499962ec69c138ccb03f54187f87e0429a68 SHA1 f339e9399eae6ef4661ad8b9d4f68205904810d3 SHA256 6f9fbe69c91843b48fc29efa3a3584aa2659b78be1a6a00d5868c5d77fec69d1 -EBUILD ufo-ai-2.3.1-r1.ebuild 2800 RMD160 9972fd66ccef7e683baa9b2f3d2551f9bea6f703 SHA1 14ee22fdf74d9a53bc740431718facb857b53249 SHA256 fec9052c2dcaa7fc6c8d90f3c221d495f8cd7ec0a7814f8e471ccaaa5b0cded4 -MISC ChangeLog 4781 RMD160 3e9b2f7d714be58015922be9953052dd1893ec84 SHA1 0c6c0bae17ce38b631828f005371c1c52eea0a59 SHA256 564a0871089070f35eeb1631126c955cd3dec212144ad1c17598ced83f723064 +EBUILD ufo-ai-2.3.1-r1.ebuild 2845 RMD160 daaab4bc37292cc580aff173ea42c8d618665f89 SHA1 78340cd94a0ba15f84b7988b27b2e9c8533b7677 SHA256 ae5fb818d27f0461f1213df89e29bb57a7280398357306184170619187b34d25 +MISC ChangeLog 4966 RMD160 1a7c8a421362d014ec40ca847cc10e70b9cdb2d6 SHA1 8923ad283bb4092c0aaa049f036dd086632366ec SHA256 c2a0fb73ed09b117986c48f9bc1c875d8baf2117933365afb9fd9c5cf3570ebc MISC metadata.xml 219 RMD160 145b5b398d86f7dfb219d32e4394ed0f1ffd5873 SHA1 485e12874a226aaf92ccbbbf5b2b1c902dd68110 SHA256 266385ce0470b911b2b3ca5fe6b237ad5dfc2d480533be5453537328a08cb2eb +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk2XYNkACgkQIY77eQFFFC216wCfYKIrw9lTSpDXdouAf+d4hguz +LTQAn2Ipd82zExtxeieMQlfw3ZOi8noq +=99Hb +-----END PGP SIGNATURE----- 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" } |