From: "Tim Harder" <radhermit@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/
Date: Fri, 3 Jan 2020 06:34:08 +0000 (UTC) [thread overview]
Message-ID: <1578033098.4e9ad7bfce476e056f61fcaba6b256038bc6598e.radhermit@gentoo> (raw)
commit: 4e9ad7bfce476e056f61fcaba6b256038bc6598e
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 3 06:29:28 2020 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Jan 3 06:31:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e9ad7bf
media-gfx/gmic: remove old
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
media-gfx/gmic/Manifest | 2 -
media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch | 54 --------
media-gfx/gmic/gmic-2.7.0.ebuild | 171 -------------------------
media-gfx/gmic/gmic-2.7.1.ebuild | 171 -------------------------
4 files changed, 398 deletions(-)
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index edf579caa75..ccf872e7f68 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,4 +1,2 @@
-DIST gmic_2.7.0.tar.gz 5823828 BLAKE2B 5a59e247ca5eb5f1aad841597fb008d9816e3c968224b8f59e51bc443218292601f8b5eea76353429677eb3ddc3fcf8f8ff28eaedd3a8ec66d84ebeb825fe7d3 SHA512 8269540253774061b108b309463dfbadb76b925e36f5d62be59020fef4178fc83b79a221f32104880b51cd9d7aef67a698beb648c6e544e4e58b88796e46a0c4
-DIST gmic_2.7.1.tar.gz 5843308 BLAKE2B 8a348d9444ba0879816a438161c130e9fc706178f93c6a1202586209f2d3779dfce48d2bd3147b47dec9614e4a3687108913b45e6c91afc8bc6266aabee26012 SHA512 9a2f8536217ba449207022bb1dfc92d3826bea80f8e7a048880c5c4451070e7a09b21c0c17199941284040b8f3661dc93737d0f67975c58b6a7015038c49465e
DIST gmic_2.7.2.tar.gz 5848157 BLAKE2B 192eb02c1079072064d67d4cc834e8d674b55e0ce663501775ca2d31a4627129d9c1075d217800049e150c3dc7b6059c2521be1a594034df04beef416c6d888a SHA512 d8e26720d30235d613a618ce01615bd82fe0caf73979e5797865a459d7d7f877169111da98db88bfff62d0383e0301789aae7d3449ca9869d43847c6a5cbd7fb
DIST gmic_2.8.1.tar.gz 5995556 BLAKE2B 3f3c35290d18c927745b4b527f5297a9c3beb109a34b7e8b70dcff064f2587e022616e0fe5063d79e94b8fbd0ce3f70b6b5417ebaa0f0cc0f61891d79330afa9 SHA512 0f9ae9454c6f053026cdace43b24e32183f384d79099bc654c3b154647d24ef6541b1fae62cb17e27e527fb51ed8cef03a46490af3ace1551646fc8b3cd64eb9
diff --git a/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch b/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch
deleted file mode 100644
index e268558a95e..00000000000
--- a/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Fix linking with fftw when thread support is enabled and fix source code file
-name typo.
-
---- 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 or none.")
- if (${GMIC_QT_HOST} STREQUAL "none")
-@@ -143,8 +144,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
-@@ -185,6 +191,7 @@
- ${PNG_LIBRARIES}
- ${FFTW3_LIBRARIES}
- ${ZLIB_LIBRARIES}
-+ ${EXTRA_LIBRARIES}
- )
-
- if (CURL_FOUND)
-@@ -278,7 +285,7 @@
- src/FilterParameters/ChoiceParameter.h
- src/FilterParameters/ColorParameter.h
- src/FilterParameters/ConstParameter.h
-- src/FilterParameters/CustomDoubleSpinbox.h
-+ src/FilterParameters/CustomDoubleSpinBox.h
- src/FilterParameters/FileParameter.h
- src/FilterParameters/FilterParametersWidget.h
- src/FilterParameters/FloatParameter.h
-@@ -350,7 +357,7 @@
- src/FilterParameters/ChoiceParameter.cpp
- src/FilterParameters/ColorParameter.cpp
- src/FilterParameters/ConstParameter.cpp
-- src/FilterParameters/CustomDoubleSpinbox.cpp
-+ src/FilterParameters/CustomDoubleSpinBox.cpp
- src/FilterParameters/FileParameter.cpp
- src/FilterParameters/FilterParametersWidget.cpp
- src/FilterParameters/FloatParameter.cpp
diff --git a/media-gfx/gmic/gmic-2.7.0.ebuild b/media-gfx/gmic/gmic-2.7.0.ebuild
deleted file mode 100644
index 1edb9254ff0..00000000000
--- a/media-gfx/gmic/gmic-2.7.0.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
-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}
- 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-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=( "${FILESDIR}"/${PN}-2.6.7-qt-cmake.patch )
- 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)
- -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-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_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.7.1.ebuild b/media-gfx/gmic/gmic-2.7.1.ebuild
deleted file mode 100644
index 2a575ef1eb6..00000000000
--- a/media-gfx/gmic/gmic-2.7.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
-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}
- 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-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=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
- 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)
- -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-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_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
-}
next reply other threads:[~2020-01-03 6:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-03 6:34 Tim Harder [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-22 21:35 [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/ Marek Szuba
2023-08-21 15:49 Marek Szuba
2023-05-23 20:36 Marek Szuba
2023-04-02 22:20 Marek Szuba
2023-02-28 10:42 Marek Szuba
2022-09-01 14:54 Marek Szuba
2020-04-05 10:05 Tim Harder
2016-12-09 7:06 Tim Harder
2016-11-30 7:07 Tim Harder
2015-08-25 1:37 Tim Harder
2015-08-25 1:37 Tim Harder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1578033098.4e9ad7bfce476e056f61fcaba6b256038bc6598e.radhermit@gentoo \
--to=radhermit@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox