diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-12-29 14:30:34 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-12-29 14:31:44 +0100 |
| commit | 450cbf95fae0141740b2c9f74265220651ee8863 (patch) | |
| tree | 5b81eb8cc52aa768ca4948d0e28e56cb66fed891 /media-gfx/hugin/files | |
| parent | media-libs/gexiv2: Really fix build with exiv2-0.27 (diff) | |
| download | gentoo-450cbf95fae0141740b2c9f74265220651ee8863.tar.gz gentoo-450cbf95fae0141740b2c9f74265220651ee8863.tar.bz2 gentoo-450cbf95fae0141740b2c9f74265220651ee8863.zip | |
media-gfx/hugin: Fix build with exiv2-0.27
Switch to eapi7-ver
Sync 9999 deps with 2018.0.0
Closes: https://bugs.gentoo.org/673730
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-gfx/hugin/files')
| -rw-r--r-- | media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch | 28 |
1 files changed, 28 insertions, 0 deletions
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 new file mode 100644 index 000000000000..23dd54289217 --- /dev/null +++ b/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch @@ -0,0 +1,28 @@ +--- a/src/hugin_base/panodata/Exiv2Helper.cpp ++++ b/src/hugin_base/panodata/Exiv2Helper.cpp +@@ -29,6 +29,7 @@ + #include "hugin_math/hugin_math.h" + #include "hugin_utils/utils.h" + #include "exiv2/easyaccess.hpp" ++#include "exiv2/version.hpp" + + namespace HuginBase + { +@@ -232,7 +233,7 @@ + return false; + }; + }; +-#if EXIV2_TEST_VERSION(0,23,0) ++#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,23,0) + if (_getExiv2Value(exifData, "Exif.PentaxDng.RedBalance", val1) && + _getExiv2Value(exifData, "Exif.PentaxDng.BlueBalance", val2)) + { +@@ -563,7 +564,7 @@ + std::string lensName; + // first we are reading LensModel in Exif section, this is only available + // with EXIF >= 2.3 +-#if EXIV2_TEST_VERSION(0,22,0) ++#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,22,0) + //the string "Exif.Photo.LensModel" is only defined in exiv2 0.22.0 and above + if(_getExiv2Value(exifData, "Exif.Photo.LensModel", lensName)) + #else |