Received: by mail.netbsd.org (Postfix, from userid 605) id 778AB84F9D; Tue, 13 Jul 2021 12:36:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B286084F9C for ; Tue, 13 Jul 2021 12:36:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id YZ-YauVm0Ht9 for ; Tue, 13 Jul 2021 12:36:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id D730984D3F for ; Tue, 13 Jul 2021 12:36:30 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id CEBACFA95; Tue, 13 Jul 2021 12:36:30 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_162617979034470" MIME-Version: 1.0 Date: Tue, 13 Jul 2021 12:36:30 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/graphics/darktable To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20210713123630.CEBACFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_162617979034470 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: markd Date: Tue Jul 13 12:36:30 UTC 2021 Modified Files: pkgsrc/graphics/darktable: Makefile distinfo pkgsrc/graphics/darktable/patches: patch-src_CMakeLists.txt Added Files: pkgsrc/graphics/darktable/patches: patch-src_imageio_format_CMakeLists.txt Log Message: darktable: fix for openexr3 To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 pkgsrc/graphics/darktable/Makefile cvs rdiff -u -r1.32 -r1.33 pkgsrc/graphics/darktable/distinfo cvs rdiff -u -r1.8 -r1.9 \ pkgsrc/graphics/darktable/patches/patch-src_CMakeLists.txt cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/darktable/patches/patch-src_imageio_format_CMakeLists.txt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_162617979034470 Content-Disposition: inline Content-Length: 4674 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/darktable/Makefile diff -u pkgsrc/graphics/darktable/Makefile:1.121 pkgsrc/graphics/darktable/Makefile:1.122 --- pkgsrc/graphics/darktable/Makefile:1.121 Wed Apr 21 13:24:46 2021 +++ pkgsrc/graphics/darktable/Makefile Tue Jul 13 12:36:30 2021 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.121 2021/04/21 13:24:46 adam Exp $ +# $NetBSD: Makefile,v 1.122 2021/07/13 12:36:30 markd Exp $ DISTNAME= darktable-3.0.0 -PKGREVISION= 14 +PKGREVISION= 15 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GITHUB:=darktable-org/} GITHUB_PROJECT= darktable Index: pkgsrc/graphics/darktable/distinfo diff -u pkgsrc/graphics/darktable/distinfo:1.32 pkgsrc/graphics/darktable/distinfo:1.33 --- pkgsrc/graphics/darktable/distinfo:1.32 Sun Jan 5 02:30:08 2020 +++ pkgsrc/graphics/darktable/distinfo Tue Jul 13 12:36:30 2021 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.32 2020/01/05 02:30:08 ryoon Exp $ +$NetBSD: distinfo,v 1.33 2021/07/13 12:36:30 markd Exp $ SHA1 (darktable-3.0.0.tar.xz) = 468ea6cbc313ec899b448f5c9c8ce4144d5f35c7 RMD160 (darktable-3.0.0.tar.xz) = b7d1c358250a950548a01d2de9bee9f551cf5dee @@ -6,6 +6,7 @@ SHA512 (darktable-3.0.0.tar.xz) = de154c Size (darktable-3.0.0.tar.xz) = 3827412 bytes SHA1 (patch-CMakeLists.txt) = 2b2c6c0733af56e61e5be598a59644b40e8f26a6 SHA1 (patch-cmake_compiler-warnings.cmake) = b65fbb5222cca791088137e823402df6b9423121 -SHA1 (patch-src_CMakeLists.txt) = 4535599cf1d0f6aae1909bd4dc09281311e23e0c +SHA1 (patch-src_CMakeLists.txt) = cfab8ea6b70400f9d9234ddbbca9cc1ecbd6e782 SHA1 (patch-src_common_system__signal__handling.c) = 296f5618c618a9b16af2ca5a1d9ff408c437c220 +SHA1 (patch-src_imageio_format_CMakeLists.txt) = c292604a1b92262af874af6b806488ad27d9a4df SHA1 (patch-tools_noise_benchmark.sh) = 1e26ebbbc73e44ec41c092297d681f33fb55155d Index: pkgsrc/graphics/darktable/patches/patch-src_CMakeLists.txt diff -u pkgsrc/graphics/darktable/patches/patch-src_CMakeLists.txt:1.8 pkgsrc/graphics/darktable/patches/patch-src_CMakeLists.txt:1.9 --- pkgsrc/graphics/darktable/patches/patch-src_CMakeLists.txt:1.8 Tue Feb 6 12:55:52 2018 +++ pkgsrc/graphics/darktable/patches/patch-src_CMakeLists.txt Tue Jul 13 12:36:30 2021 @@ -1,11 +1,47 @@ -$NetBSD: patch-src_CMakeLists.txt,v 1.8 2018/02/06 12:55:52 jperkin Exp $ +$NetBSD: patch-src_CMakeLists.txt,v 1.9 2021/07/13 12:36:30 markd Exp $ Don't link with the C compiler, CMake's CXXABI detection may insert C++ libraries into LIBS. +fix for openexr3 --- src/CMakeLists.txt.orig 2017-05-28 14:22:21.000000000 +0000 +++ src/CMakeLists.txt -@@ -684,7 +684,7 @@ if(APPLE) +@@ -300,13 +300,18 @@ if(USE_CAMERA_SUPPORT) + endif(USE_CAMERA_SUPPORT) + + if(USE_OPENEXR) +- find_package(OpenEXR) +- if(OPENEXR_FOUND) ++ find_package(OpenEXR 3.0 CONFIG) ++ if(TARGET OpenEXR::OpenEXR) ++ set(OpenEXR_LIBRARIES OpenEXR::OpenEXR) ++ else() ++ find_package(OpenEXR) ++ endif() ++ if(OpenEXR_FOUND) + include_directories(SYSTEM ${OpenEXR_INCLUDE_DIRS}) + list(APPEND LIBS ${OpenEXR_LIBRARIES}) + add_definitions(${OpenEXR_DEFINITIONS}) + list(APPEND SOURCES "common/imageio_exr.cc") +- endif(OPENEXR_FOUND) ++ endif(OpenEXR_FOUND) + endif(USE_OPENEXR) + + if(USE_WEBP) +@@ -430,10 +435,10 @@ if(LENSFUN_FOUND) + add_definitions("-DHAVE_LENSFUN") + endif(LENSFUN_FOUND) + +-if(OPENEXR_FOUND) ++if(OpenEXR_FOUND) + add_definitions("-DHAVE_OPENEXR") + set(DT_SUPPORTED_EXTENSIONS ${DT_SUPPORTED_EXTENSIONS} j2c j2k jp2 jpc CACHE INTERNAL "") +-endif(OPENEXR_FOUND) ++endif(OpenEXR_FOUND) + + if(USE_OPENCL) + add_definitions("-DHAVE_OPENCL") +@@ -800,7 +805,7 @@ if(APPLE) set_target_properties(lib_darktable PROPERTIES MACOSX_RPATH TRUE) endif(APPLE) set_target_properties(lib_darktable PROPERTIES OUTPUT_NAME darktable) Added files: Index: pkgsrc/graphics/darktable/patches/patch-src_imageio_format_CMakeLists.txt diff -u /dev/null pkgsrc/graphics/darktable/patches/patch-src_imageio_format_CMakeLists.txt:1.1 --- /dev/null Tue Jul 13 12:36:30 2021 +++ pkgsrc/graphics/darktable/patches/patch-src_imageio_format_CMakeLists.txt Tue Jul 13 12:36:30 2021 @@ -0,0 +1,19 @@ +$NetBSD: patch-src_imageio_format_CMakeLists.txt,v 1.1 2021/07/13 12:36:30 markd Exp $ + +openexr3 fix + +--- src/imageio/format/CMakeLists.txt.orig 2019-12-21 09:57:37.000000000 +0000 ++++ src/imageio/format/CMakeLists.txt +@@ -21,10 +21,10 @@ if(WEBP_FOUND) + add_library(webp MODULE "webp.c") + endif(WEBP_FOUND) + +-if(OPENEXR_FOUND) ++if(OpenEXR_FOUND) + list(APPEND MODULES "exr") + add_library(exr MODULE "exr.cc") +-endif(OPENEXR_FOUND) ++endif(OpenEXR_FOUND) + + if(OpenJPEG_FOUND) + list(APPEND MODULES "j2k") --_----------=_162617979034470--