CVS commit: pkgsrc/graphics/luminance-hdr

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

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Jul 13 11:48:58 UTC 2021

Modified Files:
        pkgsrc/graphics/luminance-hdr: Makefile distinfo
Added Files:
        pkgsrc/graphics/luminance-hdr/patches: patch-CMakeLists.txt
            patch-src_Libpfs_CMakeLists.txt

Log Message:
luminance-hdr: build with openexr3


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/graphics/luminance-hdr/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/luminance-hdr/distinfo
cvs rdiff -u -r0 -r1.4 \
    pkgsrc/graphics/luminance-hdr/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/luminance-hdr/patches/patch-src_Libpfs_CMakeLists.txt

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

Modified files:

Index: pkgsrc/graphics/luminance-hdr/Makefile
diff -u pkgsrc/graphics/luminance-hdr/Makefile:1.56 pkgsrc/graphics/luminance-hdr/Makefile:1.57
--- pkgsrc/graphics/luminance-hdr/Makefile:1.56 Tue Jun  1 09:12:23 2021
+++ pkgsrc/graphics/luminance-hdr/Makefile      Tue Jul 13 11:48:58 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2021/06/01 09:12:23 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2021/07/13 11:48:58 markd Exp $
 
 DISTNAME=      luminance-hdr-2.6.0
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=qtpfsgui/}
 EXTRACT_SUFX=  .tar.bz2
@@ -30,5 +30,6 @@ CMAKE_ARGS+=  -DCMAKE_BUILD_TYPE=Release
 .include "../../parallel/openmp/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"
+CMAKE_ARGS+=   -DQt5WebEngineCore_FOUND=FALSE
 .include "../../x11/qt5-qtwebkit/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/luminance-hdr/distinfo
diff -u pkgsrc/graphics/luminance-hdr/distinfo:1.5 pkgsrc/graphics/luminance-hdr/distinfo:1.6
--- pkgsrc/graphics/luminance-hdr/distinfo:1.5  Sun Jan  3 18:52:31 2021
+++ pkgsrc/graphics/luminance-hdr/distinfo      Tue Jul 13 11:48:58 2021
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2021/01/03 18:52:31 adam Exp $
+$NetBSD: distinfo,v 1.6 2021/07/13 11:48:58 markd Exp $
 
 SHA1 (luminance-hdr-2.6.0.tar.bz2) = 18333410173cbc3680d3b7313a6b0a2cf68e043d
 RMD160 (luminance-hdr-2.6.0.tar.bz2) = b1ad15d37434524c5793685e035692c5fff579d6
 SHA512 (luminance-hdr-2.6.0.tar.bz2) = 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
 Size (luminance-hdr-2.6.0.tar.bz2) = 11556372 bytes
+SHA1 (patch-CMakeLists.txt) = c181636a243f5d6ee3dccbe28947eb365ce781ae
+SHA1 (patch-src_Libpfs_CMakeLists.txt) = 6cf7b440fdf22d72e2d9abbc328c715e711a15a6

Added files:

Index: pkgsrc/graphics/luminance-hdr/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/luminance-hdr/patches/patch-CMakeLists.txt:1.4
--- /dev/null   Tue Jul 13 11:48:58 2021
+++ pkgsrc/graphics/luminance-hdr/patches/patch-CMakeLists.txt  Tue Jul 13 11:48:58 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.4 2021/07/13 11:48:58 markd Exp $
+
+openexr3 fix
+
+--- CMakeLists.txt.orig        2021-07-13 11:32:17.221425394 +0000
++++ CMakeLists.txt
+@@ -188,7 +188,7 @@ INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
+ FIND_PACKAGE(PNG REQUIRED)
+ INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
+ 
+-FIND_PACKAGE(OpenEXR REQUIRED)
++FIND_PACKAGE(OpenEXR CONFIG REQUIRED)
+ INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_DIR} "${OPENEXR_INCLUDE_DIR}/OpenEXR")
+ 
+ FIND_PACKAGE(GSL REQUIRED)

Index: pkgsrc/graphics/luminance-hdr/patches/patch-src_Libpfs_CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/luminance-hdr/patches/patch-src_Libpfs_CMakeLists.txt:1.1
--- /dev/null   Tue Jul 13 11:48:58 2021
+++ pkgsrc/graphics/luminance-hdr/patches/patch-src_Libpfs_CMakeLists.txt       Tue Jul 13 11:48:58 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Libpfs_CMakeLists.txt,v 1.1 2021/07/13 11:48:58 markd Exp $
+
+openexr3 fix
+
+--- src/Libpfs/CMakeLists.txt.orig     2019-06-09 19:18:38.000000000 +0000
++++ src/Libpfs/CMakeLists.txt
+@@ -12,7 +12,7 @@ ADD_SUBDIRECTORY(colorspace)
+ ADD_SUBDIRECTORY(io)
+ 
+ ADD_LIBRARY(pfs STATIC ${LIBPFS_H} ${LIBPFS_HXX} ${LIBPFS_CPP})
+-TARGET_LINK_LIBRARIES(pfs Qt5::Core Qt5::Gui Qt5::Widgets)
++TARGET_LINK_LIBRARIES(pfs Qt5::Core Qt5::Gui Qt5::Widgets OpenEXR::OpenEXR)
+ 
+ SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} pfs PARENT_SCOPE)
+ SET(LUMINANCE_MODULES_CLI ${LUMINANCE_MODULES_CLI} pfs PARENT_SCOPE)