Git commit 2a586e72a8d93d682711f42cfe33eb8d9081cffd by L. E. Segovia. Committed on 26/10/2020 at 13:25. Pushed by lsegovia into branch 'master'. Upgrade GMic to 2.9.2 This commit also upgrades related dependencies: - OpenEXR to 2.5.3; previous versions have a broken pkg-config file, which makes it unlocatable by GMic-Qt. - ilmbase is now dropped, as it is bundled by OpenEXR. - fftw3 has now threads enabled on Linux; it is a required library by GMic. I also cleaned up OpenEXR patches, as they have been upstreamed. GMic patches related to threading were removed (see above), and the desktop entry patch was updated to match the new source. BUG:412617 CCMAIL:kimageshop@kde.org M +0 -1 3rdparty/CMakeLists.txt M +0 -1 3rdparty/README.md M +1 -1 3rdparty/ext_fftw3/CMakeLists.txt A +41 -0 3rdparty/ext_gmic/0001-Add-desktop-entry.patch M +8 -14 3rdparty/ext_gmic/CMakeLists.txt D +0 -13 3rdparty/ext_gmic/cmake.diff D +0 -76 3rdparty/ext_gmic/desktop_icon.diff D +0 -22 3rdparty/ext_gmic/gmic-qt-cmake.diff D +0 -13 3rdparty/ext_gmic/no_threads.diff D +0 -22 3rdparty/ext_ilmbase/CMakeLists.txt M +7 -14 3rdparty/ext_openexr/CMakeLists.txt D +0 -13 3rdparty/ext_openexr/exr_symlink.diff D +0 -20 3rdparty/ext_openexr/openexr.diff D +0 -31 3rdparty/ext_openexr/patch_mingw.patch D +0 -13 3rdparty/ext_openexr/symlink.patch M +1 -1 build-tools/windows/build.cmd M +0 -1 krita/data/aboutdata/libraries.txt M +0 -3 packaging/macos/osxbuild.sh https://invent.kde.org/graphics/krita/commit/2a586e72a8d93d682711f42cfe33eb= 8d9081cffd diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index e54ceb58e5..000db1bddc 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -202,7 +202,6 @@ add_subdirectory( ext_png ) add_subdirectory( ext_eigen3 ) add_subdirectory( ext_expat ) # for exiv2 add_subdirectory( ext_exiv2 ) -add_subdirectory( ext_ilmbase ) add_subdirectory( ext_lcms2 ) add_subdirectory( ext_openexr ) add_subdirectory( ext_openssl ) diff --git a/3rdparty/README.md b/3rdparty/README.md index b0acc80f6c..5625a52b3c 100644 --- a/3rdparty/README.md +++ b/3rdparty/README.md @@ -143,7 +143,6 @@ THIS IS ALSO NEEDED IF YOU USE THE build.cmd script. cmake --build . --config RelWithDebInfo --target ext_eigen3 cmake --build . --config RelWithDebInfo --target ext_exiv2 cmake --build . --config RelWithDebInfo --target ext_fftw3 - cmake --build . --config RelWithDebInfo --target ext_ilmbase cmake --build . --config RelWithDebInfo --target ext_jpeg cmake --build . --config RelWithDebInfo --target ext_lcms2 cmake --build . --config RelWithDebInfo --target ext_ocio diff --git a/3rdparty/ext_fftw3/CMakeLists.txt b/3rdparty/ext_fftw3/CMakeLi= sts.txt index 848e1f87a8..b15f8fe1ed 100644 --- a/3rdparty/ext_fftw3/CMakeLists.txt +++ b/3rdparty/ext_fftw3/CMakeLists.txt @@ -22,7 +22,7 @@ ExternalProject_Add( ext_fftw3 PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/= patch_mingw.patch = INSTALL_DIR ${PREFIX_ext_fftw3} - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=3D${PREFIX_ext_fftw3} -DCMAKE_BU= ILD_TYPE=3D${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -ENABLE_SSE=3DON -ENABLE_= SSE2=3DON -DBUILD_TESTS=3DOFF + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=3D${PREFIX_ext_fftw3} -DCMAKE_BU= ILD_TYPE=3D${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -ENABLE_SSE=3DON -ENABLE_= SSE2=3DON -DBUILD_TESTS=3DOFF -DENABLE_THREADS=3DON = UPDATE_COMMAND "" ) diff --git a/3rdparty/ext_gmic/0001-Add-desktop-entry.patch b/3rdparty/ext_= gmic/0001-Add-desktop-entry.patch new file mode 100644 index 0000000000..da50ef0f8f --- /dev/null +++ b/3rdparty/ext_gmic/0001-Add-desktop-entry.patch @@ -0,0 +1,41 @@ +From 9de5fddef1dc023e7cd76c2240dc0008fcb9a76c Mon Sep 17 00:00:00 2001 +From: "L. E. Segovia" +Date: Thu, 22 Oct 2020 22:11:08 +0000 +Subject: [PATCH] Add desktop entry + +--- + CMakeLists.txt | 1 + + gmic_krita_qt.desktop | 9 +++++++++ + 2 files changed, 10 insertions(+) + create mode 100644 gmic_krita_qt.desktop + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 32506b7..60c5123 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -532,6 +532,7 @@ elseif (${GMIC_QT_HOST} STREQUAL "krita") + ${gmic_qt_LIBRARIES} + ) + install(TARGETS gmic_krita_qt RUNTIME DESTINATION bin) ++ install(FILES gmic_krita_qt.desktop DESTINATION ${CMAKE_INSTALL_PREFI= X}/bin OPTIONAL) + = + elseif (${GMIC_QT_HOST} STREQUAL "none") + = +diff --git a/gmic_krita_qt.desktop b/gmic_krita_qt.desktop +new file mode 100644 +index 0000000..579d427 +--- /dev/null ++++ b/gmic_krita_qt.desktop +@@ -0,0 +1,9 @@ ++[Desktop Entry] ++Name=3Dgmic_krita_qt ++Exec=3Dgmic_krita_qt ++GenericName=3DG'Mic plugin for Krita ++Comment=3DG'Mic plugin for Krita ++Type=3DApplication ++Icon=3Dgmic_krita_qt ++Categories=3DQt;KDE;Graphics; ++StartupNotify=3Dfalse +-- = +2.28.0 + diff --git a/3rdparty/ext_gmic/CMakeLists.txt b/3rdparty/ext_gmic/CMakeList= s.txt index 3a50d4205b..b8bbf7e2c4 100644 --- a/3rdparty/ext_gmic/CMakeLists.txt +++ b/3rdparty/ext_gmic/CMakeLists.txt @@ -3,16 +3,12 @@ SET(PREFIX_ext_gmic "${EXTPREFIX}" ) # Download the gmic sources ExternalProject_Add( ext_gmic_base DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL https://gmic.eu/files/source/gmic_2.7.1.tar.gz - URL_MD5 11a947bb2fc1dfdd40995982c5c448eb - - PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/cmak= e.diff - COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/no_= threads.diff + URL https://gmic.eu/files/source/gmic_2.9.2.tar.gz + URL_HASH SHA256=3D385db1ef3ef5805bc7bcb65255e188e349fc5e0ae35687b1b914= 291212bc4c91 = SOURCE_DIR gmic = - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=3D${PREFIX_ext_gmic} -D -DCMAKE_BUIL= D_TYPE=3DRelease ${GLOBAL_PROFILE} - + CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" = @@ -20,22 +16,20 @@ ExternalProject_Add( ext_gmic_base ) = # Download and build gmic-qt -# FIXME: Forcing CMAKE_BUILD_TYPE to Release ExternalProject_Add( ext_gmic_qt DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL https://github.com/c-koi/gmic-qt/archive/v.2.7.0.tar.gz - URL_MD5 b18577dfd5be0311bdad7737b56386dc - PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/desk= top_icon.diff - COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/gmi= c-qt-cmake.diff + URL https://github.com/c-koi/gmic-qt/archive/v.2.9.2.tar.gz + URL_HASH SHA256=3D50b401f999ddaff7ef86657ef115a7bfa844e9c465c8a7e878dd= 5b6b8bba99be + PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/0001= -Add-desktop-entry.patch = SOURCE_DIR gmic-qt INSTALL_DIR ${PREFIX_ext_gmic} = - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=3D${PREFIX_ext_gmic} -DGMIC_QT_HOST= =3Dkrita -DCMAKE_BUILD_TYPE=3DRelease ${GLOBAL_PROFILE} + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=3D${PREFIX_ext_gmic} -DGMIC_QT_HOST= =3Dkrita -DCMAKE_BUILD_TYPE=3D${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} = UPDATE_COMMAND "" = - DEPENDS ext_gmic_base + DEPENDS ext_gmic_base ext_fftw3 ) = add_custom_target(ext_gmic) diff --git a/3rdparty/ext_gmic/cmake.diff b/3rdparty/ext_gmic/cmake.diff deleted file mode 100644 index 888c064e0f..0000000000 --- a/3rdparty/ext_gmic/cmake.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dd8ecb8..be0c1c7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -53,7 +53,7 @@ - # knowledge of the CeCILL and CeCILL-C licenses and that you accept its = terms. - # - = --cmake_minimum_required(VERSION 3.8) -+cmake_minimum_required(VERSION 3.5) - cmake_policy(SET CMP0046 OLD) - = - if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR) diff --git a/3rdparty/ext_gmic/desktop_icon.diff b/3rdparty/ext_gmic/deskto= p_icon.diff deleted file mode 100644 index 7d58b215b6..0000000000 --- a/3rdparty/ext_gmic/desktop_icon.diff +++ /dev/null @@ -1,76 +0,0 @@ -From f05b7865bb29479281f9d6613841d4613f2d62ff Mon Sep 17 00:00:00 2001 -From: Boudewijn Rempt -Date: Fri, 16 Feb 2018 13:22:29 +0100 -Subject: [PATCH] ... - ---- - CMakeLists.txt | 11 ++++------- - gmic_krita_qt.desktop | 9 +++++++++ - 2 files changed, 13 insertions(+), 7 deletions(-) - create mode 100644 gmic_krita_qt.desktop - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c63b434..59a906c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -75,10 +75,6 @@ if (NOT(${GMIC_VERSION} EQUAL ${CIMG_VERSION})) - message(FATAL_ERROR "\nVersion numbers of files 'gmic.h' (" ${GMIC_VERS= ION} ") and 'CImg.h' ("${CIMG_VERSION} ") mismatch") - endif() - = -- -- -- -- - option(PRERELEASE "Set to ON makes this a prelease build") - if (${PRERELEASE}) - string(TIMESTAMP PRERELEASE_DATE %y%m%d) -@@ -91,8 +87,6 @@ if (${DRMINGW}) - add_definitions(-DDRMINGW) - endif() - = -- -- - # Required packages - = - # -@@ -427,7 +421,6 @@ qt5_add_translation(gmic_qt_QM - translations/zh.ts - ) - = --install(FILES ${gmic_qt_QM} DESTINATION ${CMAKE_SOURCE_DIR}/translations) - = - set(gmic_qt_QRC - gmic_qt.qrc -@@ -461,6 +454,9 @@ elseif (${GMIC_QT_HOST} STREQUAL "krita") - ${gmic_qt_LIBRARIES} - ) - = -+ install(TARGETS gmic_krita_qt RUNTIME DESTINATION ${CMAKE_INSTALL_PR= EFIX}/bin) -+ install(FILES gmic_krita_qt.desktop DESTINATION ${CMAKE_INSTALL_PREFI= X}/bin OPTIONAL) -+ - elseif (${GMIC_QT_HOST} STREQUAL "none") - = - set (gmic_qt_SRCS ${gmic_qt_SRCS} src/Host/None/host_none.cpp src/Hos= t/None/ImageDialog.h src/Host/None/ImageDialog.cpp) -@@ -473,3 +469,4 @@ else() - endif() - = - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) -+ -diff --git a/gmic_krita_qt.desktop b/gmic_krita_qt.desktop -new file mode 100644 -index 0000000..579d427 ---- /dev/null -+++ b/gmic_krita_qt.desktop -@@ -0,0 +1,9 @@ -+[Desktop Entry] -+Name=3Dgmic_krita_qt -+Exec=3Dgmic_krita_qt -+GenericName=3DG'Mic plugin for Krita -+Comment=3DG'Mic plugin for Krita -+Type=3DApplication -+Icon=3Dgmic_krita_qt -+Categories=3DQt;KDE;Graphics; -+StartupNotify=3Dfalse --- = -2.12.3 - diff --git a/3rdparty/ext_gmic/gmic-qt-cmake.diff b/3rdparty/ext_gmic/gmic-= qt-cmake.diff deleted file mode 100644 index b703c7cae8..0000000000 --- a/3rdparty/ext_gmic/gmic-qt-cmake.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9da4953..4fd8c7b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -272,7 +272,7 @@ set (gmic_qt_SRCS - src/FilterParameters/ChoiceParameter.h - src/FilterParameters/ColorParameter.h - src/FilterParameters/ConstParameter.h -- src/FilterParameters/CustomDoubleSpinbox.h -+ src/FilterParameters/CustomDoubleSpinBox.h - src/FilterParameters/FileParameter.h - src/FilterParameters/FilterParametersWidget.h - src/FilterParameters/FloatParameter.h -@@ -344,7 +344,7 @@ set (gmic_qt_SRCS - src/FilterParameters/ChoiceParameter.cpp - src/FilterParameters/ColorParameter.cpp - src/FilterParameters/ConstParameter.cpp -- src/FilterParameters/CustomDoubleSpinbox.cpp -+ src/FilterParameters/CustomDoubleSpinBox.cpp - src/FilterParameters/FileParameter.cpp - src/FilterParameters/FilterParametersWidget.cpp - src/FilterParameters/FloatParameter.cpp diff --git a/3rdparty/ext_gmic/no_threads.diff b/3rdparty/ext_gmic/no_threa= ds.diff deleted file mode 100644 index 916ddc4391..0000000000 --- a/3rdparty/ext_gmic/no_threads.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/CImg.h b/src/CImg.h -index 6fe7455..a1450f4 100644 ---- a/src/CImg.h -+++ b/src/CImg.h -@@ -3194,7 +3194,7 @@ namespace cimg_library_suffixed { - #if defined(cimg_use_fftw3) - struct FFTW3_info { - FFTW3_info() { -- fftw_init_threads(); -+ //fftw_init_threads(); - } - }; // struct FFTW3_info { ... - static FFTW3_info _FFTW3_info; diff --git a/3rdparty/ext_ilmbase/CMakeLists.txt b/3rdparty/ext_ilmbase/CMa= keLists.txt deleted file mode 100644 index 416511bb6c..0000000000 --- a/3rdparty/ext_ilmbase/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -SET(PREFIX_ext_ilmbase "${EXTPREFIX}" ) -ExternalProject_Add( ext_ilmbase - DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL https://github.com/openexr/openexr/releases/download/v2.3.0/il= mbase-2.3.0.tar.gz - URL_MD5 354bf86de3b930ab87ac63619d60c860 - - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=3D${PREFIX_ext_ilmbase} -DCMAKE_= BUILD_TYPE=3D${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DNAMESPACE_VERSIONING= =3DOFF - - UPDATE_COMMAND "" -) -if (MINGW) - ExternalProject_Add_Step( - ext_ilmbase - post_install - #COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/lib= Half.dll ${PREFIX_ext_ilmbase}/bin/libHalf.dll - #COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/lib= Iex.dll ${PREFIX_ext_ilmbase}/bin/libIex.dll - #COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/lib= Imath.dll ${PREFIX_ext_ilmbase}/bin/libImath.dll - #COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/lib= IlmThread.dll ${PREFIX_ext_ilmbase}/bin/libIlmThread.dll - #COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/lib= IexMath.dll ${PREFIX_ext_ilmbase}/bin/libIexMath.dll - DEPENDEES install - ) -endif() diff --git a/3rdparty/ext_openexr/CMakeLists.txt b/3rdparty/ext_openexr/CMa= keLists.txt index ba4084aa76..b47b09e0e0 100644 --- a/3rdparty/ext_openexr/CMakeLists.txt +++ b/3rdparty/ext_openexr/CMakeLists.txt @@ -2,31 +2,24 @@ SET(EXTPREFIX_openexr "${EXTPREFIX}" ) if (MINGW) ExternalProject_Add( ext_openexr DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL https://github.com/AcademySoftwareFoundation/openexr/archive/v= 2.4.0.tar.gz - URL_MD5 9e4d69cf2a12c6fb19b98af7c5e0eaee - - PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/= openexr.diff - COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/= symlink.patch - COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/= exr_symlink.diff + URL https://github.com/AcademySoftwareFoundation/openexr/archive/v= 2.5.3.tar.gz + URL_HASH SHA256=3D6a6525e6e3907715c6a55887716d7e42d09b54d2457323fc= ee35a0376960bebf = INSTALL_DIR ${EXTPREFIX_openexr} - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=3D${EXTPREFIX_openexr} -DILMBASE= _PACKAGE_PREFIX=3D${EXTPREFIX_openexr} -DCMAKE_BUILD_TYPE=3D${GLOBAL_BUILD_= TYPE} ${GLOBAL_PROFILE} -DNAMESPACE_VERSIONING=3DOFF + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=3D${EXTPREFIX_openexr} -DCMAKE_B= UILD_TYPE=3D${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DNAMESPACE_VERSIONING= =3DOFF = UPDATE_COMMAND "" - DEPENDS ext_ilmbase ext_zlib + DEPENDS ext_zlib ) else() ExternalProject_Add(ext_openexr DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL https://github.com/AcademySoftwareFoundation/openexr/archive/v= 2.4.0.tar.gz - URL_MD5 9e4d69cf2a12c6fb19b98af7c5e0eaee - - PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/= openexr.diff + URL https://github.com/AcademySoftwareFoundation/openexr/archive/v= 2.5.3.tar.gz + URL_HASH SHA256=3D6a6525e6e3907715c6a55887716d7e42d09b54d2457323fc= ee35a0376960bebf = INSTALL_DIR ${EXTPREFIX_openexr} - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=3D${EXTPREFIX_openexr} -DILMBASE= _PACKAGE_PREFIX=3D${EXTPREFIX_openexr} -DCMAKE_BUILD_TYPE=3D${GLOBAL_BUILD_= TYPE} ${GLOBAL_PROFILE} -DNAMESPACE_VERSIONING=3DOFF + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=3D${EXTPREFIX_openexr} -DCMAKE_B= UILD_TYPE=3D${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DNAMESPACE_VERSIONING= =3DOFF = UPDATE_COMMAND "" - DEPENDS ext_ilmbase ) endif() diff --git a/3rdparty/ext_openexr/exr_symlink.diff b/3rdparty/ext_openexr/e= xr_symlink.diff deleted file mode 100644 index 9aa775ed74..0000000000 --- a/3rdparty/ext_openexr/exr_symlink.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/OpenEXR/config/LibraryDefine.cmake b/OpenEXR/config/LibraryDe= fine.cmake -index 6946ca9..8a4ec92 100644 ---- a/OpenEXR/config/LibraryDefine.cmake -+++ b/OpenEXR/config/LibraryDefine.cmake -@@ -91,7 +91,7 @@ function(OPENEXR_DEFINE_LIBRARY libname) - PUBLIC_HEADER - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR} - ) -- if(BUILD_SHARED_LIBS AND (NOT "${OPENEXR_LIB_SUFFIX}" STREQUAL "")) -+ if(FALSE) - set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_= SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARE= D_LIBRARY_SUFFIX}) - install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${CMA= KE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${= baselibname})") diff --git a/3rdparty/ext_openexr/openexr.diff b/3rdparty/ext_openexr/opene= xr.diff deleted file mode 100644 index 267a0d2f65..0000000000 --- a/3rdparty/ext_openexr/openexr.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/OpenEXR/IlmImf/CMakeLists.txt b/OpenEXR/IlmImf/CMakeLists.txt -index 165fed7..aca02ca 100644 ---- a/OpenEXR/IlmImf/CMakeLists.txt -+++ b/OpenEXR/IlmImf/CMakeLists.txt -@@ -5,6 +5,7 @@ add_executable(b44ExpLogTable b44ExpLogTable.cpp) - target_link_libraries(b44ExpLogTable PRIVATE OpenEXR::Config IlmBase::Hal= f IlmBase::IlmThread IlmBase::Iex) - set_target_properties(b44ExpLogTable PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" -+ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_INSTALL_PREFIX}/bin" - ) - # TODO: Old file had logic to skip these if the file already exists - add_custom_command( -@@ -18,6 +19,7 @@ add_executable(dwaLookups dwaLookups.cpp) - target_link_libraries(dwaLookups PRIVATE OpenEXR::Config IlmBase::Imath I= lmBase::Half IlmBase::IlmThread IlmBase::Iex) - set_target_properties(dwaLookups PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" -+ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_INSTALL_PREFIX}/bin" - ) - # TODO: Old file had logic to skip these if the file already exists - add_custom_command( diff --git a/3rdparty/ext_openexr/patch_mingw.patch b/3rdparty/ext_openexr/= patch_mingw.patch deleted file mode 100644 index fd4d8f3c09..0000000000 --- a/3rdparty/ext_openexr/patch_mingw.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/IlmImf/ImfSystemSpecific.h -+++ b/IlmImf/ImfSystemSpecific.h -@@ -54,7 +54,7 @@ - = - #ifdef IMF_HAVE_SSE2 - = --#ifdef __GNUC__ -+#if defined(__GNUC__) && !defined(__MINGW__) && !defined(__MINGW32__) && = !defined(__MINGW64__) - // Causes issues on certain gcc versions - //#define EXR_FORCEINLINE inline __attribute__((always_inline)) - #define EXR_FORCEINLINE inline -@@ -73,7 +73,7 @@ - free(ptr); - } - = --#elif defined _MSC_VER -+#elif defined(_MSC_VER) || defined(__MINGW__) || defined(__MINGW32__) || = defined(__MINGW64__) - = - #define EXR_FORCEINLINE __forceinline - #define EXR_RESTRICT __restrict ---- a/IlmImf/ImfOptimizedPixelReading.h -+++ b/IlmImf/ImfOptimizedPixelReading.h -@@ -70,7 +70,7 @@ - bool - isPointerSSEAligned (const void* EXR_RESTRICT pPointer) - { -- unsigned long trailingBits =3D ((unsigned long)pPointer) & 15; -+ unsigned long trailingBits =3D ((unsigned size_t)pPointer) & 15; - return trailingBits =3D=3D 0; - } - = diff --git a/3rdparty/ext_openexr/symlink.patch b/3rdparty/ext_openexr/syml= ink.patch deleted file mode 100644 index d421a39b17..0000000000 --- a/3rdparty/ext_openexr/symlink.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/IlmBase/config/LibraryDefine.cmake b/IlmBase/config/LibraryDe= fine.cmake -index 0502825..f98868c 100644 ---- a/IlmBase/config/LibraryDefine.cmake -+++ b/IlmBase/config/LibraryDefine.cmake -@@ -97,7 +97,7 @@ function(ILMBASE_DEFINE_LIBRARY libname) - PUBLIC_HEADER - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${ILMBASE_OUTPUT_SUBDIR} - ) -- if(BUILD_SHARED_LIBS AND (NOT "${ILMBASE_LIB_SUFFIX}" STREQUAL "")) -+ if(FALSE) - set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${ILMBASE_LIB_= SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARE= D_LIBRARY_SUFFIX}) - install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${CMA= KE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${= baselibname})") diff --git a/build-tools/windows/build.cmd b/build-tools/windows/build.cmd index d7c5a05213..bb6f4912ab 100644 --- a/build-tools/windows/build.cmd +++ b/build-tools/windows/build.cmd @@ -764,7 +764,7 @@ echo Running CMake for deps... echo. = set EXT_TARGETS=3Dpatch png2ico zlib gettext openssl boost exiv2 fftw3 eig= en3 = -set EXT_TARGETS=3D%EXT_TARGETS% jpeg lcms2 ocio ilmbase openexr png tiff g= sl vc libraw +set EXT_TARGETS=3D%EXT_TARGETS% jpeg lcms2 ocio openexr png tiff gsl vc li= braw set EXT_TARGETS=3D%EXT_TARGETS% giflib qt kwindowsystem drmingw gmic freet= ype poppler = set EXT_TARGETS=3D%EXT_TARGETS% python sip pyqt set EXT_TARGETS=3D%EXT_TARGETS% lzma quazip openjpeg libheif diff --git a/krita/data/aboutdata/libraries.txt b/krita/data/aboutdata/libr= aries.txt index 3c36e2257d..6f3b6803e9 100644 --- a/krita/data/aboutdata/libraries.txt +++ b/krita/data/aboutdata/libraries.txt @@ -13,7 +13,6 @@ gmic,http://gmic.eu/,CeCILLv2.1 gmic-qt,http://gmic.eu/,GPLv3 GNU Scientific Library,http://www.gnu.org/software/gsl,GPLv3 iconv,https://www.gnu.org/software/libiconv/,LGPLv2 or GPLv3 -ilmbase,http://www.openexr.com,Modified BSD KDE Frameworks 5,https://www.kde.org,LGPLv2.1+ libheif,https://github.com/strukturag/libheif,LGPLv3 libjpeg-turbo,http://www.libjpeg-turbo.org,BSD diff --git a/packaging/macos/osxbuild.sh b/packaging/macos/osxbuild.sh index ae5245ab8d..39e1b84c7c 100755 --- a/packaging/macos/osxbuild.sh +++ b/packaging/macos/osxbuild.sh @@ -289,7 +289,6 @@ build_3rdparty () { ext_eigen3 \ ext_exiv2 \ ext_fftw3 \ - ext_ilmbase \ ext_jpeg \ ext_lcms2 \ ext_ocio \ @@ -392,12 +391,10 @@ rebuild_3rdparty () { ext_expat \ ext_exiv2 \ ext_fftw3 \ - ext_ilmbase \ ext_jpeg \ ext_patch \ ext_lcms2 \ ext_ocio \ - ext_ilmbase \ ext_openexr #ext_openjpeg =20