[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/files/, media-libs/libextractor/

[Mike Frysinger]

commit:     6bd37a439b8ad81c4bd536351b5fd7c008b1819e
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 01:23:00 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 01:23:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bd37a43

media-libs/libextractor: add upstream giflib-5 fix #571902

 .../files/libextractor-1.3-giflib-5.patch          | 37 ++++++++++++++++++++++
 media-libs/libextractor/libextractor-1.3.ebuild    |  2 ++
 2 files changed, 39 insertions(+)

diff --git a/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch b/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch
new file mode 100644
index 0000000..ea0aeeb
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/571902
+
+------------------------------------------------------------------------
+r34095 | LRN | 2014-07-31 10:58:51 -0400 (Thu, 31 Jul 2014) | 1 line
+
+Add giflib-5.1.0 compatibility
+
+Index: src/plugins/gif_extractor.c
+===================================================================
+--- src/plugins/gif_extractor.c	(revision 34094)
++++ src/plugins/gif_extractor.c	(revision 34095)
+@@ -78,7 +78,11 @@ EXTRACTOR_gif_extract_method (struct EXT
+   if (gif_file == NULL || gif_error != 0)
+   {
+     if (gif_file != NULL)
++#if GIFLIB_MAJOR < 5 || GIFLIB_MINOR < 1
+       EGifCloseFile (gif_file);
++#else
++      EGifCloseFile (gif_file, NULL);
++#endif
+     return; /* not a GIF */
+   }
+ #endif
+@@ -133,7 +137,11 @@ EXTRACTOR_gif_extract_method (struct EXT
+ 	       DGifGetExtensionNext(gif_file, &ext)) &&
+ 	      (NULL != ext) ) ; /* keep going */
+     }
++#if defined (GIF_LIB_VERSION) || GIFLIB_MAJOR < 5 || GIFLIB_MINOR < 1
+   DGifCloseFile (gif_file);
++#else
++  DGifCloseFile (gif_file, NULL);
++#endif
+ }
+ 
+ /* end of gif_extractor.c */
+
+------------------------------------------------------------------------

diff --git a/media-libs/libextractor/libextractor-1.3.ebuild b/media-libs/libextractor/libextractor-1.3.ebuild
index 1faf226..08e3508 100644
--- a/media-libs/libextractor/libextractor-1.3.ebuild
+++ b/media-libs/libextractor/libextractor-1.3.ebuild
@@ -55,6 +55,8 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-giflib-5.patch #571902
+
 	# m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs:
 	sed -i \
 		-e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \