From owner-dev-commits-ports-main@freebsd.org Thu Apr 29 21:55:44 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F0EC86374B7; Thu, 29 Apr 2021 21:55:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FWTp86Ks0z3Jps; Thu, 29 Apr 2021 21:55:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CBA7420E52; Thu, 29 Apr 2021 21:55:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13TLtiYh028047; Thu, 29 Apr 2021 21:55:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13TLtixt028046; Thu, 29 Apr 2021 21:55:44 GMT (envelope-from git) Date: Thu, 29 Apr 2021 21:55:44 GMT Message-Id: <202104292155.13TLtixt028046@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?B?SmVhbi1Tw6liYXN0aWVuIFDDqWRyb24=?= Subject: git: 5691fad3cfe1 - main - graphics/darktable: Fix OpenEXR detection MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5691fad3cfe1cf9a573fa937d075e081c4f62cbe Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Apr 2021 21:55:45 -0000 The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/ports/commit/?id=5691fad3cfe1cf9a573fa937d075e081c4f62cbe commit 5691fad3cfe1cf9a573fa937d075e081c4f62cbe Author: Jean-Sébastien Pédron AuthorDate: 2021-04-29 21:53:56 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2021-04-29 21:55:19 +0000 graphics/darktable: Fix OpenEXR detection The patch comes from upstream: https://github.com/darktable-org/darktable/pull/8775 It didn't make it to a release yet. The package revision is bumped because the build succeeds but darktable failed to run with the following error: $ darktable --version ld-elf.so.1: /usr/local/bin/../lib/darktable/libdarktable.so: Undefined symbol "_ZTIN7Imf_3_09AttributeE" With the patch: $ darktable --version this is darktable 3.4.1 ... PR: 255254 Reported by: Ludger Bolmerg , Felix Palmen , a.parseg@gmail.com Obtained from: https://github.com/darktable-org/darktable/pull/8775 --- graphics/darktable/Makefile | 1 + graphics/darktable/files/patch-src_CMakeLists.txt | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index cb8af270a417..477bf30028c6 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -2,6 +2,7 @@ PORTNAME= darktable PORTVERSION= 3.4.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/ diff --git a/graphics/darktable/files/patch-src_CMakeLists.txt b/graphics/darktable/files/patch-src_CMakeLists.txt index d230289e19bc..b7cf7c2998b0 100644 --- a/graphics/darktable/files/patch-src_CMakeLists.txt +++ b/graphics/darktable/files/patch-src_CMakeLists.txt @@ -1,6 +1,20 @@ ---- src/CMakeLists.txt.orig 2021-02-03 13:36:49 UTC +--- src/CMakeLists.txt.orig 2021-04-29 21:04:27 UTC +++ src/CMakeLists.txt -@@ -388,7 +388,7 @@ if(USE_OPENJPEG) +@@ -321,7 +321,12 @@ if(USE_CAMERA_SUPPORT) + endif(USE_CAMERA_SUPPORT) + + if(USE_OPENEXR) +- find_package(OpenEXR) ++ 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}) +@@ -388,7 +393,7 @@ if(USE_OPENJPEG) add_definitions("-DHAVE_OPENJPEG") list(APPEND SOURCES "common/imageio_j2k.c")