diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2013-11-19 01:03:57 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2013-11-19 01:03:57 +0000 |
| commit | a93f5472a5e44332d3d9c145fc3b4154714730f7 (patch) | |
| tree | 6ca6332fb459af4dcdabc836906c8683141e4a00 /games-fps | |
| parent | Version bump to 9.2.3 and 10.0.0-rc1. (diff) | |
| download | historical-a93f5472a5e44332d3d9c145fc3b4154714730f7.tar.gz historical-a93f5472a5e44332d3d9c145fc3b4154714730f7.tar.bz2 historical-a93f5472a5e44332d3d9c145fc3b4154714730f7.zip | |
fix libpng error wrt #491610
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/nexuiz/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/nexuiz/Manifest | 21 | ||||
| -rw-r--r-- | games-fps/nexuiz/files/nexuiz-2.5.2-libpng-1.4.patch | 42 | ||||
| -rw-r--r-- | games-fps/nexuiz/nexuiz-2.5.2.ebuild | 7 |
4 files changed, 70 insertions, 6 deletions
diff --git a/games-fps/nexuiz/ChangeLog b/games-fps/nexuiz/ChangeLog index a7a551f437c2..a75ca210ab13 100644 --- a/games-fps/nexuiz/ChangeLog +++ b/games-fps/nexuiz/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/nexuiz # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/ChangeLog,v 1.39 2013/03/25 23:26:51 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/ChangeLog,v 1.40 2013/11/19 01:03:52 hasufell Exp $ + + 19 Nov 2013; Julian Ospald <hasufell@gentoo.org> + +files/nexuiz-2.5.2-libpng-1.4.patch, nexuiz-2.5.2.ebuild: + fix libpng error wrt #491610 25 Mar 2013; Michael Sterrett <mr_bones_@gentoo.org> nexuiz-2.5.2.ebuild: add x11-libs/libXpm dep (bug #463288) diff --git a/games-fps/nexuiz/Manifest b/games-fps/nexuiz/Manifest index e4c9f9b929c0..19a1d284fb8f 100644 --- a/games-fps/nexuiz/Manifest +++ b/games-fps/nexuiz/Manifest @@ -1,5 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX nexuiz-2.5.2-libpng-1.4.patch 1607 SHA256 9b5113290e3dda77711ac430ff1bcbefcd793a640d012ced5dfe462857befc71 SHA512 38aa8fbd0765283c03c0bf6cc13362ed692f4776a12ad23ef582eb9c238fda6eea475284a662ba84d70eab7a7df71a0cb28b5b90f19c12d2594c3ba67f0851aa WHIRLPOOL 90f8f1cddc9df3d67430573da309f7e5b52cc0005021392493d380ef394671a2522a98c657a9a21804180bcaa7554f9ef1646028f9ea927ef9f9092d6a9fad61 DIST nexmappack_r2.zip 113533483 SHA256 15088c7632e0b4f487c789fba4296f44ef5a5d83b51adcb9e603e289e5b8241e -DIST nexuiz-252.zip 931253731 SHA256 a5e27ebcc9775c4a490d0d3536c32e4a8f8f96b038c0b6a78d1823c37a962000 -EBUILD nexuiz-2.5.2.ebuild 3012 SHA256 6bb4bdcdf71dddc55e78f4497fe678c61a31c509d6a18103a0379eea6dd64cf8 SHA512 70077139ad21fe7ed7a5d978680bd382cade395c4474e7bbe61989fe5ddb3a10fe4035b98e41f500511c62e4048c258decacbfcee0e8a628f7c82648d86e2c49 WHIRLPOOL a09f9d03d97ed04256e6e20694a79de52c59743d89637c5f6c1a4a665691c28f1c0bc1818962667dfb32ffdde154578ac01c21ee4f845e4793f764b38837ec7d -MISC ChangeLog 5466 SHA256 ccdbd1f9e1af9913538c71ccac0f43f0df2dd3299747473aded953e05f6834ef SHA512 9f2cf43d0053b327c781a24ceae4973a76acea37cbaddcdd41a868044fb78c4d2276ffc3b12b75703598b02e3fa92c2ecac83e718e30c9a93dc68b89eb4eb86c WHIRLPOOL 3e5b8c0b5741e44d91ddfae9d2467da2c2a2f1eaf35e798bed039b6174eecc093237d62ec2ac1a6eff9290abf656e3542531ec095b776baf0c9dcbf752dbe2d4 +DIST nexuiz-252.zip 931253731 SHA256 a5e27ebcc9775c4a490d0d3536c32e4a8f8f96b038c0b6a78d1823c37a962000 SHA512 da661eb2ff1764fed1d5f5547b89e4f9aa47613d41a3999c0202d8858ec2b882e4ef0ec182a81d1bdb25dff2ef65aad6af132009884e3557206941a736c2a68c WHIRLPOOL e3d08e4936a1fec97e024d0273162e15fbd4c68b13939f82c59ed2b5f613fa6f683423c753fd11d23c9be39f1bc620f2c0013456762773663a283078687eb21d +EBUILD nexuiz-2.5.2.ebuild 3093 SHA256 d3e40f75b78193ebeb7eeffd58e21bcd745ee708acb3f68718bec41803ea73be SHA512 471839904425703e7cd831b519ce1dc197a1132581e193c28f08caf52a87871f7c2038fbdfbe8bbd71f1de86872c99f112883f2353db86b4c8d440d05f7b7868 WHIRLPOOL 9493ef0a53783dd69a177a600ca051480fb6baa99c5cd98e7878befa98c9b6d0e83d6b487fa06b0fb34227f94a920012405897f0eec3f5b80274ad1f8a127fb2 +MISC ChangeLog 5609 SHA256 eabbcecddbbfb3dfe22a50923db5292b4d6bf8d130a139d197ed826704b5c73c SHA512 698983763d6f187c396653cee82684d9d95b4ba74734e239ec3963d44c5d3f35072dca6638c73b39ad6290c25c1fd525c4236ea3c0b0ade3b3106d5e51c3b4e0 WHIRLPOOL ad69a00036b868688889026345d4d63bb8f07f4cd0addf748766544a23fdb4a356765679b356051993ba9d83351a7bbe5cd34eed75be54e734adb7faaf59068c MISC metadata.xml 237 SHA256 a35634a2c24559545aef4e6e3a59cefa0c3d38644e83d1bbe30cd9530787b110 SHA512 f3d95ca414bd13f5ffe54c7ddf02ccc13866e32d17e61f0482fd131d2ce47d5357386aa0680e8a5fca166c1d0f9bf1cc2fc6772992d7fcfb83f64e7ba82e6ca8 WHIRLPOOL a822e0657d8ebc7de24c8b3ef25b2109ff843e271dae9259c6480b0ed18eeb4d8a52c215e5a7a9bb068fa3db405625392be2180bbb93c4a43a5807d4d0d7d85b +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQEcBAEBCAAGBQJSirj9AAoJEFpvPKfnPDWz52IIALCKxsHtYhh3qpTH6xfc7LNs +GWnqnKlfv7JJnoRMTEMOX+LNJ27z2iupXZ+yC6GpVFR+JwGwxqE3Rh4pq79/wShC +n8QIpnx94lFrogz2YNe6UsinD9NaovFrsxtC25fpxK2CiYB65La1X9mhtzUojFQg +VUoXoy4ZZq7HOq/I3a5WTX8c1yo/DdY4YH3/6AI0Ek7molviG5rCDCSHtWgkrfOE +wG41SpazqGqw6XgqA5qhfafExFpNA8vRayNJxkGXMAL45WA8N4RzmAThVZJlqKDZ +54VJfoA1VAeaD6rZKDpu1h5y5lekPw96k+BrYl8HFVDPgxMsHD7xEXHstr5X/rw= +=JZZz +-----END PGP SIGNATURE----- diff --git a/games-fps/nexuiz/files/nexuiz-2.5.2-libpng-1.4.patch b/games-fps/nexuiz/files/nexuiz-2.5.2-libpng-1.4.patch new file mode 100644 index 000000000000..0e064f8b6c3f --- /dev/null +++ b/games-fps/nexuiz/files/nexuiz-2.5.2-libpng-1.4.patch @@ -0,0 +1,42 @@ +fix compatibility with >=libpng-1.4 +https://bugs.gentoo.org/show_bug.cgi?id=491610 + +diff -Nur darkplaces.old/image_png.c darkplaces/image_png.c +--- darkplaces.old/image_png.c 2009-09-15 06:08:02.000000000 +0300 ++++ darkplaces/image_png.c 2010-01-28 01:23:24.000000000 +0200 +@@ -36,7 +36,7 @@ + static void* (*qpng_create_info_struct) (void*); + static void (*qpng_read_info) (void*, void*); + static void (*qpng_set_expand) (void*); +-static void (*qpng_set_gray_1_2_4_to_8) (void*); ++static void (*qpng_set_expand_gray_1_2_4_to_8) (void*); + static void (*qpng_set_palette_to_rgb) (void*); + static void (*qpng_set_tRNS_to_alpha) (void*); + static void (*qpng_set_gray_to_rgb) (void*); +@@ -61,7 +61,7 @@ + {"png_create_info_struct", (void **) &qpng_create_info_struct}, + {"png_read_info", (void **) &qpng_read_info}, + {"png_set_expand", (void **) &qpng_set_expand}, +- {"png_set_gray_1_2_4_to_8", (void **) &qpng_set_gray_1_2_4_to_8}, ++ {"png_set_expand_gray_1_2_4_to_8", (void **) &qpng_set_expand_gray_1_2_4_to_8}, + {"png_set_palette_to_rgb", (void **) &qpng_set_palette_to_rgb}, + {"png_set_tRNS_to_alpha", (void **) &qpng_set_tRNS_to_alpha}, + {"png_set_gray_to_rgb", (void **) &qpng_set_gray_to_rgb}, +@@ -110,7 +110,7 @@ + #elif defined(MACOSX) + "libpng12.0.dylib", + #else +- "libpng12.so.0", ++ "libpng14.so.0", + "libpng.so", // FreeBSD + #endif + NULL +@@ -311,7 +311,7 @@ + { + qpng_set_gray_to_rgb(png); + if (my_png.BitDepth < 8) +- qpng_set_gray_1_2_4_to_8(png); ++ qpng_set_expand_gray_1_2_4_to_8(png); + } + + if (qpng_get_valid(png, pnginfo, PNG_INFO_tRNS)) diff --git a/games-fps/nexuiz/nexuiz-2.5.2.ebuild b/games-fps/nexuiz/nexuiz-2.5.2.ebuild index 8bdb2edc1403..7144143d52c2 100644 --- a/games-fps/nexuiz/nexuiz-2.5.2.ebuild +++ b/games-fps/nexuiz/nexuiz-2.5.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/nexuiz-2.5.2.ebuild,v 1.5 2013/03/25 23:26:51 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/nexuiz-2.5.2.ebuild,v 1.6 2013/11/19 01:03:52 hasufell Exp $ EAPI=2 inherit eutils games @@ -18,10 +18,11 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="alsa dedicated maps opengl sdl" +# no headers for libpng needed UIRDEPEND="media-libs/libogg media-libs/libvorbis media-libs/libtheora - media-libs/libpng + >=media-libs/libpng-1.4 media-libs/libmodplug x11-libs/libX11 x11-libs/libXau @@ -63,6 +64,8 @@ src_unpack() { } src_prepare() { + epatch "${FILESDIR}"/${P}-libpng-1.4.patch + # Make the game automatically look in the correct data directory sed -i \ -e "/^CC=/d" \ |