From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6CC6E1388BF for ; Fri, 19 Feb 2016 01:25:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D477321C028; Fri, 19 Feb 2016 01:25:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6E22721C028 for ; Fri, 19 Feb 2016 01:25:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32B45340D3E for ; Fri, 19 Feb 2016 01:25:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DECBE154D for ; Fri, 19 Feb 2016 01:24:55 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1455844997.6bd37a439b8ad81c4bd536351b5fd7c008b1819e.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/files/, media-libs/libextractor/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libextractor/files/libextractor-1.3-giflib-5.patch media-libs/libextractor/libextractor-1.3.ebuild X-VCS-Directories: media-libs/libextractor/files/ media-libs/libextractor/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 6bd37a439b8ad81c4bd536351b5fd7c008b1819e X-VCS-Branch: master Date: Fri, 19 Feb 2016 01:24:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6403e53a-46a4-4d79-acb7-725a6b0eded4 X-Archives-Hash: f0c3c9cafc66e2a4f5b0e92d443636af commit: 6bd37a439b8ad81c4bd536351b5fd7c008b1819e Author: Mike Frysinger gentoo org> AuthorDate: Fri Feb 19 01:23:00 2016 +0000 Commit: Mike Frysinger gentoo 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 ::' \