cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

graphics/hugin: prepare for exiv2-0.27

Browse Source 
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
This commit is contained in:
Tobias C. Berner 2019-03-08 20:46:25 +00:00
parent d11ff9d897
commit 78f70fc438
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=495072
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/hugin/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= hugin
PORTVERSION= 2018.0.0
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}

30
graphics/hugin/files/patch-gentoo_23dd54 Normal file
View File

@ -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