Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_162577962890910"
MIME-Version: 1.0
Date: Thu, 8 Jul 2021 21:27:08 +0000
From: "Mark Davies" <markd@netbsd.org>
Subject: CVS commit: pkgsrc/graphics/hugin
To: pkgsrc-changes@NetBSD.org
Reply-To: markd@netbsd.org
Message-Id: <20210708212708.20425FA95@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_162577962890910
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	markd
Date:		Thu Jul  8 21:27:08 UTC 2021

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

Log Message:
hugin: build with openexr3


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 pkgsrc/graphics/hugin/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/hugin/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/hugin/patches/patch-CMakeModules_FindOpenEXR.cmake \
    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.


--_----------=_162577962890910
Content-Disposition: inline
Content-Length: 4475
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/graphics/hugin/Makefile
diff -u pkgsrc/graphics/hugin/Makefile:1.112 pkgsrc/graphics/hugin/Makefile:1.113
--- pkgsrc/graphics/hugin/Makefile:1.112	Wed Apr 21 13:24:47 2021
+++ pkgsrc/graphics/hugin/Makefile	Thu Jul  8 21:27:07 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.112 2021/04/21 13:24:47 adam Exp $
+# $NetBSD: Makefile,v 1.113 2021/07/08 21:27:07 markd Exp $
 
 DISTNAME=	hugin-2020.0.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hugin/}
 EXTRACT_SUFX=	.tar.bz2
@@ -42,12 +42,16 @@ SUBST_SED.apple=	-e 's,(APPLE),(ELPPA),g
 post-extract:
 	${MKDIR} ${WRKDIR}/build
 
+# Doesn't define the ZLIB::ZLIB target needed by OpenEXR 3
+post-patch:
+	rm ${WRKSRC}/CMakeModules/FindZLIB.cmake
+
 .include "../../mk/bsd.prefs.mk"
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/swig2/buildlink3.mk"
+.include "../../devel/swig3/buildlink3.mk"
 .include "../../devel/tclap/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"

Index: pkgsrc/graphics/hugin/distinfo
diff -u pkgsrc/graphics/hugin/distinfo:1.24 pkgsrc/graphics/hugin/distinfo:1.25
--- pkgsrc/graphics/hugin/distinfo:1.24	Sat Jan  9 21:17:37 2021
+++ pkgsrc/graphics/hugin/distinfo	Thu Jul  8 21:27:07 2021
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.24 2021/01/09 21:17:37 adam Exp $
+$NetBSD: distinfo,v 1.25 2021/07/08 21:27:07 markd Exp $
 
 SHA1 (hugin-2020.0.0.tar.bz2) = 20e39ab82e1d8208a7eee2f216ab1271c95f583f
 RMD160 (hugin-2020.0.0.tar.bz2) = 499c24bf2dd0eb0b1e223183004dd00f9ced61c2
 SHA512 (hugin-2020.0.0.tar.bz2) = 4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e
 Size (hugin-2020.0.0.tar.bz2) = 10371301 bytes
 SHA1 (patch-CMakeLists.txt) = 94e087f3eeab899a6dad701cc4d8a95414a980df
+SHA1 (patch-CMakeModules_FindOpenEXR.cmake) = 74be9d83d98c50ea0cce05b8c2cafbb2ea2dc601
 SHA1 (patch-CMakeModules_FindPNG.cmake) = 811fd3cf6f819b31129e1560cd8acd1f7ee6defc
+SHA1 (patch-CMakeModules_FindVIGRA.cmake) = 12faefe589ef9e237473243e88398d2c90f2ae93
 SHA1 (patch-doc_deghosting_mask.pod) = fe5462b10966420b0cf3fab004854d9dab3bfb4f
 SHA1 (patch-src_hugin1_base__wx_wxPanoCommand.cpp) = d5bf8f747ae86338e728c472d3dc04bf4c84f182
 SHA1 (patch-src_hugin1_calibrate__lens_LensCalFrame.cpp) = 9b815a681317cb19880e7bb6ef170bc14d01b28b

Added files:

Index: pkgsrc/graphics/hugin/patches/patch-CMakeModules_FindOpenEXR.cmake
diff -u /dev/null pkgsrc/graphics/hugin/patches/patch-CMakeModules_FindOpenEXR.cmake:1.1
--- /dev/null	Thu Jul  8 21:27:08 2021
+++ pkgsrc/graphics/hugin/patches/patch-CMakeModules_FindOpenEXR.cmake	Thu Jul  8 21:27:07 2021
@@ -0,0 +1,20 @@
+$NetBSD: patch-CMakeModules_FindOpenEXR.cmake,v 1.1 2021/07/08 21:27:07 markd Exp $
+
+openexr3 patch
+
+--- CMakeModules/FindOpenEXR.cmake.orig	2020-08-21 18:08:05.000000000 +0000
++++ CMakeModules/FindOpenEXR.cmake
+@@ -11,6 +11,13 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
+ 
++FIND_PACKAGE(OpenEXR CONFIG REQUIRED)
++IF (TARGET OpenEXR::OpenEXR)
++    SET(OPENEXR_FOUND TRUE)
++    SET(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXR)
++    SET(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++ENDIF()
++
+ if (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES)
+   # in cache already
+   SET(OPENEXR_FOUND TRUE)
Index: pkgsrc/graphics/hugin/patches/patch-CMakeModules_FindVIGRA.cmake
diff -u /dev/null pkgsrc/graphics/hugin/patches/patch-CMakeModules_FindVIGRA.cmake:1.1
--- /dev/null	Thu Jul  8 21:27:08 2021
+++ pkgsrc/graphics/hugin/patches/patch-CMakeModules_FindVIGRA.cmake	Thu Jul  8 21:27:07 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeModules_FindVIGRA.cmake,v 1.1 2021/07/08 21:27:07 markd Exp $
+
+openexr3 patch
+
+--- CMakeModules/FindVIGRA.cmake.orig	2018-07-23 17:20:45.000000000 +0000
++++ CMakeModules/FindVIGRA.cmake
+@@ -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()


--_----------=_162577962890910--