gentoo auto-resync : 08:06:2023 - 21:46:30

3 files changed, 103 insertions, 1 deletions

diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index fb47edc0b7d8..f04b7cedac64 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,4 +1,5 @@
+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-2022.0.0.ebuild 2118 BLAKE2B 0705a31e43d14fd120dad9b4c7ab2f38ba5dff1638ef45c147698210236496b72a25ac9f9a7baf3a2e863ec6789ccd12d809c68a2c8507594d3a77c4f2739da4 SHA512 5eb85e50ab7322254e8358c74d96f3b2482c7d2f73dfcc4180d51fcdda769304978cd0bf0e664f6225c4d4f3ab3fa2d945d9d9d456b654c2695e227ef2692684
+EBUILD hugin-2022.0.0.ebuild 2180 BLAKE2B 9d5965086fd8d95dfcd628a7fdb7234ff8e82ca6744ad2cdbe9620d7bc5e8b68b1f2f6a25f3aab789a1738d339bd1360e954afd6f7776f1f9163d120b3b49994 SHA512 5c95a6c4df8983f5fc714bdb9fe74bc75765df145438c2cf21daef1b2433ab286ce9c81971a3d3840717f53f7b7de103e7121705d37c023612541313b35c26cd
 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 000000000000..dff74132b48f
--- /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-2022.0.0.ebuild b/media-gfx/hugin/hugin-2022.0.0.ebuild
index eb099f3d2f2e..3c0dd61f7e87 100644
--- a/media-gfx/hugin/hugin-2022.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2022.0.0.ebuild
@@ -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