Wed Jul 19 07:17:47 2023 UTC ()
hugin: fix build with exiv2 0.28


(wiz)
diff -r1.29 -r1.30 pkgsrc/graphics/hugin/distinfo
diff -r1.7 -r1.8 pkgsrc/graphics/hugin/patches/patch-CMakeLists.txt
diff -r0 -r1.3 pkgsrc/graphics/hugin/patches/patch-src_hugin__base_panodata_Exiv2Helper.cpp
diff -r0 -r1.3 pkgsrc/graphics/hugin/patches/patch-src_hugin__base_panodata_SrcPanoImage.cpp
cvs diff -r1.29 -r1.30 pkgsrc/graphics/hugin/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/hugin/distinfo 2023/01/12 08:08:36 1.29
+++ pkgsrc/graphics/hugin/distinfo 2023/07/19 07:17:47 1.30
@@ -1,16 +1,18 @@ @@ -1,16 +1,18 @@
1$NetBSD: distinfo,v 1.29 2023/01/12 08:08:36 adam Exp $ 1$NetBSD: distinfo,v 1.30 2023/07/19 07:17:47 wiz Exp $
2 2
3BLAKE2s (hugin-2022.0.0.tar.bz2) = e6d9ce2ec7edee976ab29b8355e470850eb0f422ee3df464d7f01f684b89698c 3BLAKE2s (hugin-2022.0.0.tar.bz2) = e6d9ce2ec7edee976ab29b8355e470850eb0f422ee3df464d7f01f684b89698c
4SHA512 (hugin-2022.0.0.tar.bz2) = 752bdaaea666a24bddc72b4aa4ccfbf366af30022102a2e74fad9c86045b3aeae50929a8a3eb27e296b27bdb487ecd60b6e363b23413e08af6ed944686569c97 4SHA512 (hugin-2022.0.0.tar.bz2) = 752bdaaea666a24bddc72b4aa4ccfbf366af30022102a2e74fad9c86045b3aeae50929a8a3eb27e296b27bdb487ecd60b6e363b23413e08af6ed944686569c97
5Size (hugin-2022.0.0.tar.bz2) = 10374360 bytes 5Size (hugin-2022.0.0.tar.bz2) = 10374360 bytes
6SHA1 (patch-CMakeLists.txt) = 94e087f3eeab899a6dad701cc4d8a95414a980df 6SHA1 (patch-CMakeLists.txt) = f46fbe2c618ec1c1ecc9906d41b1640c73bda5bf
7SHA1 (patch-CMakeModules_FindPNG.cmake) = 811fd3cf6f819b31129e1560cd8acd1f7ee6defc 7SHA1 (patch-CMakeModules_FindPNG.cmake) = 811fd3cf6f819b31129e1560cd8acd1f7ee6defc
8SHA1 (patch-doc_deghosting_mask.pod) = fe5462b10966420b0cf3fab004854d9dab3bfb4f 8SHA1 (patch-doc_deghosting_mask.pod) = fe5462b10966420b0cf3fab004854d9dab3bfb4f
9SHA1 (patch-src_hugin1_base__wx_wxPanoCommand.cpp) = d5bf8f747ae86338e728c472d3dc04bf4c84f182 9SHA1 (patch-src_hugin1_base__wx_wxPanoCommand.cpp) = d5bf8f747ae86338e728c472d3dc04bf4c84f182
10SHA1 (patch-src_hugin1_calibrate__lens_LensCalFrame.cpp) = 9b815a681317cb19880e7bb6ef170bc14d01b28b 10SHA1 (patch-src_hugin1_calibrate__lens_LensCalFrame.cpp) = 9b815a681317cb19880e7bb6ef170bc14d01b28b
11SHA1 (patch-src_hugin1_hugin_CPEditorPanel.cpp) = d373c00d4783b3edc1bad5a67339163a0c23d8c5 11SHA1 (patch-src_hugin1_hugin_CPEditorPanel.cpp) = d373c00d4783b3edc1bad5a67339163a0c23d8c5
12SHA1 (patch-src_hugin1_hugin_GLPreviewFrame.cpp) = 0b1396f4a45a5ab6529c0b8c64ff291a021226c4 12SHA1 (patch-src_hugin1_hugin_GLPreviewFrame.cpp) = 0b1396f4a45a5ab6529c0b8c64ff291a021226c4
13SHA1 (patch-src_hugin1_ptbatcher_BatchFrame.cpp) = 51ce24f1eb99cc5c0151758299eb1ecc34128171 13SHA1 (patch-src_hugin1_ptbatcher_BatchFrame.cpp) = 51ce24f1eb99cc5c0151758299eb1ecc34128171
 14SHA1 (patch-src_hugin__base_panodata_Exiv2Helper.cpp) = a6d19f020750d3ee78c6960a5f2a0ef2b4c915fb
 15SHA1 (patch-src_hugin__base_panodata_SrcPanoImage.cpp) = c1bd95da3df2afd2eb8b6372c80fa4423dbac934
14SHA1 (patch-src_hugin__script__interface_hsi.i) = b11a52579fd12fdf7c51fef63049d285cb2b52e1 16SHA1 (patch-src_hugin__script__interface_hsi.i) = b11a52579fd12fdf7c51fef63049d285cb2b52e1
15SHA1 (patch-src_tools_align_image_stack.cpp) = fc2759f0722365d4c5339c5c8bc1eda1a6bf7a71 17SHA1 (patch-src_tools_align_image_stack.cpp) = fc2759f0722365d4c5339c5c8bc1eda1a6bf7a71
16SHA1 (patch-src_tools_tca__correct.cpp) = 73a86d3086336f168de5fb1cc02378a3ecc43104 18SHA1 (patch-src_tools_tca__correct.cpp) = 73a86d3086336f168de5fb1cc02378a3ecc43104
cvs diff -r1.7 -r1.8 pkgsrc/graphics/hugin/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/graphics/hugin/patches/patch-CMakeLists.txt 2021/01/09 21:17:37 1.7
+++ pkgsrc/graphics/hugin/patches/patch-CMakeLists.txt 2023/07/19 07:17:47 1.8
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-CMakeLists.txt,v 1.7 2021/01/09 21:17:37 adam Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.8 2023/07/19 07:17:47 wiz Exp $
2 2
3Do not make an application bundle on OS X. 3Do not make an application bundle on OS X.
4 4
5--- CMakeLists.txt.orig 2020-12-12 11:09:15.000000000 +0000 5--- CMakeLists.txt.orig 2022-12-18 09:05:39.000000000 +0000
6+++ CMakeLists.txt 6+++ CMakeLists.txt
7@@ -558,16 +558,6 @@ IF (APPLE) 7@@ -573,16 +573,6 @@ IF (APPLE)
8 ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE) 8 ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE)
9 ENDIF (APPLE) 9 ENDIF (APPLE)
10  10
11-IF (HUGIN_SHARED AND UNIX AND NOT APPLE) 11-IF (HUGIN_SHARED AND UNIX AND NOT APPLE)
12- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/hugin") 12- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/hugin")
13- SET(HUGIN_LIBS_PRIVATE_DIR "1" CACHE INTERNAL "Store internal 13- SET(HUGIN_LIBS_PRIVATE_DIR "1" CACHE INTERNAL "Store internal
14- libraries in private subdirectory" ) 14- libraries in private subdirectory" )
15-ELSE () 15-ELSE ()
16- # On OS X files are moved around after make install, do not try to use 16- # On OS X files are moved around after make install, do not try to use
17- # rpath or CMAKE_INSTALL_NAME_DIR 17- # rpath or CMAKE_INSTALL_NAME_DIR
18- SET(HUGIN_LIBS_PRIVATE_DIR "0" CACHE INTERNAL "Store internal 18- SET(HUGIN_LIBS_PRIVATE_DIR "0" CACHE INTERNAL "Store internal
19- libraries in private subdirectory" ) 19- libraries in private subdirectory" )
20-ENDIF() 20-ENDIF()
File Added: pkgsrc/graphics/hugin/patches/Attic/patch-src_hugin__base_panodata_Exiv2Helper.cpp
$NetBSD: patch-src_hugin__base_panodata_Exiv2Helper.cpp,v 1.3 2023/07/19 07:17:47 wiz Exp $

Fix build with exiv2 0.28.

--- src/hugin_base/panodata/Exiv2Helper.cpp.orig	2019-05-15 15:30:47.000000000 +0000
+++ src/hugin_base/panodata/Exiv2Helper.cpp
@@ -40,7 +40,7 @@ namespace HuginBase
             Exiv2::ExifData::iterator itr = exifData.findKey(Exiv2::ExifKey(keyName));
             if (itr != exifData.end() && itr->count())
             {
-                value = itr->toLong();
+                value = itr->toInt64();
                 return true;
             }
             else
@@ -165,7 +165,7 @@ namespace HuginBase
         {
             if(it!=exifData.end() && it->count())
             {
-                return it->toLong();
+                return it->toInt64();
             }
             return 0;
         };
File Added: pkgsrc/graphics/hugin/patches/Attic/patch-src_hugin__base_panodata_SrcPanoImage.cpp
$NetBSD: patch-src_hugin__base_panodata_SrcPanoImage.cpp,v 1.3 2023/07/19 07:17:47 wiz Exp $

Fix build with exiv2 0.28.

--- src/hugin_base/panodata/SrcPanoImage.cpp.orig	2022-05-26 16:18:56.000000000 +0000
+++ src/hugin_base/panodata/SrcPanoImage.cpp
@@ -384,7 +384,7 @@ bool SrcPanoImage::readEXIF()
                     pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageWidthPixels"));
                     if (pos != xmpData.end())
                     {
-                        croppedWidth = pos->toLong();
+                        croppedWidth = pos->toInt64();
                     }
                     else
                     {
@@ -394,7 +394,7 @@ bool SrcPanoImage::readEXIF()
                     pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageHeightPixels"));
                     if (pos != xmpData.end())
                     {
-                        croppedHeight = pos->toLong();
+                        croppedHeight = pos->toInt64();
                     }
                     else
                     {
@@ -408,7 +408,7 @@ bool SrcPanoImage::readEXIF()
                         double hfov = 0;
                         if (pos != xmpData.end())
                         {
-                            hfov = 360 * croppedWidth / (double)pos->toLong();
+                            hfov = 360 * croppedWidth / (double)pos->toInt64();
                         }
                         else
                         {
@@ -419,7 +419,7 @@ bool SrcPanoImage::readEXIF()
                         pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.FullPanoHeightPixels"));
                         if (pos != xmpData.end())
                         {
-                            fullHeight = pos->toLong();
+                            fullHeight = pos->toInt64();
                         }
                         else
                         {
@@ -430,7 +430,7 @@ bool SrcPanoImage::readEXIF()
                         pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaTopPixels"));
                         if (pos != xmpData.end())
                         {
-                            cropTop = pos->toLong();
+                            cropTop = pos->toInt64();
                         }
                         else
                         {