Fix build with latest giflib, bug #488992 by Boris Vingradov and fix by László Szalma.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 115 insertions, 16 deletions

diff --git a/media-gfx/swftools/ChangeLog b/media-gfx/swftools/ChangeLog
index 10d7c45784cd..4fcda4da818c 100644
--- a/media-gfx/swftools/ChangeLog
+++ b/media-gfx/swftools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/swftools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/ChangeLog,v 1.42 2013/03/03 19:30:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/ChangeLog,v 1.43 2013/10/26 16:50:15 pacho Exp $
+
+  26 Oct 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/swftools-0.9.2_giflib.patch, swftools-0.9.2.ebuild:
+  Fix build with latest giflib, bug #488992 by Boris Vingradov and fix by László
+  Szalma.
 
   03 Mar 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Add to proxy-maintainers herd
diff --git a/media-gfx/swftools/Manifest b/media-gfx/swftools/Manifest
index ac3751795ca0..df5fa960f5cf 100644
--- a/media-gfx/swftools/Manifest
+++ b/media-gfx/swftools/Manifest
@@ -2,15 +2,16 @@
 Hash: SHA256
 
 AUX swftools-0.9.2_general.patch 1747 SHA256 593d5b4c480b6203bd3d5a875b1e5bdb8efa6038df7c1999cc665a9e76737608 SHA512 c6874f0a12939f67f93a1c7615e3dfe5ecdfadffe1bb9f790be44815b4329758566e8a10eb7d4ed6757580f4c8c0251ced12908a1555c500efb41727ef05307c WHIRLPOOL 0d164c592ddc8285a3a203d753b305c530f7b012428823ab5cdc56ece9550db7cc1e7884b96a6da70bd491e9744fd777e63e23bebbc71a613e706ca69a17307b
+AUX swftools-0.9.2_giflib.patch 2687 SHA256 f78e68d7ecf09169df43ae6fe6c7092e84d578ba4199c7f463250e1d38bde7c0 SHA512 88f8bf4d75578656ff37498cdfb4c577dda85f192222b749708dabffc27314605ca930aa6a8686e2205f0dd81f5b53988432685430ac0f8f15ac538658e6a03c WHIRLPOOL a60f0f6244f804a0c732fdc9dc927473436237f6870c215c77aaf2740ee9510c061c9177ddd4f5ccec42c298a85ad193590c5fb748ea260aa20377b655c53a98
 AUX swftools-0.9.2_nopdf.patch 2366 SHA256 5a5326f28647a98cd472e64c7a613ce65a76a0af89fbf8ee7d5be7f52e1fa2a7 SHA512 aaecc86d3cea1b97d748959fdf00c4249891bc3ff4d668e7d7a2ec5277e53cc9bda9281a2de065c9395aab49175f5438822d82641a24768997ec48cd4bcd213b WHIRLPOOL 4f5f32e0f3c3239750b091271111aec1c2b732b251dfa0a71dcaf761cdf8baff5dcd5509607b3f4130a21da1d452755065b60fa96e05d41158506c8fba39d216
