Date: Fri, 8 Mar 2019 20:46:25 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495072 - in head/graphics/hugin: . files Message-ID: <201903082046.x28KkPNe016984@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Fri Mar 8 20:46:25 2019 New Revision: 495072 URL: https://svnweb.freebsd.org/changeset/ports/495072 Log: 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 Added: head/graphics/hugin/files/patch-gentoo_23dd54 (contents, props changed) Modified: head/graphics/hugin/Makefile Modified: head/graphics/hugin/Makefile ============================================================================== --- head/graphics/hugin/Makefile Fri Mar 8 20:38:07 2019 (r495071) +++ head/graphics/hugin/Makefile Fri Mar 8 20:46:25 2019 (r495072) @@ -3,7 +3,7 @@ PORTNAME= hugin PORTVERSION= 2018.0.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} Added: head/graphics/hugin/files/patch-gentoo_23dd54 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/hugin/files/patch-gentoo_23dd54 Fri Mar 8 20:46:25 2019 (r495072) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903082046.x28KkPNe016984>