media-gfx/hugin: sync with main tree

Signed-off-by: Markus Meier <maekke@gentoo.org>

5 files changed, 106 insertions, 104 deletions

diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index e0b49e8..70eee26 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,6 +1,5 @@
-DIST hugin-2021.0.0.tar.bz2 10333565 BLAKE2B 4bde9bb491074a2f49a34c9af0e90246095c390abf2c49e924d4412e6c00148ae013e10a885799b7eeb1cd9977922a77dc5ebe032a38e2153138632ec818f038 SHA512 fb491af2543dda8c6d3c9d125936a32a04109eec39e3091347ef2856073d4e1f04017686acb8000e50e29a0ac8dcfe463b63613b277f8fb4aec0537f58a6c853
+AUX hugin-2022.0.0-exiv2-0.28.patch 3460 BLAKE2B fab4f433b7a5d0959fc68ee0affae81ba989526713a9b711da8553cdbb9522dac80f1ac52007ba90cbf3066eddd3745ec567d4db9b508cf4e944b1e2c627358d SHA512 b5170d9f3b62fcc2e4e5a51d8766e8db8f1df1dcf6e198dbd739f3f960103a9f5e97a8960fc7d5c9b5e226c74c60762b639b5fb677e38754ee597626c554a10d
 DIST hugin-2022.0.0.tar.bz2 10374360 BLAKE2B ea77614a650f832f39583328767a55ebe888a003fed117e73b22fd29c641fc8494b190b864b7ccb05f996ceca5d95c5391597333efdc19bce0eba93af14543be SHA512 752bdaaea666a24bddc72b4aa4ccfbf366af30022102a2e74fad9c86045b3aeae50929a8a3eb27e296b27bdb487ecd60b6e363b23413e08af6ed944686569c97
-EBUILD hugin-2021.0.0-r1.ebuild 2133 BLAKE2B 9cd31d87dcc0b10a3de326a3f1a691c9b720abfd5950f797b02778285fb2d0cf2cc58c0388788019ebe82c791475bdc8114c477ecbc52d2c7020ea175daca800 SHA512 dc2349ee3f0c2f13c4478500c2dc7c508214b63bd0c8b9d0f939f63f15edab90611b02db906c3a614d5fe2ae6c83d7072c2b2c447dec4ec1408c6de4850dcf58
-EBUILD hugin-2022.0.0.ebuild 2118 BLAKE2B 0705a31e43d14fd120dad9b4c7ab2f38ba5dff1638ef45c147698210236496b72a25ac9f9a7baf3a2e863ec6789ccd12d809c68a2c8507594d3a77c4f2739da4 SHA512 5eb85e50ab7322254e8358c74d96f3b2482c7d2f73dfcc4180d51fcdda769304978cd0bf0e664f6225c4d4f3ab3fa2d945d9d9d456b654c2695e227ef2692684
-EBUILD hugin-9999.ebuild 2058 BLAKE2B 3307d6bb6830c34102c1ad7ee703e0656afccd731fef069d4f1a8ce7a70877fb34c1ad1caa80fba17e4e4bab6634cfce61540b1107639381ff1a5e434e6bc5c7 SHA512 a59db25a089af5cae9226684dc7cf3f22a419b1ccf62cf7449864d330c0d2a2d969a566b969c89e316120954ca0020358284200b9579480c28a9cd5e66721e83
+EBUILD hugin-2022.0.0.ebuild 2181 BLAKE2B 3377bffe29b67fcef72a8b0293ab106ade79d40620a4906531863b5639e2c19ca1b168f874181569d10f0958a2a87f51d4e8081857cc62a36400508c5ccbd690 SHA512 c62f921b2d77c8ed0c04887013a29689d0927847b29b23145a514e04e63f6dc0cbe8e113fdf5e40695dcd8913ddecd4e1566fb44097b7a69117e0adbdb30b923
+EBUILD hugin-9999.ebuild 2058 BLAKE2B 13f52f224c492d093c79429cfdc05b81c8a4c5c5297266107c55f20bb4278d4e4664bc183ee0fe8c210d657a0ac5b51bd86ed0fd7d02c3668551753f0c7a5178 SHA512 b6ae419dffb76575973fe91feef2b578a75d5350e935f9a1da73451030878d3ed7eb0945f6745a8467b5f3c9973487d5e08c37d5a0df47b5accb4bcd4a0aa22f
 MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba
diff --git a/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch b/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch
new file mode 100644
index 0000000..dff7413
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch
@@ -0,0 +1,99 @@
+Patch originally taken from ArchLinux, modified to be backwards compatible.
+
+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,11 @@
+             Exiv2::ExifData::iterator itr = exifData.findKey(Exiv2::ExifKey(keyName));
+             if (itr != exifData.end() && itr->count())
+             {
++#if EXIV2_TEST_VERSION(0,28,0)
++                value = itr->toUint32();
++#else
+                 value = itr->toLong();
++#endif
+                 return true;
+             }
+             else
+@@ -165,7 +169,11 @@
+         {
+             if(it!=exifData.end() && it->count())
+             {
++#if EXIV2_TEST_VERSION(0,28,0)
++                return it->toUint32();
++#else
+                 return it->toLong();
++#endif
+             }
+             return 0;
+         };
+@@ -600,4 +608,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,11 @@
+                     pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageWidthPixels"));
+                     if (pos != xmpData.end())
+                     {
++#if EXIV2_TEST_VERSION(0,28,0)
++                        croppedWidth = pos->toUint32();
++#else
+                         croppedWidth = pos->toLong();
++#endif
+                     }
+                     else
+                     {
+@@ -394,7 +398,11 @@
+                     pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageHeightPixels"));
+                     if (pos != xmpData.end())
+                     {
++#if EXIV2_TEST_VERSION(0,28,0)
++                        croppedHeight = pos->toUint32();
++#else
+                         croppedHeight = pos->toLong();
++#endif
+                     }
+                     else
+                     {
+@@ -408,7 +416,11 @@
+                         double hfov = 0;
+                         if (pos != xmpData.end())
+                         {
++#if EXIV2_TEST_VERSION(0,28,0)
++                            hfov = 360 * croppedWidth / (double)pos->toUint32();
++#else
+                             hfov = 360 * croppedWidth / (double)pos->toLong();
++#endif
+                         }
+                         else
+                         {
+@@ -419,7 +431,11 @@
+                         pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.FullPanoHeightPixels"));
+                         if (pos != xmpData.end())
+                         {
++#if EXIV2_TEST_VERSION(0,28,0)
++                            fullHeight = pos->toUint32();
++#else
+                             fullHeight = pos->toLong();
++#endif
+                         }
+                         else
+                         {
+@@ -430,7 +446,11 @@
+                         pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaTopPixels"));
+                         if (pos != xmpData.end())
+                         {
++#if EXIV2_TEST_VERSION(0,28,0)
++                            cropTop = pos->toUint32();
++#else
+                             cropTop = pos->toLong();
++#endif
+                         }
+                         else
+                         {
diff --git a/media-gfx/hugin/hugin-2021.0.0-r1.ebuild b/media-gfx/hugin/hugin-2021.0.0-r1.ebuild
deleted file mode 100644
index 71ada31..0000000
--- a/media-gfx/hugin/hugin-2021.0.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit python-single-r1 wxwidgets cmake xdg
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
-IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
-
-CDEPEND="
-	!!dev-util/cocom
-	dev-db/sqlite:3
-	dev-libs/boost:=
-	dev-libs/zthread
-	>=media-gfx/enblend-4.0
-	media-gfx/exiv2:=
-	media-libs/freeglut
-	media-libs/glew:=
-	>=media-libs/libpano13-2.9.19_beta1:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/openexr:=
-	media-libs/tiff:=
-	>=media-libs/vigra-1.11.1-r5[openexr]
-	sci-libs/fftw:3.0=
-	sci-libs/flann
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl
-	x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
-	lapack? ( virtual/blas virtual/lapack )
-	python? ( ${PYTHON_DEPS} )
-	sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
-	media-libs/exiftool
-	raw? ( media-gfx/dcraw )"
-DEPEND="${CDEPEND}
-	dev-cpp/tclap
-	sys-devel/gettext
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( authors.txt README TODO )
-
-S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	setup-wxwidgets
-}
-
-src_prepare() {
-	sed -i \
-		-e "/COMMAND.*GZIP/d" \
-		-e "s/\.gz//g" \
-		"${S}"/doc/CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_HSI=$(usex python)
-		-DENABLE_LAPACK=$(usex lapack)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	use python && python_optimize
-
-	local lang
-	for lang in ${LANGS} ; do
-		case ${lang} in
-			ca) dir=ca_ES;;
-			ca-valencia) dir=ca_ES@valencia;;
-			cs) dir=cs_CZ;;
-			*) dir=${lang/-/_};;
-		esac
-		if ! use l10n_${lang} ; then
-			rm -r "${ED}"/usr/share/locale/${dir} || die
-		fi
-	done
-}
diff --git a/media-gfx/hugin/hugin-2022.0.0.ebuild b/media-gfx/hugin/hugin-2022.0.0.ebuild
index eb099f3..5ffa063 100644
--- a/media-gfx/hugin/hugin-2022.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2022.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
 
 LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
 IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
@@ -57,6 +57,8 @@ DOCS=( authors.txt README TODO )
 
 S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
 
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # bug 906468
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 	setup-wxwidgets
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 26a7d4a..9411d0c 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit mercurial python-single-r1 wxwidgets cmake xdg