head 1.3; access; symbols pkgsrc-2022Q1:1.1.0.6 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.4 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.2 pkgsrc-2021Q3-base:1.1; locks; strict; comment @# @; 1.3 date 2026.05.03.07.08.45; author wiz; state Exp; branches; next 1.2; commitid xEufO7kx94S9ZkEG; 1.2 date 2022.05.31.09.10.18; author adam; state dead; branches; next 1.1; commitid N8VTwMCBQw2IIbGD; 1.1 date 2021.07.08.21.27.07; author markd; state Exp; branches; next ; commitid KG27p8AaWkb2je0D; desc @@ 1.3 log @hugin: fix build with vigra 1.12.4 using upstream patch @ text @$NetBSD$ 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}") @ 1.2 log @hugin: remove unused patches @ text @d1 1 a1 1 $NetBSD: patch-CMakeModules_FindVIGRA.cmake,v 1.1 2021/07/08 21:27:07 markd Exp $ d3 2 a4 1 openexr3 patch d6 1 a6 1 --- CMakeModules/FindVIGRA.cmake.orig 2018-07-23 17:20:45.000000000 +0000 d8 18 a25 9 @@@@ -74,7 +74,7 @@@@ IF (VIGRA_FOUND) OUTPUT_STRIP_TRAILING_WHITESPACE ) STRING(TOLOWER "${OUTPUT_LDD_VIGRA}" OUTPUT_LDD_VIGRA_LOWER) - IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libilmimf") + IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libopenexr") MESSAGE(FATAL_ERROR "Libvigraimpex found. But vigraimpex seems to compiled without OpenEXR support. OpenEXR support is required for Hugin.") ENDIF() ELSE() @ 1.1 log @hugin: build with openexr3 @ text @d1 1 a1 1 $NetBSD$ @