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 1F3F9139694 for ; Sat, 17 Jun 2017 20:49:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B52DE084F; Sat, 17 Jun 2017 20:49:51 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 5B3BFE084F for ; Sat, 17 Jun 2017 20:49:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC56F341B06 for ; Sat, 17 Jun 2017 20:49:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 16CB7747E for ; Sat, 17 Jun 2017 20:49:48 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1497732575.00c65df99751d235e08fe2f54613dac2eeb2f80b.asturm@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-exiv2-0.26.patch media-libs/libextractor/libextractor-1.3-r1.ebuild X-VCS-Directories: media-libs/libextractor/files/ media-libs/libextractor/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 00c65df99751d235e08fe2f54613dac2eeb2f80b X-VCS-Branch: master Date: Sat, 17 Jun 2017 20:49:48 +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: 0e282f5d-3b01-46d4-b8c3-9ad3776ee024 X-Archives-Hash: 5e4860fe999c5e3a5517d1f437a809b8 commit: 00c65df99751d235e08fe2f54613dac2eeb2f80b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 17 20:36:09 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 17 20:49:35 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00c65df9 media-libs/libextractor: Fix build with media-gfx/exiv2-0.26 Gentoo-bug: 621242 Package-Manager: Portage-2.3.5, Repoman-2.3.1 .../files/libextractor-1.3-exiv2-0.26.patch | 27 ++++++++++++++++++++++ media-libs/libextractor/libextractor-1.3-r1.ebuild | 26 ++++++++++++--------- 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch b/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch new file mode 100644 index 00000000000..b6e0b41773b --- /dev/null +++ b/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch @@ -0,0 +1,27 @@ +--- a/src/plugins/exiv2_extractor.cc 2013-06-25 13:02:05.000000000 +0200 ++++ b/src/plugins/exiv2_extractor.cc 2017-06-10 14:22:57.000000000 +0200 +@@ -180,7 +180,11 @@ + * + * @return -1 on error + */ ++#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) ++ virtual size_t size (void) const; ++#else + virtual long int size (void) const; ++#endif + + /** + * Check if file is open. +@@ -445,7 +449,11 @@ + * + * @return -1 on error + */ +-long int ++#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) ++size_t ++#else ++long int ++#endif + ExtractorIO::size (void) const + { + return (long) ec->get_size (ec->cls); diff --git a/media-libs/libextractor/libextractor-1.3-r1.ebuild b/media-libs/libextractor/libextractor-1.3-r1.ebuild index 20c537dc551..dc06475abc4 100644 --- a/media-libs/libextractor/libextractor-1.3-r1.ebuild +++ b/media-libs/libextractor/libextractor-1.3-r1.ebuild @@ -1,20 +1,21 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -DESCRIPTION="A library used to extract metadata from files of arbitrary type" +DESCRIPTION="Library 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 +IUSE="+archive +bzip2 ffmpeg flac gif gsf gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test RESTRICT="test" -RDEPEND="app-text/iso-codes +COMMON_DEPEND=" + app-text/iso-codes >=dev-libs/glib-2 media-gfx/exiv2:= sys-devel/libtool @@ -26,33 +27,36 @@ RDEPEND="app-text/iso-codes 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 ) + mp4? ( media-libs/libmp4v2:0 ) mpeg? ( media-libs/libmpeg2 ) tidy? ( app-text/htmltidy ) tiff? ( media-libs/tiff:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis - ) + ) zlib? ( sys-libs/zlib ) - !