pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/luminance-hdr
Module Name: pkgsrc
Committed By: adam
Date: Sun Jul 23 21:00:18 UTC 2023
Modified Files:
pkgsrc/graphics/luminance-hdr: Makefile distinfo
pkgsrc/graphics/luminance-hdr/patches: patch-CMakeLists.txt
Added Files:
pkgsrc/graphics/luminance-hdr/patches:
patch-build__files_Modules_CompilerSettings.cmake
Log Message:
luminance-hdr: updated to 2.6.1.1
Changes 2.6.1
* Better UI for last step of HdrWizard
* Fix highlights glitch
* fix save/load response cure even from the command line
* usual bug fixing
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/graphics/luminance-hdr/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/luminance-hdr/distinfo
cvs rdiff -u -r1.5 -r1.6 \
pkgsrc/graphics/luminance-hdr/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
pkgsrc/graphics/luminance-hdr/patches/patch-build__files_Modules_CompilerSettings.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/luminance-hdr/Makefile
diff -u pkgsrc/graphics/luminance-hdr/Makefile:1.83 pkgsrc/graphics/luminance-hdr/Makefile:1.84
--- pkgsrc/graphics/luminance-hdr/Makefile:1.83 Sat Jul 1 22:16:37 2023
+++ pkgsrc/graphics/luminance-hdr/Makefile Sun Jul 23 21:00:18 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.83 2023/07/01 22:16:37 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2023/07/23 21:00:18 adam Exp $
-DISTNAME= luminance-hdr-2.6.0
-PKGREVISION= 32
+DISTNAME= luminance-hdr-2.6.1.1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qtpfsgui/}
EXTRACT_SUFX= .tar.bz2
@@ -11,18 +10,20 @@ HOMEPAGE= http://qtpfsgui.sourceforge.ne
COMMENT= GUI application that aims to provide a workflow for HDR imaging
LICENSE= gnu-gpl-v2
-USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+= -DQt5WebEngineCore_FOUND=FALSE
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/cfitsio/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
.include "../../graphics/exiv2/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/libraw/buildlink3.mk"
.include "../../graphics/openexr/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../math/eigen3/buildlink3.mk"
.include "../../math/fftw/buildlink3.mk"
@@ -30,6 +31,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/jpeg.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/luminance-hdr/distinfo
diff -u pkgsrc/graphics/luminance-hdr/distinfo:1.9 pkgsrc/graphics/luminance-hdr/distinfo:1.10
--- pkgsrc/graphics/luminance-hdr/distinfo:1.9 Wed Jul 19 08:05:51 2023
+++ pkgsrc/graphics/luminance-hdr/distinfo Sun Jul 23 21:00:18 2023
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.9 2023/07/19 08:05:51 wiz Exp $
+$NetBSD: distinfo,v 1.10 2023/07/23 21:00:18 adam Exp $
-BLAKE2s (luminance-hdr-2.6.0.tar.bz2) = 1dae3d48985793932cd269d48d34da75f5a30251af01143f08001c1389b3f5fa
-SHA512 (luminance-hdr-2.6.0.tar.bz2) = 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
-Size (luminance-hdr-2.6.0.tar.bz2) = 11556372 bytes
-SHA1 (patch-CMakeLists.txt) = 471f5de36791769f8f3846a61fcc204ba336238a
+BLAKE2s (luminance-hdr-2.6.1.1.tar.bz2) = 4ce7ce6bbc9833a8eaa336249871710d5ccbbd21e34a26a6372d0647ca9487d4
+SHA512 (luminance-hdr-2.6.1.1.tar.bz2) = 9006339037aa3a0b7332cf71e1cf143d9e700eaae1102dfb8eccea8a9d97a5bcb6331202684adf76542116927dd9a69169882518af6ebb25c85d08057fdc552e
+Size (luminance-hdr-2.6.1.1.tar.bz2) = 11569153 bytes
+SHA1 (patch-CMakeLists.txt) = 2d574a78666838aac75431359885335f0f9df2ea
+SHA1 (patch-build__files_Modules_CompilerSettings.cmake) = b53861203acd0804cb59560fd6ab8b8152d4fe1b
SHA1 (patch-src_Exif_ExifOperations.cpp) = e1adceb033db85f7e59e18f42685ff9d0f5948bd
SHA1 (patch-src_Libpfs_CMakeLists.txt) = 6cf7b440fdf22d72e2d9abbc328c715e711a15a6
SHA1 (patch-src_Libpfs_exif_exifdata.cpp) = 07fa2f66604b760643b832eb0a5c00031e7decf9
Index: pkgsrc/graphics/luminance-hdr/patches/patch-CMakeLists.txt
diff -u pkgsrc/graphics/luminance-hdr/patches/patch-CMakeLists.txt:1.5 pkgsrc/graphics/luminance-hdr/patches/patch-CMakeLists.txt:1.6
--- pkgsrc/graphics/luminance-hdr/patches/patch-CMakeLists.txt:1.5 Wed Jul 19 08:05:51 2023
+++ pkgsrc/graphics/luminance-hdr/patches/patch-CMakeLists.txt Sun Jul 23 21:00:18 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-CMakeLists.txt,v 1.5 2023/07/19 08:05:51 wiz Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.6 2023/07/23 21:00:18 adam Exp $
openexr3 fix
---- CMakeLists.txt.orig 2019-06-09 19:18:38.000000000 +0000
+--- CMakeLists.txt.orig 2021-01-11 09:41:28.000000000 +0000
+++ CMakeLists.txt
@@ -188,7 +188,7 @@ INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
FIND_PACKAGE(PNG REQUIRED)
@@ -13,3 +13,28 @@ openexr3 fix
INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_DIR} "${OPENEXR_INCLUDE_DIR}/OpenEXR")
FIND_PACKAGE(GSL REQUIRED)
+@@ -272,7 +272,7 @@ SET(LUMINANCE_FILES
+ ${LUMINANCE_QM})
+
+ # MacOSX
+-IF(APPLE)
++IF(FALSE)
+ SET(CMAKE_INSTALL_PREFIX ".")
+
+ # Set Bundle settings
+@@ -399,10 +399,15 @@ ELSEIF(UNIX)
+ TARGET_LINK_LIBRARIES(luminance-hdr-cli Qt5::Core Qt5::Gui Qt5::Widgets)
+
+ # link libraries
++ if(APPLE)
++ TARGET_LINK_LIBRARIES(luminance-hdr ${LUMINANCE_MODULES_GUI} ${LIBS})
++ TARGET_LINK_LIBRARIES(luminance-hdr-cli ${LUMINANCE_MODULES_CLI} ${LIBS})
++ else()
+ TARGET_LINK_LIBRARIES(luminance-hdr -Xlinker --start-group ${LUMINANCE_MODULES_GUI} -Xlinker --end-group)
+ TARGET_LINK_LIBRARIES(luminance-hdr-cli -Xlinker --start-group ${LUMINANCE_MODULES_CLI} -Xlinker --end-group)
+ TARGET_LINK_LIBRARIES(luminance-hdr ${LIBS})
+ TARGET_LINK_LIBRARIES(luminance-hdr-cli ${LIBS})
++ endif()
+
+ # make install directivies
+ INSTALL(TARGETS luminance-hdr RUNTIME DESTINATION bin) # main GUI exec
Added files:
Index: pkgsrc/graphics/luminance-hdr/patches/patch-build__files_Modules_CompilerSettings.cmake
diff -u /dev/null pkgsrc/graphics/luminance-hdr/patches/patch-build__files_Modules_CompilerSettings.cmake:1.1
--- /dev/null Sun Jul 23 21:00:18 2023
+++ pkgsrc/graphics/luminance-hdr/patches/patch-build__files_Modules_CompilerSettings.cmake Sun Jul 23 21:00:18 2023
@@ -0,0 +1,21 @@
+$NetBSD: patch-build__files_Modules_CompilerSettings.cmake,v 1.1 2023/07/23 21:00:18 adam Exp $
+
+--- build_files/Modules/CompilerSettings.cmake.orig 2023-07-19 20:35:09.000000000 +0000
++++ build_files/Modules/CompilerSettings.cmake
+@@ -27,7 +27,7 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "G
+ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+ message(STATUS "C++11 activated for Clang")
+ set(CMAKE_CXX_STANDARD 11)
+- if (APPLE)
++ if (FALSE)
+ set(CMAKE_EXE_LINKER_FLAGS "-lc++abi -stdlib=libc++ -rpath @loader_path/../Frameworks/")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ endif()
+@@ -40,6 +40,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHE
+ FIND_PACKAGE(OpenMP REQUIRED)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
++ set(CMAKE_EXE_LINKER_FLAGS "-lomp")
+ endif()
+ elseif(MSVC)
+ message(STATUS "C++11 is active by default on Microsoft Visual Studio")
Home |
Main Index |
Thread Index |
Old Index