author | Antonio Rojas
<arojas@archlinux.org> 2021-05-08 12:01:39 UTC |
committer | Antonio Rojas
<arojas@archlinux.org> 2021-05-08 12:01:39 UTC |
parent | f09d3e8083103e5334cd3c4e1cf9262a07d4bdd9 |
PKGBUILD | +5 | -11 |
kimageformats-openexr3.patch | +0 | -45 |
diff --git a/PKGBUILD b/PKGBUILD index 41aa886..a7a159d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=kimageformats -pkgver=5.81.0 -pkgrel=2 +pkgver=5.82.0 +pkgrel=1 pkgdesc='Image format plugins for Qt5' arch=(x86_64) url='https://community.kde.org/Frameworks' @@ -16,17 +16,11 @@ 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} - kimageformats-openexr3.patch) -sha256sums=('a332a0d708417c6e973b19d8b3aec006f3c1c57ef17851dc00e4921d7c43864e' - 'SKIP' - '23baa5e914ad13c1092beae26157784c5a44c558b463e49a044ba3670e582943') +source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz{,.sig}) +sha256sums=('3e7852b85f2a2e5d7136548747b5fd75b8c81e99c9f691bb8a168ce72bb1057d' + 'SKIP') 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 deleted file mode 100644 index 73e832c..0000000 --- a/kimageformats-openexr3.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8754b2f..6ecbb3a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -43,7 +43,10 @@ if (UNIX) - endif() - endif() - --find_package(OpenEXR) -+find_package(OpenEXR 3.0 CONFIG) -+if(NOT OpenEXR_FOUND) -+ find_package(OpenEXR) -+endif() - 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..4e59ad4 100644 ---- a/src/imageformats/CMakeLists.txt -+++ b/src/imageformats/CMakeLists.txt -@@ -58,7 +58,11 @@ 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) -+ if(TARGET OpenEXR::OpenEXR) -+ target_link_libraries(kimg_exr OpenEXR::OpenEXR) -+ else() -+ target_link_libraries(kimg_exr OpenEXR::IlmImf) -+ endif() - 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>