CVS commit: pkgsrc/graphics/hugin

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun May  3 07:08:46 UTC 2026

Modified Files:
        pkgsrc/graphics/hugin: distinfo
Added Files:
        pkgsrc/graphics/hugin/patches: patch-CMakeModules_FindVIGRA.cmake

Log Message:
hugin: fix build with vigra 1.12.4 using upstream patch


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/graphics/hugin/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/graphics/hugin/patches/patch-CMakeModules_FindVIGRA.cmake

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.39 pkgsrc/graphics/hugin/distinfo:1.40
--- pkgsrc/graphics/hugin/distinfo:1.39 Sun Mar  8 20:08:05 2026
+++ pkgsrc/graphics/hugin/distinfo      Sun May  3 07:08:45 2026
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.39 2026/03/08 20:08:05 adam Exp $
+$NetBSD: distinfo,v 1.40 2026/05/03 07:08:45 wiz Exp $
 
 BLAKE2s (hugin-2025.0.1.tar.bz2) = bdf918d757a5879a54e60ac97056afa6e48d89c02865b5d52cfa7077e05b831a
 SHA512 (hugin-2025.0.1.tar.bz2) = ce935c0c4ff5952013a81c5b986f34a8f94a74d15d541dd82747c6d4f4f48094a97cd3c460123bdbd460cbdf4b6d7cea302dc60c9626dc88e631484b36e0dfa0
 Size (hugin-2025.0.1.tar.bz2) = 10229525 bytes
 SHA1 (patch-CMakeLists.txt) = 474d8a477d81b2446bb46cc4921e7a6e8d9aef4d
 SHA1 (patch-CMakeModules_FindPNG.cmake) = 811fd3cf6f819b31129e1560cd8acd1f7ee6defc
+SHA1 (patch-CMakeModules_FindVIGRA.cmake) = 08ba941d1e4cf0021df373c2a5be99466ba23a43
 SHA1 (patch-doc_deghosting_mask.pod) = fe5462b10966420b0cf3fab004854d9dab3bfb4f
 SHA1 (patch-src_hugin1_base__wx_wxImageCache.cpp) = c0bf0859d16e604bc1ef7ffc1d7cb461fdb86089
 SHA1 (patch-src_hugin1_hugin_PreviewPanel.cpp) = 5f16005fc1352e5aa5318ebba1b7c3470da4230f

Added files:

Index: pkgsrc/graphics/hugin/patches/patch-CMakeModules_FindVIGRA.cmake
diff -u /dev/null pkgsrc/graphics/hugin/patches/patch-CMakeModules_FindVIGRA.cmake:1.3
--- /dev/null   Sun May  3 07:08:46 2026
+++ pkgsrc/graphics/hugin/patches/patch-CMakeModules_FindVIGRA.cmake    Sun May  3 07:08:45 2026
@@ -0,0 +1,25 @@
+$NetBSD: patch-CMakeModules_FindVIGRA.cmake,v 1.3 2026/05/03 07:08:45 wiz Exp $
+
+Fix build with vigra 1.12.4
+https://sourceforge.net/p/hugin/hugin/ci/5dad0e83e6c58dc2425ca3d56659f4c229761870/
+
+--- CMakeModules/FindVIGRA.cmake.orig  2021-08-21 14:43:52.000000000 +0000
++++ CMakeModules/FindVIGRA.cmake
+@@ -53,8 +53,15 @@ IF (VIGRA_FOUND)
+   IF(NOT VIGRA_CONFIG_VERSION_HXX)
+     MESSAGE(FATAL_ERROR "Could not find vigra/configVersion.hxx or vigra/config_version.hxx. Your vigra installation seems to be corrupt.")
+   ENDIF()
+-  FILE(STRINGS "${VIGRA_CONFIG_VERSION_HXX}" VIGRA_VERSION_HXX REGEX ".*#define +VIGRA_VERSION +\"")
+-  STRING(REGEX REPLACE ".*#define +VIGRA_VERSION +\"([.0-9]+).*" "\\1" VIGRA_VERSION "${VIGRA_VERSION_HXX}")
++  FILE(STRINGS "${VIGRA_CONFIG_VERSION_HXX}" VIGRA_VERSION_HXX REGEX ".*#define +VIGRA_VERSION_(MAJOR|MINOR|PATCH)")
++  STRING(REGEX REPLACE ".*#define +VIGRA_VERSION_MAJOR +([0-9]+).*" "\\1" VIGRA_VERSION_MAJOR "${VIGRA_VERSION_HXX}") 
++  STRING(REGEX REPLACE ".*#define +VIGRA_VERSION_MINOR +([0-9]+).*" "\\1" VIGRA_VERSION_MINOR "${VIGRA_VERSION_HXX}") 
++  STRING(REGEX REPLACE ".*#define +VIGRA_VERSION_PATCH +([0-9]+).*" "\\1" VIGRA_VERSION_PATCH "${VIGRA_VERSION_HXX}")
++  IF(VIGRA_VERSION_MAJOR AND VIGRA_VERSION_MINOR AND VIGRA_VERSION_PATCH)
++    SET(VIGRA_VERSION "${VIGRA_VERSION_MAJOR}.${VIGRA_VERSION_MINOR}.${VIGRA_VERSION_PATCH}")
++  ELSE()
++    MESSAGE(FATAL_ERROR "Cooud not parse vigra version number from vigra/config_version.hxx")
++  ENDIF()
+   IF(${VIGRA_VERSION} VERSION_EQUAL VIGRA_FIND_VERSION OR ${VIGRA_VERSION} VERSION_GREATER VIGRA_FIND_VERSION)
+     SET(VIGRA_VERSION_CHECK TRUE)
+     MESSAGE(STATUS "VIGRA version: ${VIGRA_VERSION}")