Fix building with libpng14 wrt #308863 by Locke Shinseiko.

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

diff --git a/games-strategy/ufo-ai/ChangeLog b/games-strategy/ufo-ai/ChangeLog
index 5db3b2392d76c9c829fbbd725b536fd1f726bf7a..c7b3cb52dc39a6687631af864f2ce3040b5c64c4 100644 (file)
--- a/games-strategy/ufo-ai/ChangeLog
+++ b/games-strategy/ufo-ai/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/ufo-ai
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.24 2010/03/02 10:44:00 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.25 2010/03/10 18:37:22 ssuominen Exp $
+
+  10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> ufo-ai-2.2.1.ebuild,
+  +files/ufo-ai-2.2.1-libpng14.patch:
+  Fix building with libpng14 wrt #308863 by Locke Shinseiko.
 
   02 Mar 2010; Tupone Alfredo <tupone@gentoo.org> ufo-ai-2.2.1.ebuild,
   +files/ufo-ai-2.2.1-noelfonshared.patch:

diff --git a/games-strategy/ufo-ai/Manifest b/games-strategy/ufo-ai/Manifest
index 9db82427728c72c86c7b946181d6468a5732dcaf..aae123d6a3e863c204f5083dd7cc7f7748c99e9e 100644 (file)
--- a/games-strategy/ufo-ai/Manifest
+++ b/games-strategy/ufo-ai/Manifest
@@ -1,7 +1,8 @@
 AUX ufo-ai-2.2.1-gentoo.patch 2273 RMD160 2cb17341e638a955cf6fcde610a9bbf67c3ee797 SHA1 74814edd9747de7077eaabf6c4ef2e16960126b7 SHA256 62711814268a142bb0ba304b0645735f077a5cc984c36b0f1e781a4c03759ff2
+AUX ufo-ai-2.2.1-libpng14.patch 794 RMD160 1f7ec6530c97366b2961b1917727bfb2da2a367f SHA1 fdbcd581dca8bd2552de8b876631fee7b9181604 SHA256 f8a7f0db115dd16fa7c4bf27635ae604f502415903eb83a29ba69db47e856f13
 AUX ufo-ai-2.2.1-noelfonshared.patch 436 RMD160 7382ad9ad5dd5b97cf8d448a28133ba86550f796 SHA1 fda2e8bb739f8e360584d521e04159f6e2cdeed8 SHA256 2bf2a7f038eebc230636253be2ed6321309cbab2b31fa553185c31dee23d4f7c
 DIST ufoai-2.2.1-data.tar 390502400 RMD160 af91dd473f59c73e705181759059bd37ba215f62 SHA1 eb071333478bd6860179e12d8655301980f87d60 SHA256 639c37867733feb5c8cf0852cee6a183c4bc6cd8e31f4c39356b275790a6bd0a
 DIST ufoai-2.2.1-source.tar.bz2 7640531 RMD160 980405a5d38bcbb5ae2cea4e25c54374c7dd8e99 SHA1 6ad1b8c357fdbbe9a31839b3bf8de46ad17a40eb SHA256 0c0ff8fc72038963e44ae0420eacedbd7dfe4f9115527ec3554d8c707d0d5ee5
-EBUILD ufo-ai-2.2.1.ebuild 2843 RMD160 d727b663adaa1942328ede0c0866185e076b80ed SHA1 82d71f6d30ec85d5f1e3d2713c9a32f964de5a2d SHA256 e2800a8f101b245f20457d7d0bd517c8918ecf2d760442d76d78ecb8720adfbc
-MISC ChangeLog 3385 RMD160 b7527e99660bdd83e53b9930a5b2e073c6c4127e SHA1 965912fe5651dd3de8fe5481c50d7194247046db SHA256 ab4cde76c8cf6b1c4a1fed4369f2992c7412dd4db2927ee5e65fc409894b94f9
+EBUILD ufo-ai-2.2.1.ebuild 2884 RMD160 bef133c17f8b5661975dedb409200fc14624d24d SHA1 a90af60d50bf1c02828fc4da9bded69bceb00ec3 SHA256 d78ee525c24870890380df139270e029d34ecfc288f27141c335e8b5d3ab30f5
+MISC ChangeLog 3563 RMD160 e7217c68e10f17b67c4b7a0071492c203eed9a48 SHA1 20744f08e36b8e48790c402898a9aef6d1713c2c SHA256 e6f66b430acf4d5cc6c8c2af1b7142d686e44f4c93c293d964ded736ec85fbe8
 MISC metadata.xml 219 RMD160 145b5b398d86f7dfb219d32e4394ed0f1ffd5873 SHA1 485e12874a226aaf92ccbbbf5b2b1c902dd68110 SHA256 266385ce0470b911b2b3ca5fe6b237ad5dfc2d480533be5453537328a08cb2eb

diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.2.1-libpng14.patch b/games-strategy/ufo-ai/files/ufo-ai-2.2.1-libpng14.patch
new file mode 100644 (file)
index 0000000..d4c4eb0
--- /dev/null
+++ b/games-strategy/ufo-ai/files/ufo-ai-2.2.1-libpng14.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/308863
+
+--- src/renderer/r_image.c
++++ src/renderer/r_image.c
+@@ -207,7 +207,7 @@ static int R_LoadPNG (const char *name,
+               return 0;
+ 
+       /* Parse the PNG file */
+-      if ((png_check_sig(PngFileBuffer.buffer, 8)) == 0) {
++      if ((png_sig_cmp(PngFileBuffer.buffer, 0, 8)) == 0) {
+               Com_Printf("LoadPNG: Not a PNG file: %s\n", name);
+               FS_FreeFile(PngFileBuffer.buffer);
+               return 0;
+@@ -254,7 +254,7 @@ static int R_LoadPNG (const char *name,
+               png_set_palette_to_rgb(png_ptr);
+       /* convert 1-2-4 bits grayscale images to 8 bits grayscale */
+       if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+-              png_set_gray_1_2_4_to_8(png_ptr);
++              png_set_expand_gray_1_2_4_to_8(png_ptr);
+       if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+               png_set_tRNS_to_alpha(png_ptr);
+ 

diff --git a/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild b/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild
index a153d4b99799d938719c852d8df90d3d61068747..992c9ff4ea2faf0bb034dd767b71b1691d96b62f 100644 (file)
--- a/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild
+++ b/games-strategy/ufo-ai/ufo-ai-2.2.1.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-strategy/ufo-ai/ufo-ai-2.2.1.ebuild,v 1.7 2010/03/02 10:44:00 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild,v 1.8 2010/03/10 18:37:22 ssuominen Exp $
 
 EAPI=2
 inherit eutils games
@@ -46,7 +46,8 @@ src_prepare() {
 
        # Set basedir & fixes bug in finding text files - it should use fs_basedir
        epatch "${FILESDIR}"/${P}-gentoo.patch \
-               "${FILESDIR}"/${P}-noelfonshared.patch
+               "${FILESDIR}"/${P}-noelfonshared.patch \
+               "${FILESDIR}"/${P}-libpng14.patch
 
        sed -i \
                -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \