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/Manifest | 14 +-- 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 ++++++++++++++++ media-gfx/gmic/gmic-1.7.8.ebuild | 91 --------------- media-gfx/gmic/gmic-1.7.9.ebuild | 86 -------------- media-gfx/gmic/gmic-2.0.0.ebuild | 91 --------------- media-gfx/gmic/gmic-2.4.3.ebuild | 170 ++++++++++++++++++++++++++++ media-gfx/gmic/metadata.xml | 1 + 10 files changed, 275 insertions(+), 386 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 delete mode 100644 media-gfx/gmic/gmic-1.7.8.ebuild delete mode 100644 media-gfx/gmic/gmic-1.7.9.ebuild delete mode 100644 media-gfx/gmic/gmic-2.0.0.ebuild create mode 100644 media-gfx/gmic/gmic-2.4.3.ebuild (limited to 'media-gfx/gmic') diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest index d25ea2159dba..d1f80d1c48d0 100644 --- a/media-gfx/gmic/Manifest +++ b/media-gfx/gmic/Manifest @@ -1,10 +1,4 @@ -AUX gmic-1.7.8-cmake.patch 2642 BLAKE2B 3ab50c705f6b1b91546b98bb55320e42dcf2cf52bd6f315dd7ae28092ae486fc8b17d52ad0ab3081cfe10cdb08dac49ca646bcd4ca7987db980bf10f47d1287d SHA512 76efb29a43f2408c2b1bc67de561927188f8729fac5b5a82e572856ad4fb326a7c1bb438c2811596500f80580f2e669b9dd796a5ee5dd3d0ce27cfb051c069b6 -AUX gmic-1.7.9-flags.patch 645 BLAKE2B b849606737b95521ac6e55640632e4b72689b4152b247c4efbf7f67640af9b8dd5794ba1d7de1e389da2ca19f2b5c3b9eea007d51e281de657e14b52abeae90a SHA512 01ec915af54d606f947f87581b5386900e61cff7d175c01d01cc558a22b219eda255a1d2af93c1414adcdf6a6297d4b42893ee875a40e908e21de5d15a449d72 -AUX gmic-1.7.9-man.patch 857 BLAKE2B c3a2dcbbd997b1f1d0f38e9c73467b83ced0f6174644eca40e5d13e5a98a5e94305f87759b4cb22b34542ee0303cfa38dd59d671495ab08141e14b58e509cf56 SHA512 6c205a0841fd35773ab5a8845d7efbcf57ccad74b07b5d61d45e37d07a30df6db40dd6a104fef669953e0a210869661d989a0daff1630ca7c713fbea3219fcca -DIST gmic_1.7.8.tar.gz 3013635 BLAKE2B 1e964b42358010d1c643ff976f70774e2418a42b09601f29f9838e594ba4a0145e4c019cba39523efa85846bb75df7bbc451fd2c23ababc94ace93f35587c535 SHA512 2bfa7bb9ff3a99a76c71f7c4e0d619e9c205dafc02b5a2d1f097b6285c141e5413f7016b92d974327f787010a6832d272ab21a89842eee2484151072c2d4c559 -DIST gmic_1.7.9.tar.gz 3069082 BLAKE2B bc756258adbe468a4ceb347d546e1d283b6b21bb8bac4d3ec14b5c789fa375de37babded5862bdbbf86e83e4818c00c77758c13d10041ab90903d2d01e58ca6a SHA512 749611748c9fe2a141efc9b0a445411c1ece842f4c576b68b3b17cbbffdc1cf43a2aee55dc399b899dc03882f240289beaef96d9ec85b10ffc0ad986412cd4bc -DIST gmic_2.0.0.tar.gz 3181386 BLAKE2B 4e6300388e62c915bf41ed04f70e487de8f5e460855f2e087c20766ef186d7dd1a4b99a053d9bd4ab02dc3f391982a9bebb20bcdd9b1e4737ba2bff77bd84a62 SHA512 08cb3bb02d072db5881dc3b2c23be766ae9909a29042777b474733afe30efeaeff35582ac69e8c5f38258c563919a17ce22294c594cbe04f792769b6609b3efb -EBUILD gmic-1.7.8.ebuild 2117 BLAKE2B 113c3aa08e6e5c3db8801278bf9abe035c01e2b6b98a357ace9eac74d2bc3d59660f8709ac316b01a6c3f452553282069a8f9edc8308138f936096915850ee9f SHA512 69342854e08b932da43d526cbcabe13c330e8c1036e836cfd81d2c8243c9b1bb40e83220b09b89381caae17b7a609da4842eca6e4417944be33fb943ec4cb088 -EBUILD gmic-1.7.9.ebuild 2083 BLAKE2B 302bc72ee6bd6c5d504f9e0c3f33644701896fcc039f9fafccfda351f4b109426567305adae231180fec42c7ec3f5625e3980cd276b1a65c830810c12b4927ae SHA512 8d7d0d8a207298b89e395bc4f0b7204cf11584ba157c935135e9d9ae18cb7f3f849fcefb69ae7c552428d0a8a94394815f5400025cb237200dc7948310fc33ec -EBUILD gmic-2.0.0.ebuild 2173 BLAKE2B 5388dcde5b8dc4ab2904910d4f048016a8cddffa0aa1d0316e944ad7d2335cc535cb36c3c7cbd36cbcc5eab6b5923b847abd9be291d76c496af5aecfe20e3a90 SHA512 53f36dd06ed496434fdd16ab3fa0246c21499a5104f219cbbc9606b8baa70eb099dcfc9e023750f30ab2aa685defb368358fea870a1e10ec9e8d895f6aa57a3c -MISC metadata.xml 479 BLAKE2B da6434093beb9c4faa6740b938220be705538e6b078186ba00bd8b4643f4ff7bc95eeeace26dae218d1af90f07035334c37ba8f262fee56e2618aa3d61e15ed2 SHA512 78c266a5d1f3cf27d2cbaaaeabcaf5037e183a94d36761d23cf1691819405cadd484346b4d2573d03a96bbb9e9f48b1a8f75bd7286f9a77d67aa2421ca0bfd22 +AUX gmic-2.4.3-curl.patch 2527 BLAKE2B 8bb6a9fb4aff5a1ae19437f93ec4336d87ab61f334a56c1d2083b0a8c02c37697795ea82f37d4caaf23edb37111d201db75315169a12f256571ad081f60b9890 SHA512 1c5cef3879749ab9a62e52ae5ac1c26ab60ff4b323352af9e7fb0f55b3ca7804290d03bd63dcaedb68c3d6fe43da332681a1eeb84543a1ac30163169ccee6368 +DIST gmic_2.4.3.tar.gz 3816129 BLAKE2B 1c9dd6c7e45809d0cf8b8a45476a4b20ad321b5f34fbc5214cb149777c6e9a6aba845cd816cc1503010e281bda0b32e1059dd34d052afe2ebc086469163967be SHA512 482e70b0c82992799c5769ded1547904d16dbc9206d67279b6f524c1214258b97fa539678844a450d6f64144dc7a2715c754d6a1d85398e648bc34086fc3218f +EBUILD gmic-2.4.3.ebuild 4306 BLAKE2B 608561cc5f9dc176f4b7951033a7a9cdcddf033bbc3f229a6a0a2ee72c08801ffc564b125eab25e1168bc8c93a8c60a6da2099337a1cd3483d087cff670bc094 SHA512 4b1501fd135e1133e6d8cf8404a20ee6155e04377821a00c0719679f8ce03e156d09a84f0c6104de356b9847f61c8d502db62bc1c2f31330f9d7b7d6b453ef99 +MISC metadata.xml 547 BLAKE2B 0da3088e531217099bf3f690059d3725ba3c62ad9337dfbf3817584f95594a328b647b0a81eb4d58c2cbc030026bf2aa94e01c817b04072aea1caee435f6ef9f SHA512 e58e976f8e80eea8e3620888858d6386e5d922c842e08c39f7ad611a5fc96e5fb85e39864bc0e805dd20a2c19e02b9fb8d1a5eaaa470075ed73759dcdcd4fbee 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) diff --git a/media-gfx/gmic/gmic-1.7.8.ebuild b/media-gfx/gmic/gmic-1.7.8.ebuild deleted file mode 100644 index 985bd87c6dad..000000000000 --- a/media-gfx/gmic/gmic-1.7.8.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils bash-completion-r1 - -DESCRIPTION="GREYC's Magic Image Converter" -HOMEPAGE="http://gmic.eu/ https://github.com/dtschump/gmic" -SRC_URI="http://gmic.eu/files/source/${PN}_${PV}.tar.gz" - -LICENSE="CeCILL-2 FDL-1.3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+cli ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png static-libs tiff X zlib" -REQUIRED_USE="|| ( cli gimp )" - -COMMON_DEPEND=" - fftw? ( sci-libs/fftw:3.0[threads] ) - gimp? ( >=media-gfx/gimp-2.4.0 ) - graphicsmagick? ( media-gfx/graphicsmagick ) - jpeg? ( virtual/jpeg:0 ) - opencv? ( >=media-libs/opencv-2.3.1a-r1 ) - openexr? ( - media-libs/ilmbase - media-libs/openexr - ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0 ) - X? ( - x11-libs/libX11 - x11-libs/libXext - ) - zlib? ( sys-libs/zlib )" -RDEPEND="${COMMON_DEPEND} - ffmpeg? ( media-video/ffmpeg:0 ) - gimp? ( !media-plugins/gimp-gmic ) -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -PATCHES=( "${FILESDIR}"/${P}-cmake.patch ) - -pkg_pretend() { - if use openmp ; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi - - if ! test-flag-CXX -std=c++11 ; then - die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags" - fi -} - -src_prepare() { - default - gunzip man/${PN}.1.gz || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_LIB=ON - -DBUILD_LIB_STATIC=$(usex static-libs) - -DBUILD_CLI=$(usex cli) - -DBUILD_PLUGIN=$(usex gimp) - -DENABLE_X=$(usex X) - -DENABLE_FFMPEG=$(usex ffmpeg) - -DENABLE_FFTW=$(usex fftw) - -DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick) - -DENABLE_JPEG=$(usex jpeg) - -DENABLE_OPENCV=$(usex opencv) - -DENABLE_OPENEXR=$(usex openexr) - -DENABLE_OPENMP=$(usex openmp) - -DENABLE_PNG=$(usex png) - -DENABLE_TIFF=$(usex tiff) - -DENABLE_ZLIB=$(usex zlib) - ) - - local CMAKE_BUILD_TYPE="Release" - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - dodoc README - - if use cli; then - doman man/${PN}.1 - newbashcomp resources/${PN}_bashcompletion.sh ${PN} - fi -} diff --git a/media-gfx/gmic/gmic-1.7.9.ebuild b/media-gfx/gmic/gmic-1.7.9.ebuild deleted file mode 100644 index f8b8e275154c..000000000000 --- a/media-gfx/gmic/gmic-1.7.9.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils bash-completion-r1 - -DESCRIPTION="GREYC's Magic Image Converter" -HOMEPAGE="http://gmic.eu/ https://github.com/dtschump/gmic" -SRC_URI="http://gmic.eu/files/source/${PN}_${PV}.tar.gz" - -LICENSE="CeCILL-2 FDL-1.3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+cli ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png static-libs tiff X zlib" -REQUIRED_USE="|| ( cli gimp )" - -COMMON_DEPEND=" - fftw? ( sci-libs/fftw:3.0[threads] ) - gimp? ( >=media-gfx/gimp-2.4.0 ) - graphicsmagick? ( media-gfx/graphicsmagick ) - jpeg? ( virtual/jpeg:0 ) - opencv? ( >=media-libs/opencv-2.3.1a-r1 ) - openexr? ( - media-libs/ilmbase - media-libs/openexr - ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0 ) - X? ( - x11-libs/libX11 - x11-libs/libXext - ) - zlib? ( sys-libs/zlib )" -RDEPEND="${COMMON_DEPEND} - ffmpeg? ( media-video/ffmpeg:0 ) - gimp? ( !media-plugins/gimp-gmic ) -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${P}-flags.patch - "${FILESDIR}"/${P}-man.patch -) - -pkg_pretend() { - if use openmp ; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi - - if ! test-flag-CXX -std=c++11 ; then - die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags" - fi -} - -src_configure() { - local mycmakeargs=( - -DBUILD_LIB=ON - -DBUILD_LIB_STATIC=$(usex static-libs) - -DBUILD_CLI=$(usex cli) - -DBUILD_MAN=$(usex cli) - -DBUILD_PLUGIN=$(usex gimp) - -DENABLE_X=$(usex X) - -DENABLE_FFMPEG=$(usex ffmpeg) - -DENABLE_FFTW=$(usex fftw) - -DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick) - -DENABLE_JPEG=$(usex jpeg) - -DENABLE_OPENCV=$(usex opencv) - -DENABLE_OPENEXR=$(usex openexr) - -DENABLE_OPENMP=$(usex openmp) - -DENABLE_PNG=$(usex png) - -DENABLE_TIFF=$(usex tiff) - -DENABLE_ZLIB=$(usex zlib) - ) - - local CMAKE_BUILD_TYPE="Release" - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - dodoc README - use cli && newbashcomp resources/${PN}_bashcompletion.sh ${PN} -} diff --git a/media-gfx/gmic/gmic-2.0.0.ebuild b/media-gfx/gmic/gmic-2.0.0.ebuild deleted file mode 100644 index bf371feb3ea2..000000000000 --- a/media-gfx/gmic/gmic-2.0.0.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils bash-completion-r1 - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/dtschump/gmic.git" - inherit git-r3 -else - SRC_URI="http://gmic.eu/files/source/${PN}_${PV}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="GREYC's Magic Image Converter" -HOMEPAGE="http://gmic.eu/ https://github.com/dtschump/gmic" - -LICENSE="CeCILL-2 FDL-1.3" -SLOT="0" -IUSE="+cli ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png static-libs tiff X zlib" -REQUIRED_USE="|| ( cli gimp )" - -COMMON_DEPEND=" - fftw? ( sci-libs/fftw:3.0[threads] ) - gimp? ( >=media-gfx/gimp-2.4.0 ) - graphicsmagick? ( media-gfx/graphicsmagick ) - jpeg? ( virtual/jpeg:0 ) - opencv? ( >=media-libs/opencv-2.3.1a-r1 ) - openexr? ( - media-libs/ilmbase - media-libs/openexr - ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0 ) - X? ( - x11-libs/libX11 - x11-libs/libXext - ) - zlib? ( sys-libs/zlib )" -RDEPEND="${COMMON_DEPEND} - ffmpeg? ( media-video/ffmpeg:0 ) -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.9-flags.patch - "${FILESDIR}"/${PN}-1.7.9-man.patch -) - -pkg_pretend() { - if use openmp ; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi - - if ! test-flag-CXX -std=c++11 ; then - die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags" - fi -} - -src_configure() { - local mycmakeargs=( - -DBUILD_LIB=ON - -DBUILD_LIB_STATIC=$(usex static-libs) - -DBUILD_CLI=$(usex cli) - -DBUILD_MAN=$(usex cli) - -DBUILD_PLUGIN=$(usex gimp) - -DENABLE_X=$(usex X) - -DENABLE_FFMPEG=$(usex ffmpeg) - -DENABLE_FFTW=$(usex fftw) - -DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick) - -DENABLE_JPEG=$(usex jpeg) - -DENABLE_OPENCV=$(usex opencv) - -DENABLE_OPENEXR=$(usex openexr) - -DENABLE_OPENMP=$(usex openmp) - -DENABLE_PNG=$(usex png) - -DENABLE_TIFF=$(usex tiff) - -DENABLE_ZLIB=$(usex zlib) - ) - - local CMAKE_BUILD_TYPE="Release" - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - dodoc README - use cli && newbashcomp resources/${PN}_bashcompletion.sh ${PN} -} diff --git a/media-gfx/gmic/gmic-2.4.3.ebuild b/media-gfx/gmic/gmic-2.4.3.ebuild new file mode 100644 index 000000000000..0b6b7df9acb8 --- /dev/null +++ b/media-gfx/gmic/gmic-2.4.3.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_BUILD_TYPE=Release +CMAKE_MIN_VERSION=3.9 + +inherit cmake-utils bash-completion-r1 + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/dtschump/gmic.git" + inherit git-r3 +else + SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="GREYC's Magic Image Converter" +HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic" + +LICENSE="CeCILL-2 GPL-3" +SLOT="0" +IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib" +REQUIRED_USE=" + || ( cli gimp krita qt5 ) + gimp? ( png zlib fftw X ) + krita? ( png zlib fftw X ) + qt5? ( png zlib fftw X ) +" + +MIN_QT_VER="5.2.0" +QT_DEPEND=" + >=dev-qt/qtcore-${MIN_QT_VER}:5= + >=dev-qt/qtgui-${MIN_QT_VER}:5= + >=dev-qt/qtnetwork-${MIN_QT_VER}:5= + >=dev-qt/qtwidgets-${MIN_QT_VER}:5= +" +COMMON_DEPEND=" + curl? ( net-misc/curl ) + fftw? ( sci-libs/fftw:3.0=[threads] ) + gimp? ( + >=media-gfx/gimp-2.8.0 + ${QT_DEPEND} + ) + graphicsmagick? ( media-gfx/graphicsmagick:0= ) + jpeg? ( virtual/jpeg:0 ) + krita? ( ${QT_DEPEND} ) + opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) + openexr? ( + media-libs/ilmbase:0= + media-libs/openexr:0= + ) + png? ( media-libs/libpng:0= ) + qt5? ( ${QT_DEPEND} ) + tiff? ( media-libs/tiff:0 ) + X? ( + x11-libs/libX11 + x11-libs/libXext + ) + zlib? ( sys-libs/zlib:0= )" +RDEPEND="${COMMON_DEPEND} + ffmpeg? ( media-video/ffmpeg:0= ) +" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig + gimp? ( dev-qt/linguist-tools ) + krita? ( dev-qt/linguist-tools ) + qt5? ( dev-qt/linguist-tools ) +" + +pkg_pretend() { + if use openmp ; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi + + if ! test-flag-CXX -std=c++11 ; then + die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags" + fi +} + +src_prepare() { + local PATCHES=( "${FILESDIR}"/${P}-curl.patch ) + cmake-utils_src_prepare + sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die + + 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=() + cmake-utils_src_prepare + fi +} + +src_configure() { + local mycmakeargs=( + -DBUILD_LIB=ON + -DBUILD_LIB_STATIC=$(usex static-libs) + -DBUILD_CLI=$(usex cli) + -DBUILD_MAN=$(usex cli) + -DCUSTOM_CFLAGS=ON + -DENABLE_CURL=$(usex curl) + -DENABLE_X=$(usex X) + -DENABLE_FFMPEG=$(usex ffmpeg) + -DENABLE_FFTW=$(usex fftw) + -DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick) + -DENABLE_JPEG=$(usex jpeg) + -DENABLE_OPENCV=$(usex opencv) + -DENABLE_OPENEXR=$(usex openexr) + -DENABLE_OPENMP=$(usex openmp) + -DENABLE_PNG=$(usex png) + -DENABLE_TIFF=$(usex tiff) + -DENABLE_ZLIB=$(usex zlib) + -DENABLE_DYNAMIC_LINKING=ON + ) + + cmake-utils_src_configure + + # configure gmic-qt frontends + local CMAKE_USE_DIR="${S}/gmic-qt" + mycmakeargs=( + -DENABLE_DYNAMIC_LINKING=ON + -DENABLE_CURL=$(usex curl) + -DGMIC_LIB_PATH="${BUILD_DIR}" + -DGMIC_PATH="${S}/src" + ) + + if use gimp; then + mycmakeargs+=( -DGMIC_QT_HOST=gimp ) + BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure + fi + + if use krita; then + mycmakeargs+=( -DGMIC_QT_HOST=krita ) + BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure + fi + + if use qt5; then + mycmakeargs+=( -DGMIC_QT_HOST=none ) + BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure + fi +} + +src_compile() { + cmake-utils_src_compile + + # build gmic-qt frontends + local S="${S}/gmic-qt" + use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; } + use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; } + use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; } +} + +src_install() { + cmake-utils_src_install + dodoc README + use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN} + + local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins" + insinto "${PLUGINDIR}" + doins resources/gmic_film_cluts.gmz + + # install gmic-qt frontends + if use gimp; then + exeinto "${PLUGINDIR}" + doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt + fi + use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt + use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt +} diff --git a/media-gfx/gmic/metadata.xml b/media-gfx/gmic/metadata.xml index 97ea96d21230..1cd8c96cdcae 100644 --- a/media-gfx/gmic/metadata.xml +++ b/media-gfx/gmic/metadata.xml @@ -7,6 +7,7 @@ Build CLI interface + Build media-gfx/krita plugin Enable support for webcams using the OpenCV library -- cgit v1.2.3