diff --git a/3rdparty/ext_gmic/CMakeLists.txt b/3rdparty/ext_gmic/CMakeLists.txt index 3a50d4205b..0a6a19a852 100644 --- a/3rdparty/ext_gmic/CMakeLists.txt +++ b/3rdparty/ext_gmic/CMakeLists.txt @@ -1,42 +1,40 @@ 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 + URL https://gmic.eu/files/source/gmic_2.9.0.tar.gz + URL_MD5 0980af23bfc6466f6aab3d60d758f1ac - PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/cmake.diff - COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/no_threads.diff + PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/no_threads.diff SOURCE_DIR gmic CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_gmic} -D -DCMAKE_BUILD_TYPE=Release ${GLOBAL_PROFILE} BUILD_COMMAND "" INSTALL_COMMAND "" BUILD_IN_SOURCE 1 ) # 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 + URL https://github.com/c-koi/gmic-qt/archive/v.2.9.0.tar.gz + URL_MD5 40bb7311a4e68bd52d5fcaa19ba37c66 PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/desktop_icon.diff - COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/gmic-qt-cmake.diff SOURCE_DIR gmic-qt INSTALL_DIR ${PREFIX_ext_gmic} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_gmic} -DGMIC_QT_HOST=krita -DCMAKE_BUILD_TYPE=Release ${GLOBAL_PROFILE} UPDATE_COMMAND "" DEPENDS ext_gmic_base ) add_custom_target(ext_gmic) add_dependencies(ext_gmic ext_gmic_qt) diff --git a/3rdparty/ext_gmic/desktop_icon.diff b/3rdparty/ext_gmic/desktop_icon.diff index 7d58b215b6..fdb15a4593 100644 --- a/3rdparty/ext_gmic/desktop_icon.diff +++ b/3rdparty/ext_gmic/desktop_icon.diff @@ -1,76 +1,14 @@ -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 +index 7d2f971..c6797af 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_VERSION} ") 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_PREFIX}/bin) +@@ -533,7 +533,8 @@ elseif (${GMIC_QT_HOST} STREQUAL "krita") + PRIVATE + ${gmic_qt_LIBRARIES} + ) +- install(TARGETS gmic_krita_qt RUNTIME DESTINATION bin) ++ install(TARGETS gmic_krita_qt RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) + install(FILES gmic_krita_qt.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/bin OPTIONAL) -+ - elseif (${GMIC_QT_HOST} STREQUAL "none") - set (gmic_qt_SRCS ${gmic_qt_SRCS} src/Host/None/host_none.cpp src/Host/None/ImageDialog.h src/Host/None/ImageDialog.cpp) -@@ -473,3 +469,4 @@ else() - endif() + elseif (${GMIC_QT_HOST} STREQUAL "none") - 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=gmic_krita_qt -+Exec=gmic_krita_qt -+GenericName=G'Mic plugin for Krita -+Comment=G'Mic plugin for Krita -+Type=Application -+Icon=gmic_krita_qt -+Categories=Qt;KDE;Graphics; -+StartupNotify=false --- -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_threads.diff index 916ddc4391..d1413d282a 100644 --- a/3rdparty/ext_gmic/no_threads.diff +++ b/3rdparty/ext_gmic/no_threads.diff @@ -1,13 +1,13 @@ diff --git a/src/CImg.h b/src/CImg.h -index 6fe7455..a1450f4 100644 +index 2b7a53b..886daf7 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() { +@@ -3205,7 +3205,7 @@ namespace cimg_library_suffixed { + #if defined(cimg_use_fftw3) && !defined(cimg_use_fftw3_singlethread) + struct FFTW3_static { + FFTW3_static() { - fftw_init_threads(); + //fftw_init_threads(); } - }; // struct FFTW3_info { ... - static FFTW3_info _FFTW3_info; + }; // struct FFTW3_static { ... + static FFTW3_static _FFTW3_static;