Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit a5b74f5b authored by Boudewijn Rempt's avatar Boudewijn Rempt

Update gmic-qt and add a patch to fix building on case-sensitive systems

parent ca2b09d4
......@@ -3,8 +3,8 @@ 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
......@@ -23,9 +23,10 @@ ExternalProject_Add( ext_gmic_base
# 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}
......
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)
......
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/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;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment