From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 384D41391AD for ; Tue, 25 Oct 2016 18:32:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14BE5E0BD2; Tue, 25 Oct 2016 18:32:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E352AE0BD2 for ; Tue, 25 Oct 2016 18:32:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F6EA3415B6 for ; Tue, 25 Oct 2016 18:32:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8DB4C24A0 for ; Tue, 25 Oct 2016 18:32:17 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1477420290.76b2b785f2e4e336b69af671363ea04f55ed443d.soap@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-ffmpeg-2.9.patch media-libs/libextractor/files/libextractor-1.3-giflib-5.patch media-libs/libextractor/libextractor-1.3-r1.ebuild X-VCS-Directories: media-libs/libextractor/files/ media-libs/libextractor/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 76b2b785f2e4e336b69af671363ea04f55ed443d X-VCS-Branch: master Date: Tue, 25 Oct 2016 18:32:17 +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: face25c3-1e8e-4b86-a33b-77a476d99725 X-Archives-Hash: 433c16eaf6b04b4bec338b395a1af548 commit: 76b2b785f2e4e336b69af671363ea04f55ed443d Author: Craig Andrews integralblue com> AuthorDate: Mon Oct 24 20:05:15 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Oct 25 18:31:30 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76b2b785 media-libs/libextractor: ffmpeg 2.9+ fix Gentoo-bug: 575774 * EAPI=6 * Made PATCHES -p1 compliant * Add missing sub-slot operators * Remove .la files unconditionally * emake fully parallelised now Closes: https://github.com/gentoo/gentoo/pull/2659 Signed-off-by: David Seifert gentoo.org> .../files/libextractor-1.3-ffmpeg-2.9.patch | 52 ++++++++++ .../files/libextractor-1.3-giflib-5.patch | 4 +- media-libs/libextractor/libextractor-1.3-r1.ebuild | 113 +++++++++++++++++++++ 3 files changed, 167 insertions(+), 2 deletions(-) diff --git a/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch b/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch new file mode 100644 index 00000000..d9e50b6 --- /dev/null +++ b/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch @@ -0,0 +1,52 @@ +Description: Replace deprecated FFmpeg API +Author: Andreas Cadhalpun +Last-Update: <2015-11-28> + +--- libextractor-1.3.orig/src/plugins/thumbnailffmpeg_extractor.c ++++ libextractor-1.3/src/plugins/thumbnailffmpeg_extractor.c +@@ -153,7 +153,7 @@ seek_cb (void *opaque, + static size_t + create_thumbnail (int src_width, int src_height, + int src_stride[], +- enum PixelFormat src_pixfmt, ++ enum AVPixelFormat src_pixfmt, + const uint8_t * const src_data[], + int dst_width, int dst_height, + uint8_t **output_data, +@@ -189,7 +189,7 @@ create_thumbnail (int src_width, int src + if (NULL == + (scaler_ctx = + sws_getContext (src_width, src_height, src_pixfmt, +- dst_width, dst_height, PIX_FMT_RGB24, ++ dst_width, dst_height, AV_PIX_FMT_RGB24, + SWS_BILINEAR, NULL, NULL, NULL))) + { + #if DEBUG +@@ -214,7 +214,7 @@ create_thumbnail (int src_width, int src + return 0; + } + if (NULL == (dst_buffer = +- av_malloc (avpicture_get_size (PIX_FMT_RGB24, dst_width, dst_height)))) ++ av_malloc (avpicture_get_size (AV_PIX_FMT_RGB24, dst_width, dst_height)))) + { + #if DEBUG + fprintf (stderr, +@@ -229,7 +229,7 @@ create_thumbnail (int src_width, int src + return 0; + } + avpicture_fill ((AVPicture *) dst_frame, dst_buffer, +- PIX_FMT_RGB24, dst_width, dst_height); ++ AV_PIX_FMT_RGB24, dst_width, dst_height); + sws_scale (scaler_ctx, + src_data, + src_stride, +@@ -272,7 +272,7 @@ create_thumbnail (int src_width, int src + } + encoder_codec_ctx->width = dst_width; + encoder_codec_ctx->height = dst_height; +- encoder_codec_ctx->pix_fmt = PIX_FMT_RGB24; ++ encoder_codec_ctx->pix_fmt = AV_PIX_FMT_RGB24; + opts = NULL; + if (avcodec_open2 (encoder_codec_ctx, encoder_codec, &opts) < 0) + { + diff --git a/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch b/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch index ea0aeeb..4893f97 100644 --- a/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch +++ b/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch @@ -7,8 +7,8 @@ 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) +--- a/src/plugins/gif_extractor.c (revision 34094) ++++ b/src/plugins/gif_extractor.c (revision 34095) @@ -78,7 +78,11 @@ EXTRACTOR_gif_extract_method (struct EXT if (gif_file == NULL || gif_error != 0) { diff --git a/media-libs/libextractor/libextractor-1.3-r1.ebuild b/media-libs/libextractor/libextractor-1.3-r1.ebuild new file mode 100644 index 00000000..cd34de2 --- /dev/null +++ b/media-libs/libextractor/libextractor-1.3-r1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DESCRIPTION="A library used to extract metadata from files of arbitrary type" +HOMEPAGE="https://www.gnu.org/software/libextractor/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm ppc ppc64 x86" +IUSE="+archive +bzip2 ffmpeg flac gif gsf gtk jpeg mp4 +magic midi mpeg tidy tiff vorbis +zlib" # test + +RESTRICT="test" + +RDEPEND="app-text/iso-codes + >=dev-libs/glib-2 + media-gfx/exiv2:= + sys-devel/libtool + virtual/libiconv + virtual/libintl + archive? ( app-arch/libarchive:= ) + bzip2? ( app-arch/bzip2 ) + ffmpeg? ( virtual/ffmpeg ) + flac? ( + media-libs/flac + media-libs/libogg + ) + gif? ( media-libs/giflib:= ) + gsf? ( gnome-extra/libgsf:= ) + gtk? ( x11-libs/gtk+:3 ) + jpeg? ( virtual/jpeg:0 ) + mp4? ( media-libs/libmp4v2:0 ) + magic? ( sys-apps/file ) + midi? ( media-libs/libsmf ) + mpeg? ( media-libs/libmpeg2 ) + tidy? ( app-text/htmltidy ) + tiff? ( media-libs/tiff:0 ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + zlib? ( sys-libs/zlib ) + !