Skip to content

Commit

Permalink
media-gfx/gmic: fix qt-cmake patch for 2.7.1
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/693486

Signed-off-by: Tim Harder <[email protected]>
  • Loading branch information
radhermit committed Sep 4, 2019
1 parent 6d19263 commit 1d78c77
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 1 deletion.
35 changes: 35 additions & 0 deletions media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
Fix linking with fftw when thread support is enabled.

--- 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, none, paintdotnet, or digikam.")
if (${GMIC_QT_HOST} STREQUAL "none")
@@ -145,8 +146,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
@@ -187,6 +193,7 @@
${PNG_LIBRARIES}
${FFTW3_LIBRARIES}
${ZLIB_LIBRARIES}
+ ${EXTRA_LIBRARIES}
)

if (CURL_FOUND)
2 changes: 1 addition & 1 deletion media-gfx/gmic/gmic-2.7.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ src_prepare() {
if use gimp || use krita || use qt5; then
sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
local S="${S}/gmic-qt"
PATCHES=( "${FILESDIR}"/${PN}-2.6.7-qt-cmake.patch )
PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
cmake-utils_src_prepare
fi
}
Expand Down

0 comments on commit 1d78c77

Please sign in to comment.