diff options
| author | Jean-Sébastien Pédron <dumbbell@FreeBSD.org> | 2021-04-29 21:53:56 +0000 |
|---|---|---|
| committer | Jean-Sébastien Pédron <dumbbell@FreeBSD.org> | 2021-04-29 21:55:19 +0000 |
| commit | 5691fad3cfe1cf9a573fa937d075e081c4f62cbe (patch) | |
| tree | 2d1505ddc2ecc65f043c683855b49220feee7c03 | |
| parent | 8ae8fae1508f7dcacd0bca0a796d4480b18b5376 (diff) | |
| download | ports-5691fad3cfe1cf9a573fa937d075e081c4f62cbe.tar.gz ports-5691fad3cfe1cf9a573fa937d075e081c4f62cbe.zip | |
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 <lbolmerg@posteo.de>,
Felix Palmen <felix@palmen-it.de>,
a.parseg@gmail.com
Obtained from: https://github.com/darktable-org/darktable/pull/8775
| -rw-r--r-- | graphics/darktable/Makefile | 1 | ||||
| -rw-r--r-- | 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") |