| 1 |
commit: 1d78c775718dbca78456247544e7d3649c33d4f2 |
| 2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 4 13:28:59 2019 +0000 |
| 4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 4 13:31:38 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d78c775 |
| 7 |
|
| 8 |
media-gfx/gmic: fix qt-cmake patch for 2.7.1 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/693486 |
| 11 |
|
| 12 |
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org> |
| 13 |
|
| 14 |
media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch | 35 ++++++++++++++++++++++++++ |
| 15 |
media-gfx/gmic/gmic-2.7.1.ebuild | 2 +- |
| 16 |
2 files changed, 36 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch b/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..caf22d04ce9 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch |
| 23 |
@@ -0,0 +1,35 @@ |
| 24 |
+Fix linking with fftw when thread support is enabled. |
| 25 |
+ |
| 26 |
+--- gmic-qt/CMakeLists.txt |
| 27 |
++++ gmic-qt/CMakeLists.txt |
| 28 |
+@@ -13,6 +13,7 @@ |
| 29 |
+ set(CMAKE_AUTOUIC OFF) |
| 30 |
+ set(CMAKE_AUTORCC ON) |
| 31 |
+ set(CMAKE_INCLUDE_CURRENT_DIR ON) |
| 32 |
++set(EXTRA_LIBRARIES) |
| 33 |
+ |
| 34 |
+ set (GMIC_QT_HOST "gimp" CACHE STRING "Define for which host qmic-qt will be built: gimp, krita, none, paintdotnet, or digikam.") |
| 35 |
+ if (${GMIC_QT_HOST} STREQUAL "none") |
| 36 |
+@@ -145,8 +146,13 @@ |
| 37 |
+ # |
| 38 |
+ find_package(FFTW3 REQUIRED) |
| 39 |
+ add_definitions(-Dcimg_use_fftw3 ) |
| 40 |
+-add_definitions(-Dcimg_use_fftw3_singlethread ) |
| 41 |
+ include_directories(${FFTW3_INCLUDE_DIR}) |
| 42 |
++find_library(FFTW3_THREADS_LIB fftw3_threads PATHS ${FFTW3_LIBRARY_DIRS}) |
| 43 |
++if(FFTW3_THREADS_LIB STREQUAL "FFTW3_THREADS_LIB-NOTFOUND") |
| 44 |
++ add_definitions(-Dcimg_use_fftw3_singlethread) |
| 45 |
++else() |
| 46 |
++ list(APPEND EXTRA_LIBRARIES "-lfftw3_threads") |
| 47 |
++endif() |
| 48 |
+ |
| 49 |
+ # |
| 50 |
+ # CURL |
| 51 |
+@@ -187,6 +193,7 @@ |
| 52 |
+ ${PNG_LIBRARIES} |
| 53 |
+ ${FFTW3_LIBRARIES} |
| 54 |
+ ${ZLIB_LIBRARIES} |
| 55 |
++ ${EXTRA_LIBRARIES} |
| 56 |
+ ) |
| 57 |
+ |
| 58 |
+ if (CURL_FOUND) |
| 59 |
|
| 60 |
diff --git a/media-gfx/gmic/gmic-2.7.1.ebuild b/media-gfx/gmic/gmic-2.7.1.ebuild |
| 61 |
index d4bacf38744..bd8a5d1a186 100644 |
| 62 |
--- a/media-gfx/gmic/gmic-2.7.1.ebuild |
| 63 |
+++ b/media-gfx/gmic/gmic-2.7.1.ebuild |
| 64 |
@@ -87,7 +87,7 @@ src_prepare() { |
| 65 |
if use gimp || use krita || use qt5; then |
| 66 |
sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die |
| 67 |
local S="${S}/gmic-qt" |
| 68 |
- PATCHES=( "${FILESDIR}"/${PN}-2.6.7-qt-cmake.patch ) |
| 69 |
+ PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch ) |
| 70 |
cmake-utils_src_prepare |
| 71 |
fi |
| 72 |
} |
Archives