From 2891d29af8907ce881662f4a02844926d7a293c7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 Dec 2018 13:43:35 +0000 Subject: gentoo resync : 31.12.2018 --- media-gfx/gmic/files/gmic-1.7.8-cmake.patch | 76 --------------------- media-gfx/gmic/files/gmic-1.7.9-flags.patch | 15 ----- media-gfx/gmic/files/gmic-1.7.9-man.patch | 17 ----- media-gfx/gmic/files/gmic-2.4.3-curl.patch | 100 ++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 108 deletions(-) delete mode 100644 media-gfx/gmic/files/gmic-1.7.8-cmake.patch delete mode 100644 media-gfx/gmic/files/gmic-1.7.9-flags.patch delete mode 100644 media-gfx/gmic/files/gmic-1.7.9-man.patch create mode 100644 media-gfx/gmic/files/gmic-2.4.3-curl.patch (limited to 'media-gfx/gmic/files') diff --git a/media-gfx/gmic/files/gmic-1.7.8-cmake.patch b/media-gfx/gmic/files/gmic-1.7.8-cmake.patch deleted file mode 100644 index 2c4a6b3557b7..000000000000 --- a/media-gfx/gmic/files/gmic-1.7.8-cmake.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- gmic-1.7.8/CMakeLists.txt -+++ gmic-1.7.8/CMakeLists.txt -@@ -3,9 +3,11 @@ - project(gmic CXX C) - - find_package(PkgConfig) -+include(GNUInstallDirs) - - # options controlling the build process - option(BUILD_LIB "Build the GMIC shared library" ON) -+option(BUILD_LIB_STATIC "Build the GMIC static library" ON) - option(BUILD_CLI "Build the CLI interface" ON) - option(BUILD_PLUGIN "Build the GIMP plug-in" ON) - option(ENABLE_X "Add support for X11" ON) -@@ -44,7 +46,7 @@ - if(ENABLE_OPENMP) - if(NOT APPLE) - set(COMPILE_FLAGS " ${COMPILE_FLAGS} -fopenmp -Dcimg_use_openmp ") -- set(EXTRA_LIBRARIES "-lgomp ${EXTRA_LIBRARIES}") -+ set(EXTRA_LIBRARIES "${EXTRA_LIBRARIES} -lgomp") - endif(NOT APPLE) - endif(ENABLE_OPENMP) - -@@ -187,9 +189,9 @@ - "Choose the type of build, options are: Debug Release RelWithDebInfo." - FORCE) - endif(NOT CMAKE_BUILD_TYPE) --SET(CMAKE_CXX_FLAGS_DEBUG " -O0 -g -ansi -pedantic -Dcimg_verbosity=3 ${COMPILE_FLAGS}") --SET(CMAKE_CXX_FLAGS_RELEASE " -O3 -mtune=generic ${COMPILE_FLAGS}") --SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO " -O3 -g -mtune=generic ${COMPILE_FLAGS}") -+SET(CMAKE_CXX_FLAGS_DEBUG " -ansi -pedantic -Dcimg_verbosity=3 ${COMPILE_FLAGS}") -+SET(CMAKE_CXX_FLAGS_RELEASE " ${COMPILE_FLAGS}") -+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO " ${COMPILE_FLAGS}") - - - # source files -@@ -220,7 +222,7 @@ - if(BUILD_LIB) - add_library(libgmic SHARED ${CLI_Includes} ${CLI_Sources}) - add_dependencies(libgmic gmic_extra_headers) -- set_target_properties(libgmic PROPERTIES OUTPUT_NAME "gmic") -+ set_target_properties(libgmic PROPERTIES SOVERSION "1" OUTPUT_NAME "gmic") - IF(NOT APPLE) - set_target_properties(libgmic PROPERTIES LINK_FLAGS "-Wl,-soname,libgmic.so.1") - ENDIF(NOT APPLE) -@@ -236,7 +238,13 @@ - ${FFTW3_LIBRARIES} - ${EXTRA_LIBRARIES} - ) -- -+ -+ INSTALL(TARGETS libgmic LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") -+ INSTALL(FILES src/gmic.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") -+endif(BUILD_LIB) -+ -+ -+if(BUILD_LIB_STATIC) - add_library(libgmicstatic STATIC ${CLI_Includes} ${CLI_Sources}) - add_dependencies(libgmicstatic gmic_extra_headers) - set_target_properties(libgmicstatic PROPERTIES OUTPUT_NAME "gmic") -@@ -252,11 +260,10 @@ - ${FFTW3_LIBRARIES} - ${EXTRA_LIBRARIES} - ) -- -- INSTALL(TARGETS libgmic LIBRARY DESTINATION lib) -- INSTALL(TARGETS libgmicstatic ARCHIVE DESTINATION lib) -- INSTALL(FILES src/gmic.h DESTINATION include) --endif(BUILD_LIB) -+ -+ INSTALL(TARGETS libgmicstatic ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") -+ INSTALL(FILES src/gmic.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") -+endif(BUILD_LIB_STATIC) - - - if(BUILD_CLI) diff --git a/media-gfx/gmic/files/gmic-1.7.9-flags.patch b/media-gfx/gmic/files/gmic-1.7.9-flags.patch deleted file mode 100644 index aea11ed50a72..000000000000 --- a/media-gfx/gmic/files/gmic-1.7.9-flags.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- gmic-1.7.9/CMakeLists.txt -+++ gmic-1.7.9/CMakeLists.txt -@@ -190,9 +190,9 @@ - "Choose the type of build, options are: Debug Release RelWithDebInfo." - FORCE) - endif(NOT CMAKE_BUILD_TYPE) --SET(CMAKE_CXX_FLAGS_DEBUG " -O0 -g -ansi -pedantic -Dcimg_verbosity=3 ${COMPILE_FLAGS}") --SET(CMAKE_CXX_FLAGS_RELEASE " -O3 -mtune=generic ${COMPILE_FLAGS}") --SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO " -O3 -g -mtune=generic ${COMPILE_FLAGS}") -+SET(CMAKE_CXX_FLAGS_DEBUG " -ansi -pedantic -Dcimg_verbosity=3 ${COMPILE_FLAGS}") -+SET(CMAKE_CXX_FLAGS_RELEASE " ${COMPILE_FLAGS}") -+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO " ${COMPILE_FLAGS}") - - - # source files diff --git a/media-gfx/gmic/files/gmic-1.7.9-man.patch b/media-gfx/gmic/files/gmic-1.7.9-man.patch deleted file mode 100644 index 44353a2123ff..000000000000 --- a/media-gfx/gmic/files/gmic-1.7.9-man.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- gmic-1.7.9/CMakeLists.txt -+++ gmic-1.7.9/CMakeLists.txt -@@ -334,11 +334,10 @@ - if(BUILD_MAN) - file(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/man) - add_custom_command( -- OUTPUT ${CMAKE_SOURCE_DIR}/man/gmic.1.gz -+ OUTPUT ${CMAKE_SOURCE_DIR}/man/gmic.1 - DEPENDS gmic - COMMAND ${CMAKE_BINARY_DIR}/gmic -v - ${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic raw:${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic,uchar -__help man 2> ${CMAKE_SOURCE_DIR}/man/gmic.1 -- COMMAND gzip -f ${CMAKE_SOURCE_DIR}/man/gmic.1 - ) -- add_custom_target(man ALL DEPENDS ${CMAKE_SOURCE_DIR}/man/gmic.1.gz) -- INSTALL(FILES ${CMAKE_SOURCE_DIR}/man/gmic.1.gz DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/) -+ add_custom_target(man ALL DEPENDS ${CMAKE_SOURCE_DIR}/man/gmic.1) -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/man/gmic.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/) - endif(BUILD_MAN) diff --git a/media-gfx/gmic/files/gmic-2.4.3-curl.patch b/media-gfx/gmic/files/gmic-2.4.3-curl.patch new file mode 100644 index 000000000000..f91f86ff0d48 --- /dev/null +++ b/media-gfx/gmic/files/gmic-2.4.3-curl.patch @@ -0,0 +1,100 @@ +Add curl support for the cli app and base library and make it truly optional +for gmic-qt instead of automagic. + +--- gmic-2.4.3/CMakeLists.txt ++++ gmic-2.4.3/CMakeLists.txt +@@ -83,6 +83,7 @@ + option(BUILD_MAN "Build the manpage" ON) + option(BUILD_BASH_COMPLETION "Build Bash completion" ON) + option(CUSTOM_CFLAGS "Override default compiler optimization flags" OFF) ++option(ENABLE_CURL "Add support for curl" ON) + option(ENABLE_X "Add support for X11" ON) + option(ENABLE_FFMPEG "Add support for FFMpeg" ON) + option(ENABLE_FFTW "Add support for FFTW" ON) +@@ -136,6 +137,16 @@ + link_directories(${ZLIB_LIBRARY_DIRS}) + endif() + ++# curl support ++if(ENABLE_CURL) ++ find_package(CURL) ++endif() ++if(CURL_FOUND) ++ set(COMPILE_FLAGS "${COMPILE_FLAGS} -Dcimg_use_curl") ++ include_directories(${CURL_INCLUDE_DIRS}) ++ link_directories(${CURL_LIBRARY_DIRS}) ++endif() ++ + #X11 support + if(ENABLE_X) + find_package(X11) +@@ -288,6 +299,7 @@ + ${OPENEXR_LIBRARIES} + ${OPENCV_LIBRARIES} + ${ZLIB_LIBRARIES} ++ ${CURL_LIBRARIES} + ${FFTW3_LIBRARIES} + ${EXTRA_LIBRARIES} + ) +@@ -316,6 +328,7 @@ + ${OPENEXR_LIBRARIES} + ${OPENCV_LIBRARIES} + ${ZLIB_LIBRARIES} ++ ${CURL_LIBRARIES} + ${FFTW3_LIBRARIES} + ${EXTRA_LIBRARIES} + ) +@@ -345,6 +358,7 @@ + ${OPENEXR_LIBRARIES} + ${OPENCV_LIBRARIES} + ${ZLIB_LIBRARIES} ++ ${CURL_LIBRARIES} + ${FFTW3_LIBRARIES} + ${EXTRA_LIBRARIES} + ) +--- gmic-2.4.3/gmic-qt/CMakeLists.txt ++++ gmic-2.4.3/gmic-qt/CMakeLists.txt +@@ -30,6 +30,7 @@ + message("G'MIC path: " ${GMIC_PATH}) + + option(ENABLE_DYNAMIC_LINKING "Dynamically link the binaries to the GMIC shared library" OFF) ++option(ENABLE_CURL "Add support for curl" ON) + set (GMIC_LIB_PATH "${GMIC_PATH}" CACHE STRING "Define the path to the GMIC shared library") + + # +@@ -149,10 +150,12 @@ + # + # CURL + # +-find_package(CURL) +-if (CURL_FOUND) +- add_definitions(-Dcimg_use_curl) +- include_directories(SYSTEM ${CURL_INCLUDE_DIRS} ) ++if(ENABLE_CURL) ++ find_package(CURL) ++ if (CURL_FOUND) ++ add_definitions(-Dcimg_use_curl) ++ include_directories(SYSTEM ${CURL_INCLUDE_DIRS} ) ++ endif() + endif() + + # +@@ -187,11 +190,13 @@ + ${ZLIB_LIBRARIES} + ) + +-if (CURL_FOUND) +- set(gmic_qt_LIBRARIES +- ${gmic_qt_LIBRARIES} +- ${CURL_LIBRARIES} +- ) ++if(ENABLE_CURL) ++ if (CURL_FOUND) ++ set(gmic_qt_LIBRARIES ++ ${gmic_qt_LIBRARIES} ++ ${CURL_LIBRARIES} ++ ) ++ endif() + endif() + + add_definitions(-Dgmic_build) -- cgit v1.2.3