From fcac582e2ae9b489eb154d1bdd527afd2934b0b2 Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Sun, 5 Apr 2020 02:08:16 -0600 Subject: media-gfx/gmic: remove old Signed-off-by: Tim Harder --- media-gfx/gmic/Manifest | 2 - media-gfx/gmic/files/gmic-2.4.3-curl.patch | 100 --------------- media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch | 35 ----- media-gfx/gmic/gmic-2.8.1.ebuild | 171 ------------------------- media-gfx/gmic/gmic-2.8.2.ebuild | 170 ------------------------ 5 files changed, 478 deletions(-) delete mode 100644 media-gfx/gmic/files/gmic-2.4.3-curl.patch delete mode 100644 media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch delete mode 100644 media-gfx/gmic/gmic-2.8.1.ebuild delete mode 100644 media-gfx/gmic/gmic-2.8.2.ebuild (limited to 'media-gfx') diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest index ec37d7293384..e743820e3bde 100644 --- a/media-gfx/gmic/Manifest +++ b/media-gfx/gmic/Manifest @@ -1,4 +1,2 @@ -DIST gmic_2.8.1.tar.gz 5995556 BLAKE2B 3f3c35290d18c927745b4b527f5297a9c3beb109a34b7e8b70dcff064f2587e022616e0fe5063d79e94b8fbd0ce3f70b6b5417ebaa0f0cc0f61891d79330afa9 SHA512 0f9ae9454c6f053026cdace43b24e32183f384d79099bc654c3b154647d24ef6541b1fae62cb17e27e527fb51ed8cef03a46490af3ace1551646fc8b3cd64eb9 -DIST gmic_2.8.2.tar.gz 6170087 BLAKE2B 36bea32531fef3694c4bf295603c2327dba2391f8cb868393d01a86dd9dcc52a127584e8eaeeba79425aceb07fd3ee31e0383a182eb0956daa920122463c4a08 SHA512 80fbba0dd1f02fe23986f57190e6e4bb0df31ac8b4084ddcfa088fcf352b44484ada47704b42c9cd27f52a55e42247447c73181c0a84a4f0e54f064e9fc9ca9a DIST gmic_2.8.3.tar.gz 6172645 BLAKE2B 51a910ca9bb146173863f7f72dafec8ed42334757223055a5e174bebbed9e23372e1fdeb5b522c2120b203f4cbac0f255a9ada58fa62c7f83c745016d11bcabb SHA512 cde0e3fc50a97dae2b6d1dac1e7292a3d0af5e963586ec3e7ab6890721bc9617ea80b3bc86ec4cdc897d8b4ddc0fde552eea8322f8f337c447c603bcbc1403fd DIST gmic_2.9.0.tar.gz 6195597 BLAKE2B 3e1f83aa7e2024c545cab16c15cbd108ecaa33e7b0423c37cbb7e19fc9179280dfb31d819926110f06ff10a8b2b3e22b3c7f6c3e8bdece8b51c7295b8e78a974 SHA512 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d diff --git a/media-gfx/gmic/files/gmic-2.4.3-curl.patch b/media-gfx/gmic/files/gmic-2.4.3-curl.patch deleted file mode 100644 index f91f86ff0d48..000000000000 --- a/media-gfx/gmic/files/gmic-2.4.3-curl.patch +++ /dev/null @@ -1,100 +0,0 @@ -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/files/gmic-2.7.1-qt-cmake.patch b/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch deleted file mode 100644 index caf22d04ce94..000000000000 --- a/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch +++ /dev/null @@ -1,35 +0,0 @@ -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) diff --git a/media-gfx/gmic/gmic-2.8.1.ebuild b/media-gfx/gmic/gmic-2.8.1.ebuild deleted file mode 100644 index a4b190fb3199..000000000000 --- a/media-gfx/gmic/gmic-2.8.1.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_BUILD_TYPE=Release -inherit cmake bash-completion-r1 toolchain-funcs - -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} - gimp? ( dev-qt/linguist-tools ) - krita? ( dev-qt/linguist-tools ) - qt5? ( dev-qt/linguist-tools ) -" -BDEPEND="virtual/pkgconfig" - -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}"/${PN}-2.4.3-curl.patch ) - cmake_src_prepare - sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die - - if use gimp || use krita || use qt5; then - # respect user flags - sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die - local S="${S}/gmic-qt" - # fix linking with fftw when thread support is enabled - PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch ) - cmake_src_prepare - fi -} - -src_configure() { - local mycmakeargs=( - -DBUILD_LIB=ON - -DBUILD_LIB_STATIC=$(usex static-libs) - -DBUILD_CLI=$(usex cli) - -DBUILD_MAN=$(usex cli) - -DBUILD_BASH_COMPLETION=$(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_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_src_configure - fi - - if use krita; then - mycmakeargs+=( -DGMIC_QT_HOST=krita ) - BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure - fi - - if use qt5; then - mycmakeargs+=( -DGMIC_QT_HOST=none ) - BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure - fi -} - -src_compile() { - cmake_src_compile - - # build gmic-qt frontends - local S="${S}/gmic-qt" - use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; } - use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; } - use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; } -} - -src_install() { - cmake_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_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/gmic-2.8.2.ebuild b/media-gfx/gmic/gmic-2.8.2.ebuild deleted file mode 100644 index 660e4b3ff4dc..000000000000 --- a/media-gfx/gmic/gmic-2.8.2.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_BUILD_TYPE=Release -inherit cmake bash-completion-r1 toolchain-funcs - -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} - gimp? ( dev-qt/linguist-tools ) - krita? ( dev-qt/linguist-tools ) - qt5? ( dev-qt/linguist-tools ) -" -BDEPEND="virtual/pkgconfig" - -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() { - cmake_src_prepare - sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die - - if use gimp || use krita || use qt5; then - # respect user flags - sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \ - -e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \ - -i gmic-qt/CMakeLists.txt || die - local S="${S}/gmic-qt" - cmake_src_prepare - fi -} - -src_configure() { - local mycmakeargs=( - -DBUILD_LIB=ON - -DBUILD_LIB_STATIC=$(usex static-libs) - -DBUILD_CLI=$(usex cli) - -DBUILD_MAN=$(usex cli) - -DBUILD_BASH_COMPLETION=$(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_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_src_configure - fi - - if use krita; then - mycmakeargs+=( -DGMIC_QT_HOST=krita ) - BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure - fi - - if use qt5; then - mycmakeargs+=( -DGMIC_QT_HOST=none ) - BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure - fi -} - -src_compile() { - cmake_src_compile - - # build gmic-qt frontends - local S="${S}/gmic-qt" - use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; } - use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; } - use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; } -} - -src_install() { - cmake_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_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 -} -- cgit v1.2.3-65-gdbad