media-gfx/hugin: sync with main tree

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

6 files changed, 41 insertions, 149 deletions

diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 6a0d445..92c3d07 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,29 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX hugin-2018.0.0-exiv2-0.27.patch 1095 BLAKE2B 52cd5e31f36b22291a3a864a9f248510f0fc871f1a9ee8e49cbcda5d8876eb9e7ec0e5e1595cce015c55dfc0f53b4fa8efc82e30f8c129e81d426accb3538e5e SHA512 480cb3f5e4ba04efa863b409747029ec1ed158168705621b3ba588e6566c56c3e5b16f422daf40cc27660b48f63c1a32861f9a4cda22c0eda397922d00a828a1
-DIST hugin-2018.0.0.tar.bz2 9838518 BLAKE2B dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a SHA512 30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
+AUX hugin-2019.0.0-exiv2-0.27.1.patch 998 BLAKE2B fd072b1bfb995f3e63ca78b0ad288c6012e6256d8c268fde7b9d3e1fb346544d34807394ac45b244329d96d6e75347c7e06b8cffa44258dd9b59378f56ead112 SHA512 9127921810b9a3cbc7aa216cb961cf5d8eef04ab5beb6baef94851d25e32314dd0565e507e3e57d2d560b6079afcf54e16330935334835fe664842d337732643
 DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B 59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5 SHA512 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
-EBUILD hugin-2018.0.0.ebuild 2023 BLAKE2B 084ad47690dba6a9020dd815ba6b91621bdbb8ff39b3a70d5033fb9533199254016ed6be6a117ee57b8126169f866453c7016a26ef95733e8d221f00f70421ca SHA512 95a3dff5c0ba71574cd1f7454ffd6fbcaaad105313b20f9bba4eaada750efd1e7262261536898e7b7941775b27325ae9768b3376d0f13a2d4cbe5b7f18314835
-EBUILD hugin-2019.0.0.ebuild 2137 BLAKE2B 6979c0d973b46470e728cba52149fb9f6661f802e3cf44b2ade519cecebe467db69c10e85de22b3c08a88586f6c369e3fe46d835b35d8e5cac508856e115b6d3 SHA512 edb77fa285955e0332b93770d3ad0bdf21707a2f515b61705006c756eabeb452cccf126e0cb8eeedb38c37d83187ab0a094bcbb97c319a8b65cd094c2389e937
-EBUILD hugin-9999.ebuild 2010 BLAKE2B dc2a3fa7c6252cb2e6efb15fbcfe410113184c29e031e45d7482b2628fa6d68b641d3c6ee23d0ea5b6fa5150fe2c72bf2c615a603b5452b458ecde44b89e8974 SHA512 cfc02d7f6688f3024c987052a1f1cf3e110265d56b181e89a7f4525570231c8b2ee58932a376350a32b623b0d75b1821084d5523ec3bc7ff41592d1ead667de5
+EBUILD hugin-2019.0.0.ebuild 2209 BLAKE2B 422eb30880ce4b6b99f2386897fbd9bf681f3ac95d08e2403e7588b4d67b6ffbb5426135c301d5a67316977f4752a9db81717672a9374f737f4c6f82cd5e45c6 SHA512 4c6cf8a833bab922cad4c58de82d08360459584894c41d0b4f423480244bbdfc4dd5782c98f5bc8e040974f475d52944b9a1a5ded96e3f465e32241e7fecabfb
+EBUILD hugin-9999.ebuild 2058 BLAKE2B 7a3caa225c3a346a02fe52944ec07fa46116868df793ad91e7f1744bce8eabe495f5969da4f28a399f8c07673c42b6dc37bbcb7d4ee99c83c4dd819b959e39fb SHA512 7d9e70cee2f287214ea55c8aecb181f790ba1ac53bd7ea0fed5a50ce2d6f62c0fa656b27efaf6d965cd91b58e3e04941df645723236c2df58f510d4f69690cc5
 MISC metadata.xml 519 BLAKE2B bd02923a26374e3bd638778ce8100efc4694ab6bec54fd8c8cbd32d0b8c3d495fc965194692ebaf2fe909e495011978d7bb8f3c995037fc128cfd9626949549c SHA512 d4e0bfb870b5b6e5769be2c28983d914666e413333887ac7a7cdb868d2f45f6b284a99204f6e97b98e65958412c04291f6fbc21deed8de518d3ff64aae6ad01b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQKTBAEBCAB9FiEErJcI5lTqgnns7I/6UVnB5yGcCiwFAlzHWbFfFIAAAAAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEFD
