From fab849d1daed0ba7f2ac497d07985c3dbb692543 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jun 2019 21:23:20 +0100 Subject: gentoo resync : 16.06.2019 --- media-video/ffmpegthumbnailer/Manifest | 3 +- .../ffmpegthumbnailer-2.2.0-r1.ebuild | 51 ++++++++++++++++++++++ .../ffmpegthumbnailer-2.2.0.ebuild | 47 -------------------- .../ffmpegthumbnailer-2.2.0-pkgconfig-libdir.patch | 21 +++++++++ 4 files changed, 74 insertions(+), 48 deletions(-) create mode 100644 media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild delete mode 100644 media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0.ebuild create mode 100644 media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.2.0-pkgconfig-libdir.patch (limited to 'media-video/ffmpegthumbnailer') diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest index ef59a6859b07..9992b70fb03a 100644 --- a/media-video/ffmpegthumbnailer/Manifest +++ b/media-video/ffmpegthumbnailer/Manifest @@ -1,3 +1,4 @@ +AUX ffmpegthumbnailer-2.2.0-pkgconfig-libdir.patch 675 BLAKE2B b6b00228900e3fb1894eb4ca4872a2be645cb3a6aecbb9d3581ff1fc00b7290eab72196fb9c5f6ac4924eb3e4b1b82093669128fe32c01ce56e4c36ee53528b4 SHA512 facfdf9693710c93896590b8814af0b6ed98fe9fe4ecde013a3554032ed733b3ab713a4a840212808c84b1277c9c4e7951fd1fbc641ad9c001f78635e4e539be DIST ffmpegthumbnailer-2.2.0.tar.bz2 1223895 BLAKE2B 1babd01672f927a9ae043488e67225490f732b26544ad92e4c55ae683eb7d852cb90233e76a52cbda2f6aec26654b57907d7706e3ad4ae6d76ca3bca163c78eb SHA512 526d15b2c754fcb1415e69fb54cb6e7d0102b6d73a32a7e8528df81e32633dfe3786898984fdb988c93daee7218956c75c096ef657c9b3a42399d2d1d27c7bbf -EBUILD ffmpegthumbnailer-2.2.0.ebuild 1076 BLAKE2B acb911814f42b64e2b3b54464a1d1e30e8168565d097af9e6310585a0a779f8a6c8e0826560a61e8125c20cd1b1f2a1729c565d0206de2696d4eec97ce93fa11 SHA512 7b4bae26667130559f279da041e79d0b956e1d1f98e39843cf33799b0d029074e9688a477bf1c6e91398bb4bae39c7d22388f55d08b7bea9d4c2faf0faea4795 +EBUILD ffmpegthumbnailer-2.2.0-r1.ebuild 1133 BLAKE2B 6d2140ceb1d5a441c81f24323e8518d31c363bd0fa1044c380cef933e7b4d53a585dde5f12a8072a45fbf24df45d6bf1a52b417b4f63b5c43686032576f87c3f SHA512 923d107551284f6cdfabf11cabd28d42da3a51ea5ab0e612b16c9781db6827c804868ae1808fd7b678877a53b0d49d8c01cc5d42270518e0b11adf787b3b94e9 MISC metadata.xml 375 BLAKE2B 95c0757230dcb40e028a904cfeb17bc44d651e2c5840fb9bd45222f56217ab72cee863157c014fa301a69611eee2e5b574fe9351f066bba1a846ad2b458ae52e SHA512 a3b8d0dc66f4660489b8e084a310da37b5379843b5e4a661a7c1150a4c2a7c4924f6d92366edefa6e57ed77016577d86c4aef084238df06925395f21c3078ab0 diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild new file mode 100644 index 000000000000..c10e330b5787 --- /dev/null +++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +DESCRIPTION="Lightweight video thumbnailer that can be used by file managers" +HOMEPAGE="https://github.com/dirkvdb/ffmpegthumbnailer" +SRC_URI="https://github.com/dirkvdb/${PN}/releases/download/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" +IUSE="gnome gtk jpeg libav png test" + +REQUIRED_USE="gnome? ( gtk ) + test? ( png jpeg )" + +BDEPEND=" + virtual/pkgconfig +" +RDEPEND=" + gtk? ( dev-libs/glib:2= ) + jpeg? ( virtual/jpeg:0= ) + !libav? ( >=media-video/ffmpeg-2.7:0= ) + libav? ( >=media-video/libav-11:0= ) + png? ( media-libs/libpng:0= ) +" +DEPEND="${RDEPEND}" + +DOCS=( AUTHORS ChangeLog README.md ) + +PATCHES=( "${FILESDIR}/${P}-pkgconfig-libdir.patch" ) + +src_prepare() { + rm -rf out* || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DENABLE_GIO=$(usex gtk) + -DENABLE_TESTS=$(usex test) + -DENABLE_THUMBNAILER=$(usex gnome) + -DHAVE_JPEG=$(usex jpeg) + -DHAVE_PNG=$(usex png) + ) + cmake-utils_src_configure +} diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0.ebuild deleted file mode 100644 index d92f8f290948..000000000000 --- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils eutils - -DESCRIPTION="Lightweight video thumbnailer that can be used by file managers" -HOMEPAGE="https://github.com/dirkvdb/ffmpegthumbnailer" -SRC_URI="https://github.com/dirkvdb/${PN}/releases/download/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="gnome gtk jpeg libav png test" - -RDEPEND=" - gtk? ( dev-libs/glib:2= ) - jpeg? ( virtual/jpeg:0= ) - !libav? ( >=media-video/ffmpeg-2.7:0= ) - libav? ( >=media-video/libav-11:0= ) - png? ( media-libs/libpng:0= ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" -REQUIRED_USE="gnome? ( gtk ) - test? ( png jpeg )" - -DOCS=( AUTHORS ChangeLog README.md ) - -src_prepare() { - rm -rf out* || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_GIO=$(usex gtk) - -DENABLE_TESTS=$(usex test) - -DENABLE_THUMBNAILER=$(usex gnome) - -DHAVE_JPEG=$(usex jpeg) - -DHAVE_PNG=$(usex png) - ) - cmake-utils_src_configure -} diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.2.0-pkgconfig-libdir.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.2.0-pkgconfig-libdir.patch new file mode 100644 index 000000000000..8a70b6fbde49 --- /dev/null +++ b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.2.0-pkgconfig-libdir.patch @@ -0,0 +1,21 @@ +From 88c09cb6218fda5457c228f33084244db8725ed2 Mon Sep 17 00:00:00 2001 +From: orbea +Date: Sat, 15 Apr 2017 19:36:01 -0700 +Subject: [PATCH] Fix libffmpegthumbnailer.pc to work with multilib systems + +--- + libffmpegthumbnailer.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libffmpegthumbnailer.pc.in b/libffmpegthumbnailer.pc.in +index 77c00b2..0a2f997 100644 +--- a/libffmpegthumbnailer.pc.in ++++ b/libffmpegthumbnailer.pc.in +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${exec_prefix}/lib ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/include + + Name: libffmpegthumbnailer -- cgit v1.2.3