[arch-commits] Commit in darktable/trunk (PKGBUILD darktable-openexr3.patch)

Antonio Rojas arojas at archlinux.org
Sat Apr 24 17:30:11 UTC 2021


    Date: Saturday, April 24, 2021 @ 17:30:10
  Author: arojas
Revision: 923697

openexr 3.0 rebuild

Added:
  darktable/trunk/darktable-openexr3.patch
Modified:
  darktable/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   13 ++++++++++---
 darktable-openexr3.patch |   18 ++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-24 17:18:52 UTC (rev 923696)
+++ PKGBUILD	2021-04-24 17:30:10 UTC (rev 923697)
@@ -7,7 +7,7 @@
 pkgname=darktable
 epoch=2
 pkgver=3.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Utility to organize and develop raw images"
 arch=(x86_64)
 url="https://darktable.org"
@@ -21,11 +21,18 @@
             'ghostscript: noise profile script'
             'gnuplot: noise profile script')
 makedepends=(cmake intltool desktop-file-utils llvm clang python-jsonschema libwebp)
-source=("https://github.com/darktable-org/darktable/releases/download/release-${pkgver}/darktable-${pkgver}.tar.xz"{,.asc})
-sha256sums=('7fc3f851da9bcd7c5053ecd09f21aa3eb6103be98a6c58f52010b6f22174941e' 'SKIP')
+source=("https://github.com/darktable-org/darktable/releases/download/release-${pkgver}/darktable-${pkgver}.tar.xz"{,.asc}
+         darktable-openexr3.patch)
+sha256sums=('7fc3f851da9bcd7c5053ecd09f21aa3eb6103be98a6c58f52010b6f22174941e'
+            'SKIP'
+            '534e7e82adb5cf3c9eda81bbdf3e373879bfa72bb6cd5f865750f6c589d57f51')
 validpgpkeys=(C4CBC150699956E2A3268EF5BB5CC8295B1779C9  # darktable releases <release at darktable.org>
               F10F9686652B0E949FCD94C318DCA123F949BD3B) # Pascal Obry <pascal at obry.net>
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < darktable-openexr3.patch # Fix build with OpenEXR 3
+}
+
 build() {
     cmake -B build -S ${pkgname}-${pkgver} \
         -DCMAKE_INSTALL_PREFIX=/usr \

Added: darktable-openexr3.patch
===================================================================
--- darktable-openexr3.patch	                        (rev 0)
+++ darktable-openexr3.patch	2021-04-24 17:30:10 UTC (rev 923697)
@@ -0,0 +1,18 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 6cbeab77d..21cf6b44a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -329,7 +329,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})



More information about the arch-commits mailing list