-OTcwOEU2NTRFQTgyNzlFQ0VDOEZGQTUxNTlDMUU3MjE5QzBBMkMACgkQUVnB5yGc
-CizFjg//R4yOqKKN7EoOvIaHiSewgEw6Uoc/8/BJRuibkOSoh5a/AU/S3On8+w6B
-LlgFazeLMwaXW0+r9TKfRMd/tQVyd3vwc0pZmR8MirdyhOJmUoBvj2Ni9mo5cXrf
-erEzNSpPlRG9Ng40c21m1BfB8TrnF3XjPOB1keeKJlwVa+7EScIkrYWBvMh7tjig
-UEeF4PR/Kp65dyaUSnJ5f4roBzH1caGI2g8K7z945LL/WUant4QJO/3fV0/w2gZZ
-pRg7onfxgzKSoTOxX1XcPtbAXsGMnpIqZWJd4KgWNM+hnLhS71oZHhmXWuO8ldiA
-pSIVmE9U9y+Ce98eVQPtrdfyZuxoGNgDtq5BgzODu5fD9YTFIucFcZDBLNqTs8UV
-DpjAQejpLE0pYq0zwmk06T4kExbAZ9bmb1RgCp6yTOTO4NTzda8PjkRUBirB2SlX
-XlrWcfWUZ5wbHtPQ0mJRAzKgIEi6/2u1fc5t2Kaq5oBAvQY5A7nAu7eH31zTq7EE
-mNfCsUV34hipDf+SyJ7sUlByQ3QLO/dEMHrnRCFR1oKayd7h4UKkmXFI7HuqOdFO
-mzHhv6GIJZ86ibravtu2+dbJqLmKy5ZmAIJ+8LVXCAKYW7uBMO9I2jun45vjuzX2
-nldo17e4q1SNi0dlzMuYu6ixX1Qend1MnTZkOczyKWIQgBZZKuw=
-=B8BE
------END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch b/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch
deleted file mode 100644
index 23dd542..0000000
--- a/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/hugin_base/panodata/Exiv2Helper.cpp
-+++ b/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/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch b/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
new file mode 100644
index 0000000..e22023f
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
@@ -0,0 +1,29 @@
+Fix build against exiv2-0.27.1 by using upstream recommended catchall header.
+
+--- a/src/hugin_base/panodata/SrcPanoImage.cpp	2019-02-16 09:18:55.000000000 +0100
++++ b/src/hugin_base/panodata/SrcPanoImage.cpp	2019-05-21 14:26:23.470193305 +0200
+@@ -40,9 +40,7 @@
+ #include <vigra/diff2d.hxx>
+ #include <vigra/imageinfo.hxx>
+ #include <hugin_utils/utils.h>
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/easyaccess.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <lensdb/LensDB.h>
+ #include "Exiv2Helper.h"
+ 
+--- a/src/hugin1/hugin/RawImport.cpp	2019-02-02 11:11:01.000000000 +0100
++++ b/src/hugin1/hugin/RawImport.cpp	2019-05-21 14:33:00.522541182 +0200
+@@ -35,10 +35,7 @@
+ // workaround for a conflict between exiv2 and wxWidgets/CMake built
+ #define HAVE_PID_T 1
+ #endif
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/easyaccess.hpp>
+-#include <exiv2/xmpsidecar.hpp>
++#include <exiv2/exiv2.hpp>
+ #ifdef __WXMSW__
+ #include <wx/msw/registry.h>
+ #endif
diff --git a/media-gfx/hugin/hugin-2018.0.0.ebuild b/media-gfx/hugin/hugin-2018.0.0.ebuild
deleted file mode 100644
index 5c87262..0000000
--- a/media-gfx/hugin/hugin-2018.0.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver
-
-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 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 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:0=
-	media-libs/libpng:0=
-	media-libs/openexr:=
-	media-libs/tiff:0
-	>=media-libs/vigra-1.11.0[openexr]
-	sci-libs/fftw:3.0=
-	sci-libs/flann
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/wxGTK:3.0=[X,opengl]
-	lapack? ( virtual/blas virtual/lapack )
-	python? ( ${PYTHON_DEPS} )
-	sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
-	media-libs/exiftool"
-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 )
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
-
-S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	setup-wxwidgets
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_HSI=$(usex python)
-		-DENABLE_LAPACK=$(usex lapack)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_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-2019.0.0.ebuild b/media-gfx/hugin/hugin-2019.0.0.ebuild
index 931b74e..65ee4e7 100644
--- a/media-gfx/hugin/hugin-2019.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 WX_GTK_VER="3.0"
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver
+inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -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 ~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_})"
@@ -56,6 +56,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DOCS=( authors.txt README TODO )
 
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" ) # bug 686366
+
 S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
 
 pkg_setup() {
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 0783740..5ec24c6 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 WX_GTK_VER="3.0"
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
-inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver
+inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -64,6 +64,10 @@ pkg_setup() {
 	setup-wxwidgets
 }
 
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_HSI=$(usex python)