From 3036c10dfa27e6eb73d237c89876592773375d34 Mon Sep 17 00:00:00 2001 From: Aicaya Maro Date: Mon, 4 Dec 2023 12:06:48 -0400 Subject: [PATCH] hugin: update to 2023.0.0 --- srcpkgs/hugin/patches/exiv2-0.28.patch | 77 -------------------------- srcpkgs/hugin/template | 9 +-- 2 files changed, 5 insertions(+), 81 deletions(-) delete mode 100644 srcpkgs/hugin/patches/exiv2-0.28.patch diff --git a/srcpkgs/hugin/patches/exiv2-0.28.patch b/srcpkgs/hugin/patches/exiv2-0.28.patch deleted file mode 100644 index 49f0518117020..0000000000000 --- a/srcpkgs/hugin/patches/exiv2-0.28.patch +++ /dev/null @@ -1,77 +0,0 @@ -Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/hugin/-/blob/main/exiv2-0.28.patch -diff -r 79cd11a7a66f src/hugin_base/panodata/Exiv2Helper.cpp ---- a/src/hugin_base/panodata/Exiv2Helper.cpp Wed May 24 19:13:20 2023 +0200 -+++ b/src/hugin_base/panodata/Exiv2Helper.cpp Mon Jun 05 00:31:19 2023 +0200 -@@ -40,7 +40,7 @@ - Exiv2::ExifData::iterator itr = exifData.findKey(Exiv2::ExifKey(keyName)); - if (itr != exifData.end() && itr->count()) - { -- value = itr->toLong(); -+ value = itr->toUint32(); - return true; - } - else -@@ -165,7 +165,7 @@ - { - if(it!=exifData.end() && it->count()) - { -- return it->toLong(); -+ return it->toUint32(); - } - return 0; - }; -@@ -600,4 +600,4 @@ - }; - - }; //namespace Exiv2Helper --}; //namespace HuginBase -\ No newline at end of file -+}; //namespace HuginBase -diff -r 79cd11a7a66f src/hugin_base/panodata/SrcPanoImage.cpp ---- a/src/hugin_base/panodata/SrcPanoImage.cpp Wed May 24 19:13:20 2023 +0200 -+++ b/src/hugin_base/panodata/SrcPanoImage.cpp Mon Jun 05 00:31:19 2023 +0200 -@@ -384,7 +384,7 @@ - pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageWidthPixels")); - if (pos != xmpData.end()) - { -- croppedWidth = pos->toLong(); -+ croppedWidth = pos->toUint32(); - } - else - { -@@ -394,7 +394,7 @@ - pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageHeightPixels")); - if (pos != xmpData.end()) - { -- croppedHeight = pos->toLong(); -+ croppedHeight = pos->toUint32(); - } - else - { -@@ -408,7 +408,7 @@ - double hfov = 0; - if (pos != xmpData.end()) - { -- hfov = 360 * croppedWidth / (double)pos->toLong(); -+ hfov = 360 * croppedWidth / (double)pos->toUint32(); - } - else - { -@@ -419,7 +419,7 @@ - pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.FullPanoHeightPixels")); - if (pos != xmpData.end()) - { -- fullHeight = pos->toLong(); -+ fullHeight = pos->toUint32(); - } - else - { -@@ -430,7 +430,7 @@ - pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaTopPixels")); - if (pos != xmpData.end()) - { -- cropTop = pos->toLong(); -+ cropTop = pos->toUint32(); - } - else - { diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template index 894876470ebde..31f5be4f0d323 100644 --- a/srcpkgs/hugin/template +++ b/srcpkgs/hugin/template @@ -1,14 +1,15 @@ # Template file for 'hugin' pkgname=hugin -version=2022.0.0 -revision=12 +version=2023.0.0 +revision=1 build_style=cmake build_helper=cmake-wxWidgets-gtk3 +configure_args="-DBUILD_WITH_EPOXY=on" pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates" hostmakedepends="pkg-config exiftool swig gettext" 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 python3-devel glew-devel libXmu-devel libXi-devel glu-devel + lensfun-devel python3-devel libepoxy-devel libXmu-devel libXi-devel glu-devel lcms2-devel lapack-devel" depends="exiftool enblend-enfuse" short_desc="Easy to use panoramic imaging toolchain" @@ -17,7 +18,7 @@ license="GPL-2.0-or-later" homepage="https://hugin.sourceforge.net/" changelog="https://hugin.sourceforge.io/releases/${version}/en.shtml" distfiles="${SOURCEFORGE_SITE}/hugin/hugin/hugin-${version%.*}/hugin-${version}.tar.bz2" -checksum=97c8562a0ba9a743e0b955a43dfde048b1c60cd9e5f2ee2b69de1a81646e05a7 +checksum=04a39fccc6017e0544c639bd22309472c574d35b3455cbade1fc3870e631632b python_version=3 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"