commit: 2ce0cae31bea5242b5dc16fba53b61f837fe3f12
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 09:50:31 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 10:42:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ce0cae3
media-gfx/gmic: drop 3.0.1-r3
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
media-gfx/gmic/Manifest | 1 -
media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch | 16 --
.../gmic/files/gmic-3.0.1-openexr-3-imath.patch | 28 ----
media-gfx/gmic/gmic-3.0.1-r3.ebuild | 176 ---------------------
4 files changed, 221 deletions(-)
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 26174056ae0b..ccbaa655c45e 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,2 @@
-DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B
b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03
SHA512
4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a
DIST gmic_3.1.6.tar.gz 10843311 BLAKE2B
c50bcb9bd6c3d7d68a06f72faf0061d22b37c6fa357b40c16963c16a8841dba5ee8cf4509076a6734bb4eedbddfa2870897cb30687715ee6d7d84f2520700c17
SHA512
7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775
DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B
6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d
SHA512
2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b
diff --git a/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch
b/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch
deleted file mode 100644
index 04cfa560f193..000000000000
--- a/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-A GCC-specific setting from years ago. gcc-9 quietly ignores it (the
-resulting binaries appear to be the same whether -fno-ipa-sra has been
-specified or not), clang fails on it as not recognised.
-Just get rid of it altogether.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -100,7 +100,7 @@
- if(APPLE)
- list(APPEND GMIC_CXX_COMPILE_FLAGS -mmacosx-version-min=10.8
-stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive)
- else()
-- list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fno-ipa-sra
-fpermissive)
-+ list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fpermissive)
- endif()
-
- if(NOT "${PRERELEASE_TAG}" STREQUAL "")
diff --git a/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch
b/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch
deleted file mode 100644
index e97ef6bf6138..000000000000
--- a/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://src.fedoraproject.org/rpms/gmic/raw/rawhide/f/gmic-openexr3.patch
---- a/cmake/FindCImg.cmake
-+++ b/cmake/FindCImg.cmake
-@@ -147,7 +147,10 @@ if(ENABLE_JPEG)
- endif()
-
- if(ENABLE_OPENEXR)
-- find_package(OpenEXR)
-+ find_package(OpenEXR CONFIG)
-+ if(NOT TARGET OpenEXR::OpenEXR)
-+ find_package(OpenEXR)
-+ endif()
-
- if(OpenEXR_FOUND)
- list(APPEND CLI_COMPILE_FLAGS "cimg_use_openexr")
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -307,8 +307,8 @@
-
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR ||
echo -I$(USR)/$(INCLUDE)/OpenEXR)
--OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lIlmImf -lHalf)
-+OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR ||
echo -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath)
-+OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lOpenEXR -lImath)
-
- # Enable Fast Fourier Transforms, using the FFTW3 library.
- # (http://www.fftw.org/)
diff --git a/media-gfx/gmic/gmic-3.0.1-r3.ebuild
b/media-gfx/gmic/gmic-3.0.1-r3.ebuild
deleted file mode 100644
index bb07cf674b67..000000000000
--- a/media-gfx/gmic/gmic-3.0.1-r3.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 arm64 ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic";
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png
qt5 tiff X zlib"
-REQUIRED_USE="
- gimp? ( 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=
-"
-DEPEND="
- curl? ( net-misc/curl )
- fftw? ( sci-libs/fftw:3.0=[threads] )
- gimp? (
- media-gfx/gimp:0/2
- ${QT_DEPEND}
- )
- graphicsmagick? ( media-gfx/graphicsmagick:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- opencv? ( >=media-libs/opencv-2.3.1a-r1:= )
- openexr? (
- dev-libs/imath:=
- media-libs/openexr:=
- )
- png? ( media-libs/libpng:= )
- qt5? ( ${QT_DEPEND} )
- tiff? ( media-libs/tiff:= )
- X? (
- x11-libs/libX11
- x11-libs/libXext
- )
- zlib? ( sys-libs/zlib:= )"
-RDEPEND="${DEPEND}
- ffmpeg? ( media-video/ffmpeg:= )
-"
-BDEPEND="
- virtual/pkgconfig
- gimp? ( dev-qt/linguist-tools:5 )
- qt5? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch
- "${FILESDIR}"/${PN}-3.0.1-openexr-3-imath.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
- cmake_src_prepare
- sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
- if use gimp || 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"
- # Bug #753377
- local PATCHES=()
- cmake_src_prepare
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_LIB=ON
- -DBUILD_LIB_STATIC=no
- -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"
- local 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 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 qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die
"failed building qt5 GUI" ; }
-}
-
-src_install() {
- cmake_src_install
-
- 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 qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}
-
-pkg_postinst() {
- if [[ -n "${REPLACING_VERSIONS}" ]]; then
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ver_test "${v}" -le "3.0.0"; then
- einfo "Note that starting with version 3.0.1
${CATEGORY}/${PN} no longer provides a Krita interface."
- einfo "Please use the built-in G'MIC plugin
provided with Krita 5 instead."
- break
- fi
- done
- fi
-}