-DIST swftools-0.9.2.tar.gz 2675939 SHA256 bf6891bfc6bf535a1a99a485478f7896ebacbe3bbf545ba551298080a26f01f1
-EBUILD swftools-0.9.2.ebuild 1001 SHA256 97d33e5e15d7eb6e533c490edb975015c9d3614b007ad2d735f4ad9a37afc508 SHA512 68761282e3ce594db513205919a86e06de72fa3cd1fafc721f4b3ff9307dc84cab461e893ef680a429dfd64a477760c338b30cccdbdf36817ea500ce2876c67d WHIRLPOOL 7d13a812b4f9ce9f56b03bac50bc7ad523c21a81e746e5b57ee8933e9ee2573429337d318fb9460b1d6e31f2bd86610a699abdd623035da225e69d4d00a659fa
-MISC ChangeLog 886 SHA256 86d31cab0bdc63716a563a8fe1fad4e4a54d6bb7ba9ecd5908871eff7b4c5852 SHA512 f4e9411a6f6da22848e9ee586a5306d07a76eb241b5db7ea5e98cb3727e7a99dd99cf11878ae17bc7873b9e885ea6f5d54450ed52a52d11350c0db6c614f58bf WHIRLPOOL e9e58c6e761c5bec4b3a2fbd0560b63e2fb3a361466776df751607de9dccf14cb266ea0d4d9f05bdad923dd64cbad6a268a8607e35d529ac6dc59421cea7703e
+DIST swftools-0.9.2.tar.gz 2675939 SHA256 bf6891bfc6bf535a1a99a485478f7896ebacbe3bbf545ba551298080a26f01f1 SHA512 91bbd48914f9a8a1cdf85532b371721b01982c5f88648b908fbe99fbf4e17e9893ce575e4fd699927e9bc1c79d846f6bcd4f1d868578fb17403467cc1e28259b WHIRLPOOL a0c4699db82f488e464ad2246840de616595025e0f5f35880db2972b438deb503a5a702f911dd997e85e3ccc61e90515391090b5ec7289d1370f35bf00e36bf3
+EBUILD swftools-0.9.2.ebuild 1025 SHA256 926c77a35710dd58c4a4ddec0de5f8e33e0d3f8d01563d6587d348cf26b9b4bd SHA512 fb8c389bdc6b7166eeba29ef9796a9f9ac7763e6ba77ea2792313cde907c54086306de38e1f22ad6752485b9805bc9d6df2d4c6300f85ffe151c0c13e22d8aeb WHIRLPOOL 524e8e26734b198ed44da46c08d53a529de1a82db341cb42bed7bbb0411cca087f7db596ea9105c25c7dd7f70e8729f66d1b0732c33d0882ce5051ab9e57eaf7
+MISC ChangeLog 1087 SHA256 cb6ff2f1fe48dc2d512e81e90260861176ece435df23086be90b354624097cf1 SHA512 13bee060182bfa5a09072fbccb4eb1e154df524a3857629df38cc0f73a5404be154c4814a00b5efd31771f5e96183e768861c2bc41151f7b7e8fb766c649b1e1 WHIRLPOOL ce533fbda78db1f5cb430f2e6688247d5c4ddcc2f01adf021c71e83215e86bd34e0bf2df62bc92daf191ee26839dc040f66290bc6953e7ae23edd74bbf6d5669
 MISC metadata.xml 401 SHA256 ecb9fe5d7858f4e366e857d917b84e9bc22cf88cb2012f1c551eea9540944e97 SHA512 7a45b5242d53056efec2b5b7909d7c33683e67462697ab1318cc7a70c76f273d9b92f3d30ed885322a171c5759bf8563c178a686a2828f38b4a40b6b6a59f00e WHIRLPOOL e7e53fbe441a5260b737a0308450f0135f355a1985c7dcbd8e7e2f827b3c423ea9f7f58013b71b06944aa2d738b32cf82e12801d57da8e6d2ac1cadaa8a2ca4c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlEzpNgACgkQCaWpQKGI+9RU5ACcCQDJ8J8Bk+PmmgtAkA//WTiS
