diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2011-12-21 18:46:00 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2011-12-21 18:46:00 +0000 |
| commit | dfa779c06a394c5a69a6b83031222a395cd205a4 (patch) | |
| tree | e7c1cdbc4d58853b0cb523a2bf34fa040561c6a2 /games-strategy | |
| parent | Stable for AMD64, wrt bug #395449 (diff) | |
| download | historical-dfa779c06a394c5a69a6b83031222a395cd205a4.tar.gz historical-dfa779c06a394c5a69a6b83031222a395cd205a4.tar.bz2 historical-dfa779c06a394c5a69a6b83031222a395cd205a4.zip | |
patch to build against newer libpng from jannis (bug #395501)
Package-Manager: portage-2.1.10.41/cvs/Linux i686
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/wargus/ChangeLog | 8 | ||||
| -rw-r--r-- | games-strategy/wargus/Manifest | 5 | ||||
| -rw-r--r-- | games-strategy/wargus/files/wargus-2.2.5.5-libpng.patch | 36 | ||||
| -rw-r--r-- | games-strategy/wargus/wargus-2.2.5.5.ebuild | 5 |
4 files changed, 48 insertions, 6 deletions
diff --git a/games-strategy/wargus/ChangeLog b/games-strategy/wargus/ChangeLog index 995d31afead5..0c2348236bbd 100644 --- a/games-strategy/wargus/ChangeLog +++ b/games-strategy/wargus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/wargus -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/ChangeLog,v 1.12 2010/11/29 07:05:41 mr_bones_ Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/ChangeLog,v 1.13 2011/12/21 18:46:00 mr_bones_ Exp $ + + 21 Dec 2011; Michael Sterrett <mr_bones_@gentoo.org> wargus-2.2.5.5.ebuild, + +files/wargus-2.2.5.5-libpng.patch: + patch to build against newer libpng from jannis (bug #395501) *wargus-2.2.5.5 (29 Nov 2010) diff --git a/games-strategy/wargus/Manifest b/games-strategy/wargus/Manifest index 7ef037ae7c28..d628426c9c90 100644 --- a/games-strategy/wargus/Manifest +++ b/games-strategy/wargus/Manifest @@ -1,5 +1,6 @@ +AUX wargus-2.2.5.5-libpng.patch 974 RMD160 fe10e98e1e358aac9954fdba745011fbe903eb0e SHA1 7e79bee2ac19730e1a47e1cf4893232fe0e0ade1 SHA256 b48b53ee2f18abc5e4a76f72eca6702baf39ac129765f906ce1e33985b442c15 DIST wargus.png 7561 RMD160 b8ce62f3a60045b8b32a0f459df1849496d2402e SHA1 eb14c74b682fdeb6014f5951a56c7f66ede79f23 SHA256 f8190a41f5131c45c76cb6d91c97e7fcf48c4fcd26cb231802c224c7e19ac0bd DIST wargus_2.2.5.5.orig.tar.gz 3605444 RMD160 3da58129f9a3221e306afe019655072fa25e230a SHA1 a34511c50d1f0ac838558780daa790f7585113d1 SHA256 561d0ac5e88abcd5663fca1f7793ee20739aa0d641420bf0a6b7424ebd4ab14f -EBUILD wargus-2.2.5.5.ebuild 999 RMD160 f415501505e180f4e87399241285641052e607d8 SHA1 3802d26535214bccbe0fa87c1aa46207e7aa16e8 SHA256 da4f92a752a52c3c513a8012e2c597c95fa0c93a6e7d44788802f400a9c62c41 -MISC ChangeLog 2440 RMD160 34b473101148b4948d811d008274d6be4c0d8b4d SHA1 2113c456c0bd3a3dd0088eb72d3e784f9598036c SHA256 9b88ff7ccbee7c723c22f0ce55aec252871489d9bbcef5f0e64a054fe33b9e23 +EBUILD wargus-2.2.5.5.ebuild 1039 RMD160 c3932d436e3d0657059a604f8edd60ecf2dae040 SHA1 a150acd602e976739686226e609b6d27f19d99ce SHA256 6273e339a19ad14f01d0d778105d9ab7ca3941a7c85f7d7dc93a3a972a9971d2 +MISC ChangeLog 2621 RMD160 24fcd41732600dc144dda48f73212d61f325e224 SHA1 8ff0f83cfd0196d6aea2733f9dadb6a49feec109 SHA256 36dca736fcbaf3bf536288a90b98eb2f317a7ea8c1f00fcf628cb8455810f505 MISC metadata.xml 160 RMD160 f839c00d9f25c1f873f95ab899fb64060c1d0bf5 SHA1 08c3d180cf8dbef87e40c42a18b457516a5d7ffe SHA256 5ac0a3647e8149d52ce55d391cf1680ac52d6f0330be21c3bca4790b971b5e5d diff --git a/games-strategy/wargus/files/wargus-2.2.5.5-libpng.patch b/games-strategy/wargus/files/wargus-2.2.5.5-libpng.patch new file mode 100644 index 000000000000..65ebc12ce8e9 --- /dev/null +++ b/games-strategy/wargus/files/wargus-2.2.5.5-libpng.patch @@ -0,0 +1,36 @@ +--- wartool.orig.c ++++ wartool.c +@@ -61,6 +61,7 @@ + #include <unistd.h> + #endif + #include <ctype.h> ++#include <zlib.h> + #include <png.h> + + #include "endian.h" +@@ -1876,7 +1877,7 @@ + return 1; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + // FIXME: must free buffers!! + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp); +@@ -1888,14 +1889,8 @@ + png_set_compression_level(png_ptr, Z_BEST_COMPRESSION); + + // prepare the file information +- info_ptr->width = w; +- info_ptr->height = h; +- info_ptr->bit_depth = 8; +- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; +- info_ptr->interlace_type = 0; +- info_ptr->valid |= PNG_INFO_PLTE; +- info_ptr->palette = (png_colorp)pal; +- info_ptr->num_palette = 256; ++ png_set_IHDR(png_ptr, info_ptr, w, h, 8, PNG_COLOR_TYPE_PALETTE, 0, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); ++ png_set_PLTE(png_ptr, info_ptr, (png_colorp)pal, 256); + + if (transparent) { + unsigned char* p; diff --git a/games-strategy/wargus/wargus-2.2.5.5.ebuild b/games-strategy/wargus/wargus-2.2.5.5.ebuild index 11cc402e4038..fbb3a85cc553 100644 --- a/games-strategy/wargus/wargus-2.2.5.5.ebuild +++ b/games-strategy/wargus/wargus-2.2.5.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/wargus-2.2.5.5.ebuild,v 1.4 2011/03/09 22:55:07 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/wargus-2.2.5.5.ebuild,v 1.5 2011/12/21 18:46:00 mr_bones_ Exp $ EAPI=2 inherit eutils games @@ -20,6 +20,7 @@ RDEPEND="=games-engines/stratagus-${PV}*" src_prepare() { cdrom_get_cds data/rezdat.war + epatch "${FILESDIR}/${P}-libpng.patch" edos2unix build.sh } |