File Support-building-with-OpenEXR-3.patch of Package kdebase4-runtime
From 80b3335302a790803999a501b0c5cce8ba0d6177 Mon Sep 17 00:00:00 2001
From: Antonio Rojas <arojas@archlinux.org>
Date: Fri, 23 Apr 2021 22:16:11 +0200
Subject: [PATCH] Support building with OpenEXR 3
Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
---
thumbnail/CMakeLists.txt | 13 ++++++++++---
thumbnail/exrcreator.cpp | 1 +
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/kioslave/thumbnail/CMakeLists.txt b/kioslave/thumbnail/CMakeLists.txt
index a26f4e3f..1d77db06 100644
--- a/kioslave/thumbnail/CMakeLists.txt
+++ b/kioslave/thumbnail/CMakeLists.txt
@@ -1,4 +1,7 @@
-macro_optional_find_package(OpenEXR)
+find_package(OpenEXR 3.0 CONFIG QUIET)
+if(NOT OpenEXR_FOUND)
+ macro_optional_find_package(OpenEXR)
+endif()
set_package_properties(OpenEXR PROPERTIES DESCRIPTION "API for accessing OpenEXR formatted images"
URL "http://www.openexr.com"
TYPE OPTIONAL
@@ -115,13 +118,17 @@
if(OPENEXR_FOUND)
- include_directories( ${OPENEXR_INCLUDE_DIR})
-
set(exrthumbnail_PART_SRCS exrcreator.cpp)
kde4_add_plugin(exrthumbnail ${exrthumbnail_PART_SRCS})
- target_link_libraries(exrthumbnail ${KDE4_KIO_LIBS} ${OPENEXR_LIBRARIES})
+ target_link_libraries(exrthumbnail ${KDE4_KIO_LIBS})
+ if(TARGET OpenEXR::OpenEXR)
+ target_link_libraries(exrthumbnail OpenEXR::OpenEXR)
+ else()
+ include_directories( ${OPENEXR_INCLUDE_DIR})
+ target_link_libraries(exrthumbnail ${OPENEXR_LIBRARIES})
+ endif()
# OpenEXR headers use exceptions; at least clang refuses to build the target
# when exceptions are not enabled.
diff --git a/kioslave/thumbnail/exrcreator.cpp b/kioslave/thumbnail/exrcreator.cpp
index 0e8eced2..c4daf0b1 100644
--- a/kioslave/thumbnail/exrcreator.cpp
+++ b/kioslave/thumbnail/exrcreator.cpp
@@ -26,6 +26,7 @@
#include <kglobal.h>
#include <QFile>
+#include <ImfHeader.h>
#include <ImfInputFile.h>
#include <ImfPreviewImage.h>
--
GitLab