hugin: rebuild against exiv2-0.27.0_1

[ci skip]
This commit is contained in:
Rasmus Thomsen 2019-01-01 23:36:55 +01:00 committed by Helmut Pozimski
parent fa21b8d407
commit 72fc67be8e
2 changed files with 32 additions and 4 deletions

View File

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

View File

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