Tue Jul 13 11:48:58 2021 UTC ()
luminance-hdr: build with openexr3


(markd)
diff -r1.56 -r1.57 pkgsrc/graphics/luminance-hdr/Makefile
diff -r1.5 -r1.6 pkgsrc/graphics/luminance-hdr/distinfo
diff -r0 -r1.4 pkgsrc/graphics/luminance-hdr/patches/patch-CMakeLists.txt
diff -r0 -r1.1 pkgsrc/graphics/luminance-hdr/patches/patch-src_Libpfs_CMakeLists.txt
cvs diff -r1.56 -r1.57 pkgsrc/graphics/luminance-hdr/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/luminance-hdr/Makefile 2021/06/01 09:12:23 1.56
+++ pkgsrc/graphics/luminance-hdr/Makefile 2021/07/13 11:48:58 1.57
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.56 2021/06/01 09:12:23 wiz Exp $ 1# $NetBSD: Makefile,v 1.57 2021/07/13 11:48:58 markd Exp $
2 2
3DISTNAME= luminance-hdr-2.6.0 3DISTNAME= luminance-hdr-2.6.0
4PKGREVISION= 5 4PKGREVISION= 6
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qtpfsgui/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qtpfsgui/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://qtpfsgui.sourceforge.net/ 10HOMEPAGE= http://qtpfsgui.sourceforge.net/
11COMMENT= GUI application that aims to provide a workflow for HDR imaging 11COMMENT= GUI application that aims to provide a workflow for HDR imaging
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_CMAKE= yes 14USE_CMAKE= yes
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
17 17
@@ -20,15 +20,16 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release @@ -20,15 +20,16 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
20.include "../../devel/boost-libs/buildlink3.mk" 20.include "../../devel/boost-libs/buildlink3.mk"
21.include "../../devel/cfitsio/buildlink3.mk" 21.include "../../devel/cfitsio/buildlink3.mk"
22.include "../../graphics/exiv2/buildlink3.mk" 22.include "../../graphics/exiv2/buildlink3.mk"
23.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 23.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
24.include "../../graphics/libraw/buildlink3.mk" 24.include "../../graphics/libraw/buildlink3.mk"
25.include "../../graphics/openexr/buildlink3.mk" 25.include "../../graphics/openexr/buildlink3.mk"
26.include "../../graphics/tiff/buildlink3.mk" 26.include "../../graphics/tiff/buildlink3.mk"
27.include "../../math/eigen3/buildlink3.mk" 27.include "../../math/eigen3/buildlink3.mk"
28.include "../../math/fftw/buildlink3.mk" 28.include "../../math/fftw/buildlink3.mk"
29.include "../../math/gsl/buildlink3.mk" 29.include "../../math/gsl/buildlink3.mk"
30.include "../../parallel/openmp/buildlink3.mk" 30.include "../../parallel/openmp/buildlink3.mk"
31.include "../../sysutils/desktop-file-utils/desktopdb.mk" 31.include "../../sysutils/desktop-file-utils/desktopdb.mk"
32.include "../../x11/qt5-qttools/buildlink3.mk" 32.include "../../x11/qt5-qttools/buildlink3.mk"
 33CMAKE_ARGS+= -DQt5WebEngineCore_FOUND=FALSE
33.include "../../x11/qt5-qtwebkit/buildlink3.mk" 34.include "../../x11/qt5-qtwebkit/buildlink3.mk"
34.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/graphics/luminance-hdr/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/luminance-hdr/distinfo 2021/01/03 18:52:31 1.5
+++ pkgsrc/graphics/luminance-hdr/distinfo 2021/07/13 11:48:58 1.6
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
1$NetBSD: distinfo,v 1.5 2021/01/03 18:52:31 adam Exp $ 1$NetBSD: distinfo,v 1.6 2021/07/13 11:48:58 markd Exp $
2 2
3SHA1 (luminance-hdr-2.6.0.tar.bz2) = 18333410173cbc3680d3b7313a6b0a2cf68e043d 3SHA1 (luminance-hdr-2.6.0.tar.bz2) = 18333410173cbc3680d3b7313a6b0a2cf68e043d
4RMD160 (luminance-hdr-2.6.0.tar.bz2) = b1ad15d37434524c5793685e035692c5fff579d6 4RMD160 (luminance-hdr-2.6.0.tar.bz2) = b1ad15d37434524c5793685e035692c5fff579d6
5SHA512 (luminance-hdr-2.6.0.tar.bz2) = 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1 5SHA512 (luminance-hdr-2.6.0.tar.bz2) = 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
6Size (luminance-hdr-2.6.0.tar.bz2) = 11556372 bytes 6Size (luminance-hdr-2.6.0.tar.bz2) = 11556372 bytes
 7SHA1 (patch-CMakeLists.txt) = c181636a243f5d6ee3dccbe28947eb365ce781ae
 8SHA1 (patch-src_Libpfs_CMakeLists.txt) = 6cf7b440fdf22d72e2d9abbc328c715e711a15a6
File Added: pkgsrc/graphics/luminance-hdr/patches/patch-CMakeLists.txt
$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)
File Added: pkgsrc/graphics/luminance-hdr/patches/patch-src_Libpfs_CMakeLists.txt
$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)