diff options
Diffstat (limited to 'media-gfx/gmic/files')
| -rw-r--r-- | media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch b/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch deleted file mode 100644 index e268558a95eb..000000000000 --- a/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch +++ /dev/null @@ -1,54 +0,0 @@ -Fix linking with fftw when thread support is enabled and fix source code file -name typo. - ---- gmic-qt/CMakeLists.txt -+++ gmic-qt/CMakeLists.txt -@@ -13,6 +13,7 @@ - set(CMAKE_AUTOUIC OFF) - set(CMAKE_AUTORCC ON) - set(CMAKE_INCLUDE_CURRENT_DIR ON) -+set(EXTRA_LIBRARIES) - - set (GMIC_QT_HOST "gimp" CACHE STRING "Define for which host qmic-qt will be built: gimp, krita or none.") - if (${GMIC_QT_HOST} STREQUAL "none") -@@ -143,8 +144,13 @@ - # - find_package(FFTW3 REQUIRED) - add_definitions(-Dcimg_use_fftw3 ) --add_definitions(-Dcimg_use_fftw3_singlethread ) - include_directories(${FFTW3_INCLUDE_DIR}) -+find_library(FFTW3_THREADS_LIB fftw3_threads PATHS ${FFTW3_LIBRARY_DIRS}) -+if(FFTW3_THREADS_LIB STREQUAL "FFTW3_THREADS_LIB-NOTFOUND") -+ add_definitions(-Dcimg_use_fftw3_singlethread) -+else() -+ list(APPEND EXTRA_LIBRARIES "-lfftw3_threads") -+endif() - - # - # CURL -@@ -185,6 +191,7 @@ - ${PNG_LIBRARIES} - ${FFTW3_LIBRARIES} - ${ZLIB_LIBRARIES} -+ ${EXTRA_LIBRARIES} - ) - - if (CURL_FOUND) -@@ -278,7 +285,7 @@ - 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 -@@ -350,7 +357,7 @@ - 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 |