-08sAniBPeIkFxF/56mZxONXTrsPCNaHA
-=CLU9
+iEYEAREIAAYFAlJr8sgACgkQCaWpQKGI+9QzOACeN+cHnGbFT8EaUyvwTd9lX69J
+sYsAn2r37+owM04JqiBr15EIP53j41+P
+=Er5A
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/swftools/files/swftools-0.9.2_giflib.patch b/media-gfx/swftools/files/swftools-0.9.2_giflib.patch
new file mode 100644
index 000000000000..913b5e3b08d1
--- /dev/null
+++ b/media-gfx/swftools/files/swftools-0.9.2_giflib.patch
@@ -0,0 +1,89 @@
+From 05c1df6a6da28734533722dc0ac99ea5b206a492 Mon Sep 17 00:00:00 2001
+From: Matthias Kramm <kramm@quiss.org>
+Date: Sat, 6 Jul 2013 12:09:53 -0700
+Subject: [PATCH] applied giflib patch from Jan Engelhardt
+
+---
+ src/gif2swf.c | 28 ++++++++++++++++++++++++----
+ 1 file changed, 24 insertions(+), 4 deletions(-)
+
+diff --git a/src/gif2swf.c b/src/gif2swf.c
+index 2359da5..5e52ea8 100644
+--- a/src/gif2swf.c
++++ b/src/gif2swf.c
+@@ -222,6 +222,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id, int imgidx)
+ 
+     GifFileType *gft;
+     FILE *fi;
++    int ret;
+ 
+     if ((fi = fopen(sname, "rb")) == NULL) {
+         if (VERBOSE(1))
+@@ -230,13 +231,24 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id, int imgidx)
+     }
+     fclose(fi);
+ 
+-    if ((gft = DGifOpenFileName(sname)) == NULL) {
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
++    gft = DGifOpenFileName(sname, NULL);
++#else
++    gft = DGifOpenFileName(sname);
++#endif
++    if (gft == NULL) {
+         fprintf(stderr, "%s is not a GIF file!\n", sname);
+         return t;
+     }
+ 
+-    if (DGifSlurp(gft) != GIF_OK) {
++    if ((ret = DGifSlurp(gft)) != GIF_OK) {
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2
++        fprintf(stderr, "GIF-LIB: %s\n", GifErrorString());
++#elif defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
++        fprintf(stderr, "GIF-LIB: %s\n", GifErrorString(ret));
++#else
+         PrintGifError();
++#endif
+         return t;
+     }
+ 
+@@ -465,6 +475,7 @@ int CheckInputFile(char *fname, char **realname)
+     FILE *fi;
+     char *s = malloc(strlen(fname) + 5);
+     GifFileType *gft;
++    int ret;
+ 
+     if (!s)
+         exit(2);
+@@ -488,7 +499,12 @@ int CheckInputFile(char *fname, char **realname)
+     }
+     fclose(fi);
+ 
+-    if ((gft = DGifOpenFileName(s)) == NULL) {
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
++    gft = DGifOpenFileName(s, NULL);
++#else
++    gft = DGifOpenFileName(s);
++#endif
++    if (gft == NULL) {
+         fprintf(stderr, "%s is not a GIF file!\n", fname);
+         return -1;
+     }
+@@ -498,8 +514,14 @@ int CheckInputFile(char *fname, char **realname)
+     if (global.max_image_height < gft->SHeight)
+         global.max_image_height = gft->SHeight;
+ 
+-    if (DGifSlurp(gft) != GIF_OK) { 
++    if ((ret = DGifSlurp(gft)) != GIF_OK) {
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2
++        fprintf(stderr, "GIF-LIB: %s\n", GifErrorString());
++#elif defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
++        fprintf(stderr, "GIF-LIB: %s\n", GifErrorString(ret));
++#else
+         PrintGifError();
++#endif
+         return -1;
+     }
+     // After DGifSlurp() call, gft->ImageCount become available
+-- 
+1.8.4
+
diff --git a/media-gfx/swftools/swftools-0.9.2.ebuild b/media-gfx/swftools/swftools-0.9.2.ebuild
index 7c31e7b149dd..b18a6e1c0fc9 100644
--- a/media-gfx/swftools/swftools-0.9.2.ebuild
+++ b/media-gfx/swftools/swftools-0.9.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/swftools-0.9.2.ebuild,v 1.2 2012/05/22 11:12:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/swftools-0.9.2.ebuild,v 1.3 2013/10/26 16:50:15 pacho Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils
 
 DESCRIPTION="SWF Tools is a collection of SWF manipulation and generation utilities"
@@ -14,15 +14,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=media-libs/t1lib-1.3.1
+RDEPEND="
+	>=media-libs/t1lib-1.3.1
 	media-libs/freetype
-	virtual/jpeg"
+	virtual/jpeg
+"
 DEPEND="${RDEPEND}
-	!<media-libs/ming-0.4.0_rc2"
+	!<media-libs/ming-0.4.0_rc2
+"
 
 src_prepare() {
-	epatch "${FILESDIR}"/swftools-0.9.2_nopdf.patch
-	epatch "${FILESDIR}"/swftools-0.9.2_general.patch
+	epatch "${FILESDIR}"/${P}_nopdf.patch
+	epatch "${FILESDIR}"/${P}_general.patch
+	epatch "${FILESDIR}"/${P}_giflib.patch
 }
 
 src_configure() {