| 1 |
commit: 6d21e198bd0679145b72707988dbed60b614f1a2 |
| 2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 9 10:37:53 2016 +0000 |
| 4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 9 11:17:59 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d21e198 |
| 7 |
|
| 8 |
media-gfx/swftools: Fix giflib-5.1 support (#572088 by Hank Leininger) |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.1 |
| 11 |
|
| 12 |
.../swftools/files/swftools-0.9.2_giflib5.patch | 26 ++++++++++++++++++++++ |
| 13 |
...tools-0.9.2.ebuild => swftools-0.9.2-r1.ebuild} | 8 ++++--- |
| 14 |
2 files changed, 31 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-gfx/swftools/files/swftools-0.9.2_giflib5.patch b/media-gfx/swftools/files/swftools-0.9.2_giflib5.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000..6450f82 |
| 19 |
--- /dev/null |
| 20 |
+++ b/media-gfx/swftools/files/swftools-0.9.2_giflib5.patch |
| 21 |
@@ -0,0 +1,26 @@ |
| 22 |
+--- swftools-0.9.2.orig/src/gif2swf.c 2016-02-16 16:15:39.697992195 -0500 |
| 23 |
++++ swftools-0.9.2/src/gif2swf.c 2016-02-16 16:25:37.047992256 -0500 |
| 24 |
+@@ -467,7 +467,11 @@ |
| 25 |
+ |
| 26 |
+ free(pal); |
| 27 |
+ free(imagedata); |
| 28 |
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 |
| 29 |
++ DGifCloseFile(gft, D_GIF_SUCCEEDED); |
| 30 |
++#else |
| 31 |
+ DGifCloseFile(gft); |
| 32 |
++#endif |
| 33 |
+ |
| 34 |
+ return t; |
| 35 |
+ } |
| 36 |
+@@ -542,7 +546,11 @@ |
| 37 |
+ fprintf(stderr, "frame: %u, delay: %.3f sec\n", i + 1, getGifDelayTime(gft, i) / 100.0); |
| 38 |
+ } |
| 39 |
+ |
| 40 |
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 |
| 41 |
++ DGifCloseFile(gft, D_GIF_SUCCEEDED); |
| 42 |
++#else |
| 43 |
+ DGifCloseFile(gft); |
| 44 |
++#endif |
| 45 |
+ |
| 46 |
+ return 0; |
| 47 |
+ } |
| 48 |
|
| 49 |
diff --git a/media-gfx/swftools/swftools-0.9.2.ebuild b/media-gfx/swftools/swftools-0.9.2-r1.ebuild |
| 50 |
similarity index 84% |
| 51 |
rename from media-gfx/swftools/swftools-0.9.2.ebuild |
| 52 |
rename to media-gfx/swftools/swftools-0.9.2-r1.ebuild |
| 53 |
index 8f0cd43..0defd16 100644 |
| 54 |
--- a/media-gfx/swftools/swftools-0.9.2.ebuild |
| 55 |
+++ b/media-gfx/swftools/swftools-0.9.2-r1.ebuild |
| 56 |
@@ -1,4 +1,4 @@ |
| 57 |
-# Copyright 1999-2013 Gentoo Foundation |
| 58 |
+# Copyright 1999-2016 Gentoo Foundation |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
# $Id$ |
| 61 |
|
| 62 |
@@ -16,8 +16,9 @@ IUSE="" |
| 63 |
|
| 64 |
RDEPEND=" |
| 65 |
app-text/poppler |
| 66 |
- >=media-libs/t1lib-1.3.1 |
| 67 |
- media-libs/freetype |
| 68 |
+ media-libs/freetype:2 |
| 69 |
+ media-libs/giflib:0= |
| 70 |
+ >=media-libs/t1lib-1.3.1:5 |
| 71 |
virtual/jpeg |
| 72 |
" |
| 73 |
DEPEND="${RDEPEND} |
| 74 |
@@ -28,6 +29,7 @@ src_prepare() { |
| 75 |
epatch "${FILESDIR}"/${P}_nopdf.patch |
| 76 |
epatch "${FILESDIR}"/${P}_general.patch |
| 77 |
epatch "${FILESDIR}"/${P}_giflib.patch |
| 78 |
+ epatch "${FILESDIR}"/${P}_giflib5.patch |
| 79 |
} |
| 80 |
|
| 81 |
src_configure() { |
Archives