[pkgsrc/trunk]: pkgsrc/graphics/krita krita: patches for openexr3

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4086c6cdaecd
branches:  trunk
changeset: 455866:4086c6cdaecd
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Jul 13 11:28:27 2021 +0000

description:
krita: patches for openexr3

diffstat:

 graphics/krita/Makefile                                                     |   4 +-
 graphics/krita/distinfo                                                     |  10 ++-
 graphics/krita/patches/patch-CMakeLists.txt                                 |  30 +++++++++
 graphics/krita/patches/patch-libs_image_CMakeLists.txt                      |  15 ++++
 graphics/krita/patches/patch-libs_pigment_CMakeLists.txt                    |  15 ++++
 graphics/krita/patches/patch-plugins_color_lcms2engine_CMakeLists.txt       |  33 ++++++++++
 graphics/krita/patches/patch-plugins_color_lcms2engine_tests_CMakeLists.txt |  15 ++++
 graphics/krita/patches/patch-plugins_impex_CMakeLists.txt                   |  15 ++++
 graphics/krita/patches/patch-plugins_impex_exr_exr__converter.cc            |  15 ++++
 graphics/krita/patches/patch-plugins_impex_raw_CMakeLists.txt               |  14 ++++
 10 files changed, 163 insertions(+), 3 deletions(-)

diffs (218 lines):

diff -r e2e7dcf579eb -r 4086c6cdaecd graphics/krita/Makefile
--- a/graphics/krita/Makefile   Tue Jul 13 10:12:16 2021 +0000
+++ b/graphics/krita/Makefile   Tue Jul 13 11:28:27 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2021/06/10 11:06:22 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2021/07/13 11:28:27 markd Exp $
 
 DISTNAME=              krita-4.4.3
-PKGREVISION=           9
+PKGREVISION=           10
 CATEGORIES=            graphics kde
 MASTER_SITES=          ${MASTER_SITE_KDE:=krita/${PKGVERSION_NOREV}/}
 
diff -r e2e7dcf579eb -r 4086c6cdaecd graphics/krita/distinfo
--- a/graphics/krita/distinfo   Tue Jul 13 10:12:16 2021 +0000
+++ b/graphics/krita/distinfo   Tue Jul 13 11:28:27 2021 +0000
@@ -1,8 +1,16 @@
-$NetBSD: distinfo,v 1.10 2021/04/05 10:53:38 ryoon Exp $
+$NetBSD: distinfo,v 1.11 2021/07/13 11:28:27 markd Exp $
 
 SHA1 (krita-4.4.3.tar.gz) = 55aee39c931503cf44c881d18926d70bdb59dd78
 RMD160 (krita-4.4.3.tar.gz) = 627a984e7b78a45b03b48e526d04c666ccb2f8d6
 SHA512 (krita-4.4.3.tar.gz) = 44052f5bc02c31b8e5eb7990192c1b1d6a4ca9d91117b0b8e9ddf794df83cfdde233754064ad6692516bc8d756871bf4b34190653f04956cb851333b8d15645f
 Size (krita-4.4.3.tar.gz) = 254855083 bytes
+SHA1 (patch-CMakeLists.txt) = 6cc4be72fbfe76dd66b34c14a10a6ed20695ab65
 SHA1 (patch-krita_data_CMakeLists.txt) = bc0a37c1a60a2e0702c4a87b70ae0abf8359cc45
+SHA1 (patch-libs_image_CMakeLists.txt) = 42d0c1777f54aadeab4462b0f576a14e9c627146
+SHA1 (patch-libs_pigment_CMakeLists.txt) = c5c95326b6090f152ee54e8e7e629bf1df043fae
+SHA1 (patch-plugins_color_lcms2engine_CMakeLists.txt) = 5b9a84c2db4f7c5f5876b60061a0950be484ac84
+SHA1 (patch-plugins_color_lcms2engine_tests_CMakeLists.txt) = aec29d538aef1247c9ac69c60d965677c1c16a96
+SHA1 (patch-plugins_impex_CMakeLists.txt) = 95e6fe736e2c2151a6ad4b5ef490c0777ca098fa
+SHA1 (patch-plugins_impex_exr_exr__converter.cc) = 1bfcbdea7f748900f48c5e070d7f5d5984a9b3bf
+SHA1 (patch-plugins_impex_raw_CMakeLists.txt) = 3a94be6cb488fb8b8b2667dfb7a9b0dfa4496ef5
 SHA1 (patch-xcftools.h) = eeeed207e9b1995999a16efbbae91ed8f6255f48
diff -r e2e7dcf579eb -r 4086c6cdaecd graphics/krita/patches/patch-CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/krita/patches/patch-CMakeLists.txt       Tue Jul 13 11:28:27 2021 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-CMakeLists.txt,v 1.3 2021/07/13 11:28:28 markd Exp $
+
+openexr3 fix
+
+--- CMakeLists.txt.orig        2021-07-13 10:34:50.577803948 +0000
++++ CMakeLists.txt
+@@ -623,15 +623,20 @@ set_package_properties(ZLIB PROPERTIES
+     PURPOSE "Optionally used by the G'Mic and the PSD plugins")
+ macro_bool_to_01(ZLIB_FOUND HAVE_ZLIB)
+ 
+-find_package(OpenEXR)
++find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    find_package(OpenEXR)
++endif()
+ set_package_properties(OpenEXR PROPERTIES
+     DESCRIPTION "High dynamic-range (HDR) image file format"
+     URL "https://www.openexr.com";
+     TYPE OPTIONAL
+     PURPOSE "Required by the Krita OpenEXR filter")
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
diff -r e2e7dcf579eb -r 4086c6cdaecd graphics/krita/patches/patch-libs_image_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/krita/patches/patch-libs_image_CMakeLists.txt    Tue Jul 13 11:28:27 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-libs_image_CMakeLists.txt,v 1.1 2021/07/13 11:28:28 markd Exp $
+
+openexr3 fix
+
+--- libs/image/CMakeLists.txt.orig     2021-03-22 10:06:59.000000000 +0000
++++ libs/image/CMakeLists.txt
+@@ -360,7 +360,7 @@ if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
+     endif()
+ endif()
+ 
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+   target_link_libraries(kritaimage PUBLIC ${OPENEXR_LIBRARIES})
+ endif()
+ 
diff -r e2e7dcf579eb -r 4086c6cdaecd graphics/krita/patches/patch-libs_pigment_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/krita/patches/patch-libs_pigment_CMakeLists.txt  Tue Jul 13 11:28:27 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-libs_pigment_CMakeLists.txt,v 1.1 2021/07/13 11:28:28 markd Exp $
+
+openexr3 fix
+
+--- libs/pigment/CMakeLists.txt.orig   2021-03-22 10:06:59.000000000 +0000
++++ libs/pigment/CMakeLists.txt
+@@ -14,7 +14,7 @@ include_directories(
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
diff -r e2e7dcf579eb -r 4086c6cdaecd graphics/krita/patches/patch-plugins_color_lcms2engine_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/krita/patches/patch-plugins_color_lcms2engine_CMakeLists.txt     Tue Jul 13 11:28:27 2021 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-plugins_color_lcms2engine_CMakeLists.txt,v 1.1 2021/07/13 11:28:28 markd Exp $
+
+openexr3 fix
+
+--- plugins/color/lcms2engine/CMakeLists.txt.orig      2021-03-22 10:06:59.000000000 +0000
++++ plugins/color/lcms2engine/CMakeLists.txt
+@@ -28,7 +28,7 @@ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -38,7 +38,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -77,7 +77,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
diff -r e2e7dcf579eb -r 4086c6cdaecd graphics/krita/patches/patch-plugins_color_lcms2engine_tests_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/krita/patches/patch-plugins_color_lcms2engine_tests_CMakeLists.txt       Tue Jul 13 11:28:27 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_color_lcms2engine_tests_CMakeLists.txt,v 1.1 2021/07/13 11:28:28 markd Exp $
+
+openexr3 fix
+
+--- plugins/color/lcms2engine/tests/CMakeLists.txt.orig        2021-03-22 10:06:59.000000000 +0000
++++ plugins/color/lcms2engine/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS})
+ endif()
+ include_directories( ${LCMS2_INCLUDE_DIR} )
diff -r e2e7dcf579eb -r 4086c6cdaecd graphics/krita/patches/patch-plugins_impex_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/krita/patches/patch-plugins_impex_CMakeLists.txt Tue Jul 13 11:28:27 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_impex_CMakeLists.txt,v 1.1 2021/07/13 11:28:28 markd Exp $
+
+openexr3 fix
+
+--- plugins/impex/CMakeLists.txt.orig  2021-03-22 10:06:59.000000000 +0000
++++ plugins/impex/CMakeLists.txt
+@@ -19,7 +19,7 @@ if(PNG_FOUND)
+     add_subdirectory(csv)
+ endif()
+ 
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     add_subdirectory(exr)
+ endif()
+ 
diff -r e2e7dcf579eb -r 4086c6cdaecd graphics/krita/patches/patch-plugins_impex_exr_exr__converter.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/krita/patches/patch-plugins_impex_exr_exr__converter.cc  Tue Jul 13 11:28:27 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_impex_exr_exr__converter.cc,v 1.1 2021/07/13 11:28:28 markd Exp $
+
+openexr3 fix
+
+--- plugins/impex/exr/exr_converter.cc.orig    2021-03-22 10:06:59.000000000 +0000
++++ plugins/impex/exr/exr_converter.cc
+@@ -24,6 +24,8 @@
+ 
+ #include <ImfAttribute.h>
+ #include <ImfChannelList.h>
++#include <ImfFrameBuffer.h>
++#include <ImfHeader.h>
+ #include <ImfInputFile.h>
+ #include <ImfOutputFile.h>
+ 
diff -r e2e7dcf579eb -r 4086c6cdaecd graphics/krita/patches/patch-plugins_impex_raw_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/krita/patches/patch-plugins_impex_raw_CMakeLists.txt     Tue Jul 13 11:28:27 2021 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_impex_raw_CMakeLists.txt,v 1.1 2021/07/13 11:28:28 markd Exp $
+
+openexr3 fix
+
+--- plugins/impex/raw/CMakeLists.txt.orig      2021-03-22 10:06:59.000000000 +0000
++++ plugins/impex/raw/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ add_subdirectory(tests)
+ 
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+       include_directories(${OPENEXR_INCLUDE_DIRS})
+ endif()
+ include_directories(${LibRaw_INCLUDE_DIR})