CVS commit: pkgsrc/graphics/darktable

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Sep  6 21:04:21 UTC 2023

Modified Files:
        pkgsrc/graphics/darktable: distinfo
Added Files:
        pkgsrc/graphics/darktable/patches:
            patch-src_external_rawspeed_cmake_src-dependencies.cmake

Log Message:
darktable: Be less fussy about zlib versions.

Hopefully accept the NetBSD 9 zlib.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/graphics/darktable/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/darktable/patches/patch-src_external_rawspeed_cmake_src-dependencies.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/darktable/distinfo
diff -u pkgsrc/graphics/darktable/distinfo:1.39 pkgsrc/graphics/darktable/distinfo:1.40
--- pkgsrc/graphics/darktable/distinfo:1.39     Fri Sep  1 16:23:09 2023
+++ pkgsrc/graphics/darktable/distinfo  Wed Sep  6 21:04:20 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.39 2023/09/01 16:23:09 nia Exp $
+$NetBSD: distinfo,v 1.40 2023/09/06 21:04:20 nia Exp $
 
 BLAKE2s (darktable-4.4.2.tar.xz) = 83f500f5a2c0d83bcfa03a1f91b556a78b547862911f3c673a42e1896fb2abaa
 SHA512 (darktable-4.4.2.tar.xz) = 7b87879e865001491bbeaa12b9ac42b006bfa3fbcb50e73384c76cce0ee5d87200be3ce9b11f56d669d5eaf9b1add0a018ec5a021653bb84dfb6a0b379cb5594
 Size (darktable-4.4.2.tar.xz) = 6033932 bytes
+SHA1 (patch-src_external_rawspeed_cmake_src-dependencies.cmake) = 41733d3ad6d440782fb5c8f790668ab18a53f934

Added files:

Index: pkgsrc/graphics/darktable/patches/patch-src_external_rawspeed_cmake_src-dependencies.cmake
diff -u /dev/null pkgsrc/graphics/darktable/patches/patch-src_external_rawspeed_cmake_src-dependencies.cmake:1.1
--- /dev/null   Wed Sep  6 21:04:21 2023
+++ pkgsrc/graphics/darktable/patches/patch-src_external_rawspeed_cmake_src-dependencies.cmake  Wed Sep  6 21:04:20 2023
@@ -0,0 +1,36 @@
+$NetBSD: patch-src_external_rawspeed_cmake_src-dependencies.cmake,v 1.1 2023/09/06 21:04:20 nia Exp $
+
+Remove overly strict version requirements.
+
+In particular, NetBSD 9 ships zlib 1.2.10. As far as I can tell, there
+aren't any notable API changes between 1.2.10 and 1.2.11.
+
+--- src/external/rawspeed/cmake/src-dependencies.cmake.orig    2023-06-12 21:39:40.000000000 +0000
++++ src/external/rawspeed/cmake/src-dependencies.cmake
+@@ -33,7 +33,7 @@ if(WITH_OPENMP)
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OPENMP_VERSION_SPECIFIER}")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENMP_VERSION_SPECIFIER}")
+ 
+-  find_package(OpenMP 4.5)
++  find_package(OpenMP)
+ 
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_SAVE}")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_SAVE}")
+@@ -81,7 +81,7 @@ unset(HAVE_PUGIXML)
+ if(WITH_PUGIXML)
+   message(STATUS "Looking for pugixml")
+   if(NOT USE_BUNDLED_PUGIXML)
+-    find_package(Pugixml 1.8)
++    find_package(Pugixml)
+     if(NOT Pugixml_FOUND)
+       message(SEND_ERROR "Did not find Pugixml! Either make it find Pugixml, or pass -DUSE_BUNDLED_PUGIXML=ON to enable in-tree pugixml.")
+     else()
+@@ -151,7 +151,7 @@ unset(HAVE_ZLIB)
+ if (WITH_ZLIB)
+   message(STATUS "Looking for ZLIB")
+   if(NOT USE_BUNDLED_ZLIB)
+-    find_package(ZLIB 1.2.11)
++    find_package(ZLIB)
+     if(NOT ZLIB_FOUND)
+       message(SEND_ERROR "Did not find ZLIB! Either make it find ZLIB, or pass -DWITH_ZLIB=OFF to disable ZLIB, or pass -DUSE_BUNDLED_ZLIB=ON to enable in-tree ZLIB.")
+     else()