diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2019-07-02 15:03:44 -0600 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2019-07-02 15:05:06 -0600 |
| commit | 23a04f77b1ab7d3d5dcc3c4f08dedfd0d044b4ee (patch) | |
| tree | 1acabc9509bbe92f27bcb3751e97665ea14aa05b /media-gfx/gmic/files | |
| parent | media-libs/cimg: remove old (diff) | |
| download | gentoo-23a04f77b1ab7d3d5dcc3c4f08dedfd0d044b4ee.tar.gz gentoo-23a04f77b1ab7d3d5dcc3c4f08dedfd0d044b4ee.tar.bz2 gentoo-23a04f77b1ab7d3d5dcc3c4f08dedfd0d044b4ee.zip | |
media-gfx/gmic: version bump to 2.6.7
Closes: https://bugs.gentoo.org/687662
Signed-off-by: Tim Harder <radhermit@gentoo.org>
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, 54 insertions, 0 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 new file mode 100644 index 000000000000..e268558a95eb --- /dev/null +++ b/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch @@ -0,0 +1,54 @@ +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 |