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

[Antonio Rojas]

    Date: Friday, April 23, 2021 @ 19:34:17
  Author: arojas
Revision: 413785

Updated patch

Modified:
  kimageformats/trunk/PKGBUILD
  kimageformats/trunk/kimageformats-openexr3.patch

------------------------------+
 PKGBUILD                     |    2 +-
 kimageformats-openexr3.patch |   19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-23 19:03:49 UTC (rev 413784)
+++ PKGBUILD	2021-04-23 19:34:17 UTC (rev 413785)
@@ -20,7 +20,7 @@
          kimageformats-openexr3.patch)
 sha256sums=('a332a0d708417c6e973b19d8b3aec006f3c1c57ef17851dc00e4921d7c43864e'
             'SKIP'
-            '3554285f3ebf8709d7686c8ffff56b71411f752e4cd54293eba713c97bc057e9')
+            '23baa5e914ad13c1092beae26157784c5a44c558b463e49a044ba3670e582943')
 validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
 
 prepare() {

Modified: kimageformats-openexr3.patch
===================================================================
--- kimageformats-openexr3.patch	2021-04-23 19:03:49 UTC (rev 413784)
+++ kimageformats-openexr3.patch	2021-04-23 19:34:17 UTC (rev 413785)
@@ -1,26 +1,33 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8754b2f..e24b787 100644
+index 8754b2f..6ecbb3a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -43,7 +43,7 @@ if (UNIX)
+@@ -43,7 +43,10 @@ if (UNIX)
      endif()
  endif()
  
 -find_package(OpenEXR)
-+find_package(OpenEXR CONFIG)
++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..9a87844 100644
+index 6d41198..4e59ad4 100644
 --- a/src/imageformats/CMakeLists.txt
 +++ b/src/imageformats/CMakeLists.txt
-@@ -58,7 +58,7 @@ install(FILES jp2.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugi
+@@ -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)
-+    target_link_libraries(kimg_exr OpenEXR::OpenEXR)
++    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/)