1 |
commit: f8dd13fabfba50f506c36d927e33f40c5a868172 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 23 20:49:38 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 23 20:57:11 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8dd13fa |
7 |
|
8 |
media-gfx/luminance-hdr: Fix build with media-gfx/exiv2-0.27.1 |
9 |
|
10 |
Reported-by: Erich Seifert <eseifert <AT> error-reports.org> |
11 |
Closes: https://bugs.gentoo.org/688556 |
12 |
Package-Manager: Portage-2.3.67, Repoman-2.3.15 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
.../files/luminance-hdr-2.5.1-exiv2-0.27.1.patch | 22 ++++++++++++++++++++++ |
16 |
.../luminance-hdr/luminance-hdr-2.5.1-r1.ebuild | 4 ++-- |
17 |
2 files changed, 24 insertions(+), 2 deletions(-) |
18 |
|
19 |
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..16b5256e935 |
22 |
--- /dev/null |
23 |
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch |
24 |
@@ -0,0 +1,22 @@ |
25 |
+From 8c3f1571bfa7bb702228bb283e37e58c8b322d5b Mon Sep 17 00:00:00 2001 |
26 |
+From: Benitoite <kd6kxr@×××××.com> |
27 |
+Date: Fri, 26 Apr 2019 18:07:52 -0700 |
28 |
+Subject: [PATCH] ExifOperations: include exiv2/exiv2.hpp |
29 |
+ |
30 |
+Because type `AnyError` requires definition in the exiv2 namespace. |
31 |
+--- |
32 |
+ src/Exif/ExifOperations.cpp | 1 + |
33 |
+ 1 file changed, 1 insertion(+) |
34 |
+ |
35 |
+diff --git a/src/Exif/ExifOperations.cpp b/src/Exif/ExifOperations.cpp |
36 |
+index 07ca742c..dd3d22a6 100644 |
37 |
+--- a/src/Exif/ExifOperations.cpp |
38 |
++++ b/src/Exif/ExifOperations.cpp |
39 |
+@@ -35,6 +35,7 @@ |
40 |
+ #include <boost/assign/list_of.hpp> |
41 |
+ |
42 |
+ #include <exif.hpp> |
43 |
++#include <exiv2/exiv2.hpp> |
44 |
+ #include <image.hpp> |
45 |
+ |
46 |
+ #include "Common/config.h" |
47 |
\ No newline at end of file |
48 |
|
49 |
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild |
50 |
index e8bae1039b5..33c04975b7f 100644 |
51 |
--- a/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild |
52 |
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild |
53 |
@@ -1,4 +1,4 @@ |
54 |
-# Copyright 1999-2018 Gentoo Authors |
55 |
+# Copyright 1999-2019 Gentoo Authors |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
|
58 |
EAPI=6 |
59 |
@@ -50,7 +50,7 @@ PATCHES=( |
60 |
"${FILESDIR}"/${PN}-2.5.1-docs.patch |
61 |
"${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch |
62 |
"${FILESDIR}"/${PN}-2.5.1-fits-automagic.patch |
63 |
- "${FILESDIR}"/${PN}-2.5.1-exiv2-0.27.patch |
64 |
+ "${FILESDIR}"/${PN}-2.5.1-exiv2-0.27{,.1}.patch |
65 |
) |
66 |
|
67 |
pkg_pretend() { |