forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <[email protected]>
- Loading branch information
Showing
3 changed files
with
37 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters