diff --git a/3rdparty/ext_gmic/CMakeLists.txt b/3rdparty/ext_gmic/CMakeLists.txt index 0ceb0b85d9..3a50d4205b 100644 --- a/3rdparty/ext_gmic/CMakeLists.txt +++ b/3rdparty/ext_gmic/CMakeLists.txt @@ -1,41 +1,42 @@ 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.6.7.tar.gz - URL_MD5 1d55ec5d349ccf0ef78cf8d1b4a42af8 + 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}/cmake.diff 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.6.7.tar.gz - URL_MD5 bdbd6e77d78e478e8653c1396065afc5 + 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}/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/cmake.diff b/3rdparty/ext_gmic/cmake.diff index 7f9a989c24..888c064e0f 100644 --- a/3rdparty/ext_gmic/cmake.diff +++ b/3rdparty/ext_gmic/cmake.diff @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3df1f8a..0bee815 100644 +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.9) +-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/gmic-qt-cmake.diff b/3rdparty/ext_gmic/gmic-qt-cmake.diff new file mode 100644 index 0000000000..b703c7cae8 --- /dev/null +++ b/3rdparty/ext_gmic/gmic-qt-cmake.diff @@ -0,0 +1,22 @@ +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 066e23d138..916ddc4391 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 9c116d2..afd8694 100644 +index 6fe7455..a1450f4 100644 --- a/src/CImg.h +++ b/src/CImg.h -@@ -3137,7 +3137,7 @@ namespace cimg_library_suffixed { +@@ -3194,7 +3194,7 @@ namespace cimg_library_suffixed { #if defined(cimg_use_fftw3) - static struct FFTW3_info { + struct FFTW3_info { FFTW3_info() { - fftw_init_threads(); -+// fftw_init_threads(); ++ //fftw_init_threads(); } - } _FFTW3_info; - #endif + }; // struct FFTW3_info { ... + static FFTW3_info _FFTW3_info;