diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2019-03-08 20:46:25 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2019-03-08 20:46:25 +0000 |
| commit | 78f70fc43810aaf9184077f6c245116fa1f397b7 (patch) | |
| tree | ee6b2dbac59f7efb9c1ec82fd549f797f8cb0c0c /graphics/hugin | |
| parent | Fix build with PHP 7.1 (diff) | |
graphics/hugin: prepare for exiv2-0.27
Import gentoo's fix to build against graphics/exiv2 0.27:
https://gitweb.gentoo.org/repo/gentoo.git/diff/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch?id=450cbf95fae0141740b2c9f74265220651ee8863
PR: 235943
Notes
Notes:
svn path=/head/; revision=495072
Diffstat (limited to 'graphics/hugin')
| -rw-r--r-- | graphics/hugin/Makefile | 2 | ||||
| -rw-r--r-- | graphics/hugin/files/patch-gentoo_23dd54 | 30 |
2 files changed, 31 insertions, 1 deletions
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index 26002ffc9033..536febec6a16 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= hugin PORTVERSION= 2018.0.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} diff --git a/graphics/hugin/files/patch-gentoo_23dd54 b/graphics/hugin/files/patch-gentoo_23dd54 new file mode 100644 index 000000000000..56f6ed413b40 --- /dev/null +++ b/graphics/hugin/files/patch-gentoo_23dd54 @@ -0,0 +1,30 @@ +https://gitweb.gentoo.org/repo/gentoo.git/diff/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch?id=450cbf95fae0141740b2c9f74265220651ee8863 + +--- src/hugin_base/panodata/Exiv2Helper.cpp ++++ 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 |