diff --git a/srcpkgs/hugin/patches/exiv-0.27.patch b/srcpkgs/hugin/patches/exiv-0.27.patch new file mode 100644 index 00000000000..7f00134123c --- /dev/null +++ b/srcpkgs/hugin/patches/exiv-0.27.patch @@ -0,0 +1,28 @@ +--- 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 diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template index 3a0829304b2..4746291ae15 100644 --- a/srcpkgs/hugin/template +++ b/srcpkgs/hugin/template @@ -1,21 +1,21 @@ # Template file for 'hugin' pkgname=hugin version=2018.0.0 -revision=10 +revision=11 wrksrc="${pkgname}-${version}" build_style=cmake pycompile_module="hpi.py hsi.py" pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates" -maintainer="lemmi " hostmakedepends="pkg-config exiftool swig" makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel exiv2-devel libfreeglut-devel libpano13-devel boost-devel vigra-devel sqlite-devel lensfun-devel python-devel glew-devel libXmu-devel libXi-devel glu-devel lcms2-devel lapack-devel" depends="exiftool enblend-enfuse" -license="GPL-2" -homepage="http://hugin.sourceforge.net/" short_desc="An easy to use panoramic imaging toolchain" +maintainer="lemmi " +license="GPL-2.0-or-later" +homepage="http://hugin.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${pkgname}-${version%.*}/${pkgname}-${version}.tar.bz2" checksum=d3af0d066ac50e3bb243a175a64ecda136d87178419457e8822e11bcf0e565cb