summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-09-16 01:04:26 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-09-16 01:05:43 +0200
commit2f9cc903bb3b2a9a5404a26c60064ad7fd56f0a6 (patch)
tree71300f28dec9876a32f6ef2edbdd54d53e26e8e0
parentmedia-gfx/darktable: Fix build with gcc-9 (diff)
downloadgentoo-2f9cc903bb3b2a9a5404a26c60064ad7fd56f0a6.tar.gz
gentoo-2f9cc903bb3b2a9a5404a26c60064ad7fd56f0a6.tar.bz2
gentoo-2f9cc903bb3b2a9a5404a26c60064ad7fd56f0a6.zip
media-gfx/darktable: Fix build with >=media-libs/exiv2-0.27.1
Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--media-gfx/darktable/darktable-2.6.2.ebuild1
-rw-r--r--media-gfx/darktable/files/darktable-2.6.2-exiv2-0.27.patch21
2 files changed, 22 insertions, 0 deletions
diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild b/media-gfx/darktable/darktable-2.6.2.ebuild
index e9bf1a97e402..c098e19ec258 100644
--- a/media-gfx/darktable/darktable-2.6.2.ebuild
+++ b/media-gfx/darktable/darktable-2.6.2.ebuild
@@ -72,6 +72,7 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}"/"${PN}"-find-opencl-header.patch
"${WORKDIR}"/"${P}"-gcc9.patch
+ "${FILESDIR}"/"${P}"-exiv2-0.27.patch
)
S="${WORKDIR}/${P/_/~}"
diff --git a/media-gfx/darktable/files/darktable-2.6.2-exiv2-0.27.patch b/media-gfx/darktable/files/darktable-2.6.2-exiv2-0.27.patch
new file mode 100644
index 000000000000..c0eb59bc639d
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-2.6.2-exiv2-0.27.patch
@@ -0,0 +1,21 @@
+From 556887d7a973bdf0611fcc57231e107b503d9949 Mon Sep 17 00:00:00 2001
+From: Bertrand Antoine <nexus6b@gmail.com>
+Date: Wed, 22 May 2019 21:49:59 +0200
+Subject: [PATCH] Fix build with exif2 >= 0.27
+
+---
+ tools/basecurve/exif-wrapper.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/basecurve/exif-wrapper.cpp b/tools/basecurve/exif-wrapper.cpp
+index 72550721f6..f4d4d46e12 100644
+--- a/tools/basecurve/exif-wrapper.cpp
++++ b/tools/basecurve/exif-wrapper.cpp
+@@ -17,6 +17,7 @@
+ */
+
+ #include <exiv2/exif.hpp>
++#include <exiv2/error.hpp>
+ #include <exiv2/image.hpp>
+
+ #include <cstdio> \ No newline at end of file