git » kimageformats.git » commit a317dcb

openexr 3.0 rebuild

author Antonio Rojas
2021-04-23 19:03:31 UTC
committer Antonio Rojas
2021-04-23 19:03:31 UTC
parent 5c9039b86bbd9ec22f448cadecb04cec69f5f899

openexr 3.0 rebuild

PKGBUILD +9 -3
kimageformats-openexr3.patch +38 -0

diff --git a/PKGBUILD b/PKGBUILD
index 3a8dc2b..b0464e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=kimageformats
 pkgver=5.81.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Image format plugins for Qt5'
 arch=(x86_64)
 url='https://community.kde.org/Frameworks'
@@ -16,11 +16,17 @@ optdepends=('karchive: plugin for Krita and OpenRaster images'
             'openexr: EXR format support'
             'libheif: HEIF format support')
 groups=(kf5)
-source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig})
+source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig}
+         kimageformats-openexr3.patch)
 sha256sums=('a332a0d708417c6e973b19d8b3aec006f3c1c57ef17851dc00e4921d7c43864e'
-            'SKIP')
+            'SKIP'
+            '3554285f3ebf8709d7686c8ffff56b71411f752e4cd54293eba713c97bc057e9')
 validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure@kde.org>
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < kimageformats-openexr3.patch
+}
+
 build() {
   cmake -B build -S $pkgname-$pkgver \
     -DBUILD_TESTING=OFF \
diff --git a/kimageformats-openexr3.patch b/kimageformats-openexr3.patch
new file mode 100644
index 0000000..3ae080c
--- /dev/null
+++ b/kimageformats-openexr3.patch
@@ -0,0 +1,38 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8754b2f..e24b787 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,7 +43,7 @@ if (UNIX)
+     endif()
+ endif()
+ 
+-find_package(OpenEXR)
++find_package(OpenEXR CONFIG)
+ set_package_properties(OpenEXR PROPERTIES
+     TYPE OPTIONAL
+     PURPOSE "Required for the QImage plugin for OpenEXR images"
+diff --git a/src/imageformats/CMakeLists.txt b/src/imageformats/CMakeLists.txt
+index 6d41198..9a87844 100644
+--- a/src/imageformats/CMakeLists.txt
++++ b/src/imageformats/CMakeLists.txt
+@@ -58,7 +58,7 @@ install(FILES jp2.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugi
+ 
+ if(OpenEXR_FOUND)
+     kimageformats_add_plugin(kimg_exr JSON "exr.json" SOURCES exr.cpp)
+-    target_link_libraries(kimg_exr OpenEXR::IlmImf)
++    target_link_libraries(kimg_exr OpenEXR::OpenEXR)
+     kde_target_enable_exceptions(kimg_exr PRIVATE)
+ 
+     install(FILES exr.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/)
+diff --git a/src/imageformats/exr.cpp b/src/imageformats/exr.cpp
+index ea9a0d9..092d592 100644
+--- a/src/imageformats/exr.cpp
++++ b/src/imageformats/exr.cpp
+@@ -18,6 +18,7 @@
+ #include <ImfConvert.h>
+ #include <ImfFloatAttribute.h>
+ #include <ImfInputFile.h>
++#include <ImfInt64.h>
+ #include <ImfIntAttribute.h>
+ #include <ImfLineOrderAttribute.h>
+ #include <ImfRgbaFile.h>