wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-29 00:42:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

hugin: update to 2019.0.0.

Browse source
This commit is contained in:
lemmi 2019-04-09 12:27:18 +02:00
parent ad46e25aeb
commit 013c258cbe
2 changed files with 15 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
srcpkgs/hugin/patches/exiv-0.27.patch
View file

@ -1,28 +0,0 @@
--- 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

33
srcpkgs/hugin/template
View file

@ -1,7 +1,7 @@
# Template file for 'hugin' # Template file for 'hugin'
pkgname=hugin pkgname=hugin
version=2018.0.0 version=2019.0.0
revision=11 revision=1
wrksrc="${pkgname}-${version}" wrksrc="${pkgname}-${version}"
build_style=cmake build_style=cmake
pycompile_module="hpi.py hsi.py" pycompile_module="hpi.py hsi.py"
@ -12,30 +12,27 @@ makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgo
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"
short_desc="An easy to use panoramic imaging toolchain" short_desc="Easy to use panoramic imaging toolchain"
maintainer="lemmi <lemmi@nerd2nerd.org>" maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="http://hugin.sourceforge.net/" 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=f94717c5035b776a552163bac5815916e0662008fabefafd790fa54b352e22d1
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python" hostmakedepends+=" python"
else
makedepends+=" flann-devel"
fi fi
pre_configure() { pre_configure() {
sed -i '/<sys\/sysctl.h>/d' src/hugin_base/hugin_utils/platform.cpp # workaround for cmake to find wx-config-gtk3
sed -i 's|-O3||g' src/celeste/CMakeLists.txt # can be removed once there is only one 'wx-config'
# Fix compiling against lensfun-0.3.0 if [ "$CROSS_BUILD" ]; then
sed '/LF_DIST_MODEL_FOV1/d' -i src/hugin_base/lensdb/LensDB.cpp # cannot override wxWidgets_CONFIG_EXECUTABLE set in
# the cross toolchain file otherwise
# workaround for cmake to find wx-config-gtk3 ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,}
# can be removed once there is only one 'wx-config' else
if [ "$CROSS_BUILD" ]; then sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
# cannot override wxWidgets_CONFIG_EXECUTABLE set in fi
# the cross toolchain file otherwise
ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,}
else
sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
fi
} }