CVS commit: pkgsrc/graphics/hugin

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Jun 29 02:42:00 UTC 2024

Modified Files:
        pkgsrc/graphics/hugin: distinfo
Added Files:
        pkgsrc/graphics/hugin/patches:
            patch-src_hugin__base_hugin__utils_filesystem.h

Log Message:
hugin: fix build with latest boost.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/graphics/hugin/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/hugin/patches/patch-src_hugin__base_hugin__utils_filesystem.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/hugin/distinfo
diff -u pkgsrc/graphics/hugin/distinfo:1.31 pkgsrc/graphics/hugin/distinfo:1.32
--- pkgsrc/graphics/hugin/distinfo:1.31 Fri Nov 17 19:48:36 2023
+++ pkgsrc/graphics/hugin/distinfo      Sat Jun 29 02:42:00 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2023/11/17 19:48:36 adam Exp $
+$NetBSD: distinfo,v 1.32 2024/06/29 02:42:00 markd Exp $
 
 BLAKE2s (hugin-2023.0.0.tar.bz2) = a6b18a565690c42a555a7ff21bec10a3478c755ea582f491e114e43ead901d56
 SHA512 (hugin-2023.0.0.tar.bz2) = f950afec9020972baa20931d5001cd479a9169a4eec0d459d830612f40177eea6a25e059047054b8e9679017687e4c2db9fb27f755a3d0b749e5055e2ff0adc8
@@ -6,6 +6,7 @@ Size (hugin-2023.0.0.tar.bz2) = 10336322
 SHA1 (patch-CMakeLists.txt) = f46fbe2c618ec1c1ecc9906d41b1640c73bda5bf
 SHA1 (patch-CMakeModules_FindPNG.cmake) = 811fd3cf6f819b31129e1560cd8acd1f7ee6defc
 SHA1 (patch-doc_deghosting_mask.pod) = fe5462b10966420b0cf3fab004854d9dab3bfb4f
+SHA1 (patch-src_hugin__base_hugin__utils_filesystem.h) = 20b286c81887e069dbea7bc2b02c0d315e88e466
 SHA1 (patch-src_hugin__script__interface_hsi.i) = b11a52579fd12fdf7c51fef63049d285cb2b52e1
 SHA1 (patch-src_tools_align_image_stack.cpp) = fc2759f0722365d4c5339c5c8bc1eda1a6bf7a71
 SHA1 (patch-src_tools_tca__correct.cpp) = 73a86d3086336f168de5fb1cc02378a3ecc43104

Added files:

Index: pkgsrc/graphics/hugin/patches/patch-src_hugin__base_hugin__utils_filesystem.h
diff -u /dev/null pkgsrc/graphics/hugin/patches/patch-src_hugin__base_hugin__utils_filesystem.h:1.1
--- /dev/null   Sat Jun 29 02:42:00 2024
+++ pkgsrc/graphics/hugin/patches/patch-src_hugin__base_hugin__utils_filesystem.h       Sat Jun 29 02:42:00 2024
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_hugin__base_hugin__utils_filesystem.h,v 1.1 2024/06/29 02:42:00 markd Exp $
+
+Fixed deprecated boost::filesystem::copy_option enum
+https://sourceforge.net/p/hugin/hugin/ci/4d081490b48aaff820cee7601b8624b37b652c06/
+
+--- src/hugin_base/hugin_utils/filesystem.h.orig       2023-05-08 18:19:14.000000000 +0000
++++ src/hugin_base/hugin_utils/filesystem.h
+@@ -64,6 +64,12 @@
+     #endif
+     #include <boost/filesystem.hpp>
+     namespace fs = boost::filesystem;
+-    #define OVERWRITE_EXISTING boost::filesystem::copy_option::overwrite_if_exists
++    #if BOOST_VERSION>=107400
++      // in Boost 1.74 and later filesystem::copy_option is deprecated
++      // use filesystem::copy_options instead
++      #define OVERWRITE_EXISTING boost::filesystem::copy_options::overwrite_existing
++    #else
++      #define OVERWRITE_EXISTING boost::filesystem::copy_option::overwrite_if_exists
++    #endif
+ #endif
+ #endif // _HUGIN_UTILS_FILESYSTEM_H