diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-30 17:36:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-30 17:36:28 +0100 |
| commit | 7014a5a3ea0feffab9701fdd6b64cc7667a985af (patch) | |
| tree | f2cbbaa8bb9209cd15208721103228336149b799 /media-plugins/gimp-lensfun | |
| parent | 7a86906b67693cc65671d3e1476835d3a7e13092 (diff) | |
gentoo resync : 30.06.2019
Diffstat (limited to 'media-plugins/gimp-lensfun')
| -rw-r--r-- | media-plugins/gimp-lensfun/Manifest | 3 | ||||
| -rw-r--r-- | media-plugins/gimp-lensfun/files/gimp-lensfun-0.2.4-exiv2-0.27.1.patch | 12 | ||||
| -rw-r--r-- | media-plugins/gimp-lensfun/gimp-lensfun-0.2.4-r1.ebuild (renamed from media-plugins/gimp-lensfun/gimp-lensfun-0.2.4.ebuild) | 32 |
3 files changed, 33 insertions, 14 deletions
diff --git a/media-plugins/gimp-lensfun/Manifest b/media-plugins/gimp-lensfun/Manifest index da191c134169..e1b3823530d9 100644 --- a/media-plugins/gimp-lensfun/Manifest +++ b/media-plugins/gimp-lensfun/Manifest @@ -1,3 +1,4 @@ +AUX gimp-lensfun-0.2.4-exiv2-0.27.1.patch 243 BLAKE2B b2b113981da41bb7421481fde90d40624855f1a3a920dbcdae96ceb7e4fee512ce8559842b2189fbee8e00c13f7495e0def8955fc8b065950b348ecfb0902324 SHA512 58d486b26c8c55af4a9cbb9c087ae44d9d16100ac7e0fadab84eaa62e165c0a7cff66fc6f7ad0d0c0eafd471b029e344a0fea8b065760c1cc8edaacc895479ed DIST gimp-lensfun-0.2.4.tar.gz 29039 BLAKE2B 30c5abac6e00e74e008a94f0fa23391d9dc336b5a6540ec7a0deb33e250cc2df66821db67b4bd76b36c9745a600838c834c01c27db741f8349f2ac13dc60e963 SHA512 5a73a00d71c28d92881bfc2b15be7e8adef8756af808f8ae19f0e3208287853fe4f735b1bef23b658f660da8393b68cbe8416804173944d0c844ac284be77671 -EBUILD gimp-lensfun-0.2.4.ebuild 856 BLAKE2B 9b4bba7a76d9ff0a69a24b74ef6bf376d85f8ee7a6fcca0081d92e2070c394b0d81f88e957f35c06c28cd9aa698e456836b75e0f8fe54b2afef583b5080bc9d7 SHA512 cdf2055fdc9677531421dfa94062b9e1787539e5b6bb0b31ba779ee7ead14c6a8f60747ba07f2a74a7f7073dbac7e2e8e2eabaa74d0db8748fcc3e61a0bc5c12 +EBUILD gimp-lensfun-0.2.4-r1.ebuild 946 BLAKE2B aa8cdb12f08eeff21f289f0e498673b98e9061e916ef23567a6f5fd1c8ab6b1d0475c7e5442c907f17fe701d12b1d7b686c2e9bd6ce1c7452c869d4ce30045e5 SHA512 13c2401faf147316cc73f51076f171b74c1c3369dac1184327a0828770bc32a82b9a3d5a2e0eb6076048792b5f34eb7f3695971ec7f6da8f6781ddf64695cff2 MISC metadata.xml 249 BLAKE2B 30a93482d9da433af6ed4cabb5bdcc20e297296af8b5e58a4ee18942514d4cae56462b5e61e23db269a20dfdd3b956ba0dc22488e03e4a8222f8d6d64df9918e SHA512 f0120dd9871a00b101f65f11eec65f7bde96cc2641f7913fb24f1633b09f4af36ab70ca48422dd8ce89c81b5819c79d4eb3b04950821816fbc0520525959f8d1 diff --git a/media-plugins/gimp-lensfun/files/gimp-lensfun-0.2.4-exiv2-0.27.1.patch b/media-plugins/gimp-lensfun/files/gimp-lensfun-0.2.4-exiv2-0.27.1.patch new file mode 100644 index 000000000000..d62f1790d5de --- /dev/null +++ b/media-plugins/gimp-lensfun/files/gimp-lensfun-0.2.4-exiv2-0.27.1.patch @@ -0,0 +1,12 @@ +--- a/src/gimplensfun.cpp ++++ b/src/gimplensfun.cpp +@@ -31,8 +31,7 @@ + #include <libgimp/gimp.h> + #include <libgimp/gimpui.h> + +-#include <exiv2/image.hpp> +-#include <exiv2/exif.hpp> ++#include <exiv2/exiv2.hpp> + + #define VERSIONSTR "0.2.4" + diff --git a/media-plugins/gimp-lensfun/gimp-lensfun-0.2.4.ebuild b/media-plugins/gimp-lensfun/gimp-lensfun-0.2.4-r1.ebuild index 904ac1bfbb99..2756553cbcfa 100644 --- a/media-plugins/gimp-lensfun/gimp-lensfun-0.2.4.ebuild +++ b/media-plugins/gimp-lensfun/gimp-lensfun-0.2.4-r1.ebuild @@ -1,13 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs -MY_PN="GIMP-Lensfun" - -DESCRIPTION="A Gimp plugin to correct lens distortions" +DESCRIPTION="Gimp plugin to correct lens distortions" HOMEPAGE="https://seebk.github.io/GIMP-Lensfun/" SRC_URI="https://github.com/seebk/GIMP-Lensfun/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -16,23 +14,31 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="openmp" -RDEPEND="media-gfx/gimp +BDEPEND=" + virtual/pkgconfig +" +DEPEND=" media-gfx/exiv2 - >=media-libs/lensfun-0.3.2" -DEPEND="${RDEPEND} - virtual/pkgconfig" + <media-gfx/gimp-2.10.0 + >=media-libs/lensfun-0.3.2 +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" ) -S=${WORKDIR}/${MY_PN}-${PV} +S=${WORKDIR}/GIMP-Lensfun-${PV} pkg_setup() { - if use openmp ; then + if use openmp && [[ ${MERGE_TYPE} != binary ]]; then tc-has-openmp || die "Please switch to an openmp compatible compiler" fi } src_prepare() { + default + if ! use openmp; then - sed -i "s/-fopenmp//g" Makefile + sed -i "s/-fopenmp//g" Makefile || die fi tc-export CXX |