| 1 |
commit: 450cbf95fae0141740b2c9f74265220651ee8863 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 29 13:30:34 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 29 13:31:44 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=450cbf95 |
| 7 |
|
| 8 |
media-gfx/hugin: Fix build with exiv2-0.27 |
| 9 |
|
| 10 |
Switch to eapi7-ver |
| 11 |
Sync 9999 deps with 2018.0.0 |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/673730 |
| 14 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 16 |
|
| 17 |
.../hugin/files/hugin-2018.0.0-exiv2-0.27.patch | 28 ++++++++++++++++++++++ |
| 18 |
media-gfx/hugin/hugin-2018.0.0.ebuild | 8 ++++--- |
| 19 |
media-gfx/hugin/hugin-9999.ebuild | 7 +++--- |
| 20 |
3 files changed, 37 insertions(+), 6 deletions(-) |
| 21 |
|
| 22 |
diff --git a/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch b/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch |
| 23 |
new file mode 100644 |
| 24 |
index 00000000000..23dd5428921 |
| 25 |
--- /dev/null |
| 26 |
+++ b/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch |
| 27 |
@@ -0,0 +1,28 @@ |
| 28 |
+--- a/src/hugin_base/panodata/Exiv2Helper.cpp |
| 29 |
++++ b/src/hugin_base/panodata/Exiv2Helper.cpp |
| 30 |
+@@ -29,6 +29,7 @@ |
| 31 |
+ #include "hugin_math/hugin_math.h" |
| 32 |
+ #include "hugin_utils/utils.h" |
| 33 |
+ #include "exiv2/easyaccess.hpp" |
| 34 |
++#include "exiv2/version.hpp" |
| 35 |
+ |
| 36 |
+ namespace HuginBase |
| 37 |
+ { |
| 38 |
+@@ -232,7 +233,7 @@ |
| 39 |
+ return false; |
| 40 |
+ }; |
| 41 |
+ }; |
| 42 |
+-#if EXIV2_TEST_VERSION(0,23,0) |
| 43 |
++#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,23,0) |
| 44 |
+ if (_getExiv2Value(exifData, "Exif.PentaxDng.RedBalance", val1) && |
| 45 |
+ _getExiv2Value(exifData, "Exif.PentaxDng.BlueBalance", val2)) |
| 46 |
+ { |
| 47 |
+@@ -563,7 +564,7 @@ |
| 48 |
+ std::string lensName; |
| 49 |
+ // first we are reading LensModel in Exif section, this is only available |
| 50 |
+ // with EXIF >= 2.3 |
| 51 |
+-#if EXIV2_TEST_VERSION(0,22,0) |
| 52 |
++#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,22,0) |
| 53 |
+ //the string "Exif.Photo.LensModel" is only defined in exiv2 0.22.0 and above |
| 54 |
+ if(_getExiv2Value(exifData, "Exif.Photo.LensModel", lensName)) |
| 55 |
+ #else |
| 56 |
|
| 57 |
diff --git a/media-gfx/hugin/hugin-2018.0.0.ebuild b/media-gfx/hugin/hugin-2018.0.0.ebuild |
| 58 |
index 3b5e82f438d..cb72199b0eb 100644 |
| 59 |
--- a/media-gfx/hugin/hugin-2018.0.0.ebuild |
| 60 |
+++ b/media-gfx/hugin/hugin-2018.0.0.ebuild |
| 61 |
@@ -1,4 +1,4 @@ |
| 62 |
-# Copyright 1999-2018 Gentoo Foundation |
| 63 |
+# Copyright 1999-2018 Gentoo Authors |
| 64 |
# Distributed under the terms of the GNU General Public License v2 |
| 65 |
|
| 66 |
EAPI=6 |
| 67 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 68 |
WX_GTK_VER="3.0" |
| 69 |
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 70 |
|
| 71 |
-inherit python-single-r1 wxwidgets versionator cmake-utils |
| 72 |
+inherit python-single-r1 wxwidgets cmake-utils eapi7-ver |
| 73 |
|
| 74 |
DESCRIPTION="GUI for the creation & processing of panoramic images" |
| 75 |
HOMEPAGE="http://hugin.sf.net" |
| 76 |
@@ -55,7 +55,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 77 |
|
| 78 |
DOCS=( authors.txt README TODO ) |
| 79 |
|
| 80 |
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2).0 |
| 81 |
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) |
| 82 |
+ |
| 83 |
+S=${WORKDIR}/${PN}-$(ver_cut 1-2).0 |
| 84 |
|
| 85 |
pkg_setup() { |
| 86 |
use python && python-single-r1_pkg_setup |
| 87 |
|
| 88 |
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild |
| 89 |
index 8615f1c5a0b..c46a552195e 100644 |
| 90 |
--- a/media-gfx/hugin/hugin-9999.ebuild |
| 91 |
+++ b/media-gfx/hugin/hugin-9999.ebuild |
| 92 |
@@ -1,4 +1,4 @@ |
| 93 |
-# Copyright 1999-2018 Gentoo Foundation |
| 94 |
+# Copyright 1999-2018 Gentoo Authors |
| 95 |
# Distributed under the terms of the GNU General Public License v2 |
| 96 |
|
| 97 |
EAPI=6 |
| 98 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 99 |
WX_GTK_VER="3.0" |
| 100 |
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 101 |
|
| 102 |
-inherit mercurial python-single-r1 wxwidgets versionator cmake-utils |
| 103 |
+inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver |
| 104 |
|
| 105 |
DESCRIPTION="GUI for the creation & processing of panoramic images" |
| 106 |
HOMEPAGE="http://hugin.sf.net" |
| 107 |
@@ -36,6 +36,7 @@ CDEPEND=" |
| 108 |
media-libs/tiff:0 |
| 109 |
>=media-libs/vigra-1.11.0[openexr] |
| 110 |
sci-libs/fftw:3.0= |
| 111 |
+ sci-libs/flann |
| 112 |
sys-libs/zlib |
| 113 |
virtual/glu |
| 114 |
virtual/jpeg:0 |
| 115 |
@@ -56,7 +57,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 116 |
|
| 117 |
DOCS=( authors.txt README TODO ) |
| 118 |
|
| 119 |
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3) |
| 120 |
+S=${WORKDIR}/${PN}-$(ver_cut 1-2).0 |
| 121 |
|
| 122 |
pkg_setup() { |
| 123 |
use python && python-single-r1_pkg_setup |
Archives