diff --git a/media-gfx/krita/krita-4.4.2.recipe b/media-gfx/krita/krita-4.4.2.recipe index 1c855a56e..b6103086b 100644 --- a/media-gfx/krita/krita-4.4.2.recipe +++ b/media-gfx/krita/krita-4.4.2.recipe @@ -6,11 +6,12 @@ layers and masks, group-based layer management, vector artwork support and switc HOMEPAGE="https://www.krita.org/" COPYRIGHT="2010-2020 KDE Organisation" LICENSE="GNU LGPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://download.kde.org/stable/krita/$portVersion/krita-$portVersion.tar.gz" CHECKSUM_SHA256="9696aec56e759f3e1c22952ca17efdcac97003239f515f570ad9f07e36cb9792" SOURCE_DIR="krita-$portVersion" -PATCHES="krita-$portVersion.patchset" +PATCHES="krita-$portVersion.patchset + krita-openexr3.patch" ADDITIONAL_FILES=" krita.rdef.in icons.zip @@ -31,12 +32,10 @@ REQUIRES=" lib:libfftw3$secondaryArchSuffix lib:libgif$secondaryArchSuffix >= 7 lib:libgsl$secondaryArchSuffix - lib:libhalf_2_5$secondaryArchSuffix lib:libiconv$secondaryArchSuffix - lib:libiex_2_5$secondaryArchSuffix - lib:libilmimf_2_5$secondaryArchSuffix - lib:libilmthread_2_5$secondaryArchSuffix - lib:libimath_2_5$secondaryArchSuffix + lib:libIex_3_0$secondaryArchSuffix + lib:libIlmThread_3_0$secondaryArchSuffix + lib:libImath_3_0$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libKF5Archive$secondaryArchSuffix lib:libKF5Auth$secondaryArchSuffix @@ -69,7 +68,9 @@ REQUIRES=" lib:libKF5WindowSystem$secondaryArchSuffix lib:libKF5XmlGui$secondaryArchSuffix lib:liblcms2$secondaryArchSuffix - lib:libopencolorio$secondaryArchSuffix + lib:libOpenColorIO$secondaryArchSuffix + lib:libOpenEXR_3_0$secondaryArchSuffix + lib:libOpenEXRUtil_3_0$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libpoppler_qt5$secondaryArchSuffix lib:libQt5Concurrent$secondaryArchSuffix @@ -90,15 +91,16 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix >= 5.77 devel:eigen$secondaryArchSuffix - devel:libboost_system$secondaryArchSuffix >= 1.69 + devel:libboost_system$secondaryArchSuffix >= 1.70.0 devel:libexiv2$secondaryArchSuffix devel:libexpat$secondaryArchSuffix devel:libfftw3$secondaryArchSuffix devel:libgif$secondaryArchSuffix >= 7 devel:libgsl$secondaryArchSuffix - devel:libhalf_2_5$secondaryArchSuffix devel:libiconv$secondaryArchSuffix - devel:libilmimf_2_5$secondaryArchSuffix + devel:libIex_3_0$secondaryArchSuffix + devel:libIlmThread_3_0$secondaryArchSuffix + devel:libImath_3_0$secondaryArchSuffix devel:libKF5Archive$secondaryArchSuffix devel:libKF5Auth$secondaryArchSuffix devel:libKF5Bookmarks$secondaryArchSuffix @@ -130,7 +132,9 @@ BUILD_REQUIRES=" devel:libKF5WindowSystem$secondaryArchSuffix devel:libKF5XmlGui$secondaryArchSuffix devel:liblcms2$secondaryArchSuffix - devel:libopencolorio$secondaryArchSuffix + devel:libOpenColorIO$secondaryArchSuffix + devel:libOpenEXR_3_0$secondaryArchSuffix + devel:libOpenEXRUtil_3_0$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libpoppler_qt5$secondaryArchSuffix >= 1.26 devel:libQt5Core$secondaryArchSuffix >= 5.15 diff --git a/media-gfx/krita/patches/krita-openexr3.patch b/media-gfx/krita/patches/krita-openexr3.patch new file mode 100644 index 000000000..31efb8308 --- /dev/null +++ b/media-gfx/krita/patches/krita-openexr3.patch @@ -0,0 +1,136 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4e8f456492..9a3ae863ec 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -649,15 +649,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 --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt +index e9ff363df3..59e567fa04 100644 +--- a/libs/image/CMakeLists.txt ++++ b/libs/image/CMakeLists.txt +@@ -367,7 +367,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 --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt +index 3e8bcf9e25..d55fd8714f 100644 +--- a/libs/pigment/CMakeLists.txt ++++ b/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 --git a/plugins/color/lcms2engine/CMakeLists.txt b/plugins/color/lcms2engine/CMakeLists.txt +index 86b83710dc..801783c1f3 100644 +--- a/plugins/color/lcms2engine/CMakeLists.txt ++++ b/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 --git a/plugins/color/lcms2engine/tests/CMakeLists.txt b/plugins/color/lcms2engine/tests/CMakeLists.txt +index ae69220698..8c5fe5d061 100644 +--- a/plugins/color/lcms2engine/tests/CMakeLists.txt ++++ b/plugins/color/lcms2engine/tests/CMakeLists.txt +@@ -11,7 +11,7 @@ include_directories( ../colorspaces/cmyk_u16 + ../colorprofiles + .. + ) +-if(OPENEXR_FOUND) ++if(OpenEXR_FOUND) + include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS}) + endif() + include_directories( ${LCMS2_INCLUDE_DIR} ) +diff --git a/plugins/impex/CMakeLists.txt b/plugins/impex/CMakeLists.txt +index 63df1fd69a..c94674b381 100644 +--- a/plugins/impex/CMakeLists.txt ++++ b/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 --git a/plugins/impex/exr/exr_converter.cc b/plugins/impex/exr/exr_converter.cc +index f63ab73cd9..d620062594 100644 +--- a/plugins/impex/exr/exr_converter.cc ++++ b/plugins/impex/exr/exr_converter.cc +@@ -11,6 +11,8 @@ + + #include + #include ++#include ++#include + #include + #include + +diff --git a/plugins/impex/raw/CMakeLists.txt b/plugins/impex/raw/CMakeLists.txt +index 71cb5b355c..f65bc770a5 100644 +--- a/plugins/impex/raw/CMakeLists.txt ++++ b/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})