commit: 2370ccc23b716093107815bd8fe67472a79e2210 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Fri Dec 15 20:51:43 2023 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Fri Dec 15 20:55:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2370ccc2
media-gfx/gmic: treeclean Closes: https://bugs.gentoo.org/916289 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> media-gfx/gmic/Manifest | 2 - media-gfx/gmic/files/gmic-3.1.6-ar_so.patch | 26 ---- media-gfx/gmic/files/gmic-3.2.0-grep38.patch | 27 ---- .../gmic/files/gmic-3.2.4-makefile_automagic.patch | 131 ------------------- .../gmic/files/gmic-3.2.5-relative_rpath.patch | 22 ---- .../files/gmic-3.2.6-makefile_target_deps.patch | 11 -- media-gfx/gmic/gmic-3.2.6.ebuild | 140 --------------------- media-gfx/gmic/gmic-3.3.1.ebuild | 140 --------------------- media-gfx/gmic/metadata.xml | 12 -- profiles/package.mask | 10 -- profiles/targets/desktop/package.use | 4 - 11 files changed, 525 deletions(-) diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest deleted file mode 100644 index 25fea17dcfce..000000000000 --- a/media-gfx/gmic/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gmic_3.2.6.tar.gz 11574989 BLAKE2B abd33048a448ca8406169c61a9d97bf6e785cbb286cec1d5104f12960640de9eb292677256c074eee5371fa77ed7041671f77a63140c2fa58070c01404962be6 SHA512 26b222c94d68273a8ad4a0c72dca315cb0e17695e601f69cb06d44c49166b8c1050926b8c5d73d21a64613e6ba3b0462e730617db83d2c67b53674bf22e50395 -DIST gmic_3.3.1.tar.gz 18983077 BLAKE2B 1020168de6a80db4998d5f37a28f680a90cac6b0c7b91f3300105c4fdffc88df5517f4ff6439895f9bab91c27deea3436988b3e41c7a9e3b4d7dba6a69e8a552 SHA512 b31c3eac083e280203eb4651a22ed4d49d1b46e8a5a81400bb8cbb9bdd87cb1226f9017b7a1e52d493fbed38a580238c6242b033162213c32316d852ad0f90c5 diff --git a/media-gfx/gmic/files/gmic-3.1.6-ar_so.patch b/media-gfx/gmic/files/gmic-3.1.6-ar_so.patch deleted file mode 100644 index 007cdfb50de5..000000000000 --- a/media-gfx/gmic/files/gmic-3.1.6-ar_so.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/Makefile -+++ b/src/Makefile -@@ -414,7 +414,6 @@ - _lib : libgmic.so use_libgmic - - libgmic.so: libgmic.o -- ar rcs libgmic.a libgmic.o - ifeq ($(OS),Darwin) - $(CXX) -shared -std=c++11 -pedantic -o libgmic.so.$(VERSION) libgmic.o $(LIBS) - else -@@ -508,7 +507,6 @@ - @echo " done!" - - libcgmic.so: libcgmic.o -- ar rcs libcgmic.a libcgmic.o - ifeq ($(OS),Darwin) - $(CXX) -shared -o libcgmic.so.$(VERSION) libcgmic.o libgmic.o $(LIBS) - else -@@ -558,7 +556,6 @@ - _libc_static: libcgmic_files libcgmic_static.so use_libcgmic_static - - libcgmic_static.so: libcgmic_static.o -- ar rcs libcgmic_static.a libcgmic_static.o - ifeq ($(OS),Darwin) - $(CXX) -shared -static -o libcgmic_static.so.$(VERSION) libcgmic_static.o libgmic.o $(PIC) $(CFLAGS) $(LIBS) - else diff --git a/media-gfx/gmic/files/gmic-3.2.0-grep38.patch b/media-gfx/gmic/files/gmic-3.2.0-grep38.patch deleted file mode 100644 index e25a809fdeea..000000000000 --- a/media-gfx/gmic/files/gmic-3.2.0-grep38.patch +++ /dev/null @@ -1,27 +0,0 @@ -Starting with version 3.8, grep no longer quietly ignores backslashes -preceding a white-space character. - ---- a/src/Makefile -+++ b/src/Makefile -@@ -89,16 +89,16 @@ - WGET = wget --no-check-certificate --quiet -O - PLUGINDIR = $(shell gimptool-2.0 --gimpplugindir)/plug-ins - BASH_COMPLETIONSDIR = $(shell pkg-config --variable completionsdir bash-completion || echo $(PREFIX)/share/bash-completion/completions) --VERSION = $(shell grep 'gmic_version\ ' gmic.h | tail -c4 | head -c3) --VERSION1 = $(shell grep 'gmic_version\ ' gmic.h | tail -c4 | head -c1) --VERSION2 = $(shell grep 'gmic_version\ ' gmic.h | tail -c3 | head -c1) --VERSION3 = $(shell grep 'gmic_version\ ' gmic.h | tail -c2 | head -c1) -+VERSION = $(shell grep 'gmic_version ' gmic.h | tail -c4 | head -c3) -+VERSION1 = $(shell grep 'gmic_version ' gmic.h | tail -c4 | head -c1) -+VERSION2 = $(shell grep 'gmic_version ' gmic.h | tail -c3 | head -c1) -+VERSION3 = $(shell grep 'gmic_version ' gmic.h | tail -c2 | head -c1) - SVERSION=$(VERSION1).$(VERSION2).$(VERSION3) - SRC_PATH=$(shell pwd) - - # Check that versions of files 'CImg.h' and 'gmic.h' match. - ifneq (,$(wildcard CImg.h)) --CIMG_VERSION = $(shell grep 'cimg_version\ ' CImg.h | tail -c4 | head -c3) -+CIMG_VERSION = $(shell grep 'cimg_version ' CImg.h | tail -c4 | head -c3) - else - CIMG_VERSION = $(VERSION) - endif diff --git a/media-gfx/gmic/files/gmic-3.2.4-makefile_automagic.patch b/media-gfx/gmic/files/gmic-3.2.4-makefile_automagic.patch deleted file mode 100644 index 965ba65ae624..000000000000 --- a/media-gfx/gmic/files/gmic-3.2.4-makefile_automagic.patch +++ /dev/null @@ -1,131 +0,0 @@ ---- a/src/Makefile -+++ b/src/Makefile -@@ -230,6 +230,7 @@ - - # Enable parallelization in CImg, using OpenMP. - # (http://www.openmp.org/) -+ifeq ($(GMIC_USE_OPENMP),yes) - ifdef IS_CLANG - OPENMP_CFLAGS = -I/usr/lib/gcc/x86_64-linux-gnu/9/include -Dcimg_use_openmp -fopenmp=libomp - OPENMP_LIBS = -@@ -237,6 +238,7 @@ - OPENMP_CFLAGS = -fopenmp -Dcimg_use_openmp - OPENMP_LIBS = -lgomp - endif -+endif - - # Enable software debugging. - # (Use address sanitizer and thus slows down the code) -@@ -258,9 +260,13 @@ - # Enable image display, using X11 (Unix). - # (Keep /usr/ dirname here since X11 is located in /usr/ on Mac too) - ifneq ($(OS),Darwin) -+ifeq ($(GMIC_USE_X11),yes) - X11_CFLAGS = -Dcimg_display=1 $(shell pkg-config --cflags x11 || echo -I/usr/X11R6/include) #-Dcimg_use_xrandr - X11_LIBS = $(shell pkg-config --libs x11 || echo -L/usr/X11R6/lib -lX11) -lpthread # $(shell pkg-config --libs xrandr || echo -lXrandr) - else -+X11_CFLAGS = -Dcimg_display=0 -+endif -+else - ifeq (,$(wildcard /usr/X11)) - X11_CFLAGS = -Dcimg_display=0 #-Dcimg_use_xrandr - X11_LIBS = -lpthread # $(shell pkg-config --libs xrandr || echo -lXrandr) -@@ -272,8 +278,10 @@ - - # Enable faster X11 display, using XShm extension. - # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml) -+ifeq ($(GMIC_USE_XSHM),yes) - XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm) - XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(PREFIX)/X11R6/lib) -lXext -+endif - - # Enable image display, using GDI32 (Windows). - GDI32_CFLAGS = -Dcimg_display=2 -@@ -282,8 +290,10 @@ - # Enable native support of PNG image files, using the PNG library. - # (http://www.libpng.org/pub/png/libpng.html) - ifneq ($(OS),Darwin) -+ifeq ($(GMIC_USE_PNG),yes) - PNG_CFLAGS = -Dcimg_use_png $(shell pkg-config --cflags libpng) - PNG_LIBS = $(shell pkg-config --libs libpng || echo -lpng -lz) -+endif - else - ifeq (,$(wildcard /tmp/skl)) - PNG_CFLAGS = -Dcimg_use_png $(shell pkg-config --cflags libpng) -@@ -296,54 +306,74 @@ - - # Enable native support of JPEG image files, using the JPEG library. - # (http://libjpeg.sourceforge.net/) -+ifeq ($(GMIC_USE_JPEG),yes) - JPEG_CFLAGS = -Dcimg_use_jpeg $(shell pkg-config --cflags libjpeg) - JPEG_LIBS = $(shell pkg-config --libs libjpeg || echo -ljpeg) -+endif - - # Enable native support of TIFF image files, using the TIFF library. - # (http://www.libtiff.org/) -+ifeq ($(GMIC_USE_TIFF),yes) - TIFF_CFLAGS = -Dcimg_use_tiff $(shell pkg-config --cflags libtiff-4) - TIFF_LIBS = $(shell pkg-config --libs libtiff-4 || echo -ltiff) -+endif - - # Enable native support for loading HEIC/AVIF image files, using the libheif library. - # ( https://github.com/strukturag/libheif ) -+ifeq ($(GMIC_USE_HEIF),yes) - HEIF_CFLAGS = -Dcimg_use_heif - HEIF_LIBS = -lheif -+endif - - # Enable native support of MINC2 image files, using the MINC2 library. - # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide ) -+ifeq ($(GMIC_USE_MINC2),yes) - MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include - MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib -+endif - - # Enable native support for downloading files from the network. - # ( http://curl.haxx.se/libcurl/ ) -+ifeq ($(GMIC_USE_CURL),yes) - CURL_CFLAGS = -Dcimg_use_curl $(shell pkg-config --cflags libcurl) - CURL_LIBS = $(shell pkg-config --libs libcurl || echo -lcurl) -+endif - - # Enable native support of webcams and video streaming, using the OpenCV library. - # (https://opencv.org/) -+ifeq ($(GMIC_USE_OPENCV),yes) - OPENCV_CFLAGS = -Dcimg_use_opencv $(shell pkg-config opencv --cflags) -I/usr/include/opencv -I/usr/include/opencv4 - OPENCV_LIBS = $(shell pkg-config opencv --libs || echo -lopencv_core -lopencv_highgui -lopencv_videoio) -+endif - - # Enable support of most classical image file formats, using the GraphicsMagick++ library. - # (http://www.graphicsmagick.org/Magick++/) -+ifeq ($(GMIC_USE_GRAPHICSMAGICK),yes) - MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(PREFIX)/$(INCLUDE)/GraphicsMagick) - MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++) -+endif - - # 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$(PREFIX)/$(INCLUDE)/OpenEXR) --OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lIlmImf -lHalf) -+ifeq ($(GMIC_USE_EXR),yes) -+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) -+endif - - # Enable Fast Fourier Transforms, using the FFTW3 library. - # (http://www.fftw.org/) -+ifeq ($(GMIC_USE_FFTW),yes) - FFTW_CFLAGS = -Dcimg_use_fftw3 $(shell pkg-config --cflags fftw3) - FFTW_LIBS = $(shell pkg-config --libs fftw3 || echo -lfftw3) - FFTW_LIBS += -lfftw3_threads -+endif - - # Enable native support of the BOARD library. - # (https://github.com/c-koi/libboard) -+ifeq ($(GMIC_USE_BOARD),yes) - BOARD_CFLAGS = -Dcimg_use_board - BOARD_LIBS = -lboard -+endif - - GMIC_STD_CFLAGS = $(MANDATORY_CFLAGS) $(ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(FFTW_CFLAGS) $(CURL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS) - GMIC_STD_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(FFTW_LIBS) $(CURL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS) diff --git a/media-gfx/gmic/files/gmic-3.2.5-relative_rpath.patch b/media-gfx/gmic/files/gmic-3.2.5-relative_rpath.patch deleted file mode 100644 index 113aa57c34c5..000000000000 --- a/media-gfx/gmic/files/gmic-3.2.5-relative_rpath.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/Makefile -+++ b/src/Makefile -@@ -188,7 +188,7 @@ - ifndef NO_SRIPDLIB - MANDATORY_CFLAGS += -std=c++11 -pedantic - endif --MANDATORY_LIBS += -L. -L$(PREFIX)/$(LIB) -Wl,-rpath,. -+MANDATORY_LIBS += -L. -L$(PREFIX)/$(LIB) - ifdef IS_GCC - MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label - GCC_VER_GTEQ5 = $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 5) ---- a/gmic-qt/gmic_qt.pro -+++ b/gmic-qt/gmic_qt.pro -@@ -434,7 +434,7 @@ - - equals(GMIC_DYNAMIC_LINKING, "on" )|equals(GMIC_DYNAMIC_LINKING, "ON" ) { - message(Dynamic linking with libgmic) -- LIBS += -Wl,-rpath,. $$GMIC_PATH/libgmic.so -+ LIBS += $$GMIC_PATH/libgmic.so - } - - equals(GMIC_DYNAMIC_LINKING, "off" )|equals(GMIC_DYNAMIC_LINKING, "OFF" ) { diff --git a/media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch b/media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch deleted file mode 100644 index 6aea9e1579eb..000000000000 --- a/media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/Makefile -+++ b/src/Makefile -@@ -503,7 +503,7 @@ - libcgmic.o: gmic_libc.cpp CImg.h gmic_libc.h gmic.h - $(CXX) -o libcgmic.o -c gmic_libc.cpp -Dgmic_core $(PIC) $(CFLAGS) - --use_libcgmic: use_libcgmic.c gmic_libc.h -+use_libcgmic: use_libcgmic.c libcgmic.so - $(CC) -std=c99 -o use_libcgmic use_libcgmic.c -lcgmic $(LIBS) - - # libcgmic (static). diff --git a/media-gfx/gmic/gmic-3.2.6.ebuild b/media-gfx/gmic/gmic-3.2.6.ebuild deleted file mode 100644 index ce792e435b08..000000000000 --- a/media-gfx/gmic/gmic-3.2.6.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="GREYC's Magic Image Converter" -HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic"; -SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"; - -LICENSE="CeCILL-2 GPL-3" -SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X" - -REQUIRED_USE=" - gimp? ( png fftw X ) - qt5? ( png 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=" - sys-libs/zlib:0= - 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 - )" -RDEPEND="${DEPEND} - ffmpeg? ( media-video/ffmpeg:= ) -" -BDEPEND=" - virtual/pkgconfig - gimp? ( - dev-qt/linguist-tools:5 - media-gfx/gimp:0/2 - ) - qt5? ( dev-qt/linguist-tools:5 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.6-ar_so.patch - "${FILESDIR}"/${PN}-3.2.0-grep38.patch - "${FILESDIR}"/${PN}-3.2.4-makefile_automagic.patch - "${FILESDIR}"/${PN}-3.2.5-relative_rpath.patch - "${FILESDIR}"/${PN}-3.2.6-makefile_target_deps.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -gmic_emake() { - local mymakeargs=( - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - STRIP="/bin/true" - LIB="$(get_libdir)" - OPT_CFLAGS="${CXXFLAGS}" - OPT_LIBS="${LDFLAGS}" - GMIC_USE_CURL=$(usex curl) - GMIC_USE_EXR=$(usex openexr) - GMIC_USE_FFTW=$(usex fftw) - GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick) - GMIC_USE_JPEG=$(usex jpeg) - GMIC_USE_OPENCV=$(usex opencv) - GMIC_USE_OPENMP=$(usex openmp) - GMIC_USE_PNG=$(usex png) - GMIC_USE_TIFF=$(usex tiff) - GMIC_USE_X11=$(usex X) - QMAKE="qmake5" - ) - - # Possibly unnecessary since 3.2.0, just in case though. - tc-is-clang && mymakeargs+=( OPENMP_LIBS="-lomp" ) - - emake -j1 -C src \ - "${mymakeargs[@]}" \ - $@ -} - -src_compile() { - gmic_emake lib - gmic_emake libc - use cli && gmic_emake cli_shared - use gimp && gmic_emake gimp_shared - use qt5 && gmic_emake gmic_qt_shared -} - -src_install() { - # See below for why this has to name a directory even if USE=-gimp - local gimp_plugindir="/deleteme" - if use gimp; then - if type gimptool &>/dev/null; then - gimp_plugindir="$(gimptool --gimpplugindir)/plug-ins" - elif type gimptool-2.0 &>/dev/null; then - gimp_plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins" - elif type gimptool-2.99 &>/dev/null; then - gimp_plugindir="$(gimptool-2.99 --gimpplugindir)/plug-ins" - else - die "Cannot find GIMP plugin directory" - fi - fi - - gmic_emake DESTDIR="${ED}" PLUGINDIR="${gimp_plugindir}" install - - # Upstream build scripts create PLUGINDIR and write some files to it - # regardless of whether the GIMP plug-in has been built or not, or even - # when they haven't been able to execute gimptool to get the base path. - use gimp || rm -rf "${ED}/${gimp_plugindir}" - - # These are already gzipped in the source tarballs - find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} \; || die -} diff --git a/media-gfx/gmic/gmic-3.3.1.ebuild b/media-gfx/gmic/gmic-3.3.1.ebuild deleted file mode 100644 index 6987b6673d70..000000000000 --- a/media-gfx/gmic/gmic-3.3.1.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="GREYC's Magic Image Converter" -HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic"; -SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"; - -LICENSE="CeCILL-2 GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X" - -REQUIRED_USE=" - gimp? ( png fftw X ) - qt5? ( png 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=" - sys-libs/zlib:0= - 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 - )" -RDEPEND="${DEPEND} - ffmpeg? ( media-video/ffmpeg:= ) -" -BDEPEND=" - virtual/pkgconfig - gimp? ( - dev-qt/linguist-tools:5 - media-gfx/gimp:0/2 - ) - qt5? ( dev-qt/linguist-tools:5 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.6-ar_so.patch - "${FILESDIR}"/${PN}-3.2.0-grep38.patch - "${FILESDIR}"/${PN}-3.2.4-makefile_automagic.patch - "${FILESDIR}"/${PN}-3.2.5-relative_rpath.patch - "${FILESDIR}"/${PN}-3.2.6-makefile_target_deps.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -gmic_emake() { - local mymakeargs=( - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - STRIP="/bin/true" - LIB="$(get_libdir)" - OPT_CFLAGS="${CXXFLAGS}" - OPT_LIBS="${LDFLAGS}" - GMIC_USE_CURL=$(usex curl) - GMIC_USE_EXR=$(usex openexr) - GMIC_USE_FFTW=$(usex fftw) - GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick) - GMIC_USE_JPEG=$(usex jpeg) - GMIC_USE_OPENCV=$(usex opencv) - GMIC_USE_OPENMP=$(usex openmp) - GMIC_USE_PNG=$(usex png) - GMIC_USE_TIFF=$(usex tiff) - GMIC_USE_X11=$(usex X) - QMAKE="qmake5" - ) - - # Possibly unnecessary since 3.2.0, just in case though. - tc-is-clang && mymakeargs+=( OPENMP_LIBS="-lomp" ) - - emake -j1 -C src \ - "${mymakeargs[@]}" \ - $@ -} - -src_compile() { - gmic_emake lib - gmic_emake libc - use cli && gmic_emake cli_shared - use gimp && gmic_emake gimp_shared - use qt5 && gmic_emake gmic_qt_shared -} - -src_install() { - # See below for why this has to name a directory even if USE=-gimp - local gimp_plugindir="/deleteme" - if use gimp; then - if type gimptool &>/dev/null; then - gimp_plugindir="$(gimptool --gimpplugindir)/plug-ins" - elif type gimptool-2.0 &>/dev/null; then - gimp_plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins" - elif type gimptool-2.99 &>/dev/null; then - gimp_plugindir="$(gimptool-2.99 --gimpplugindir)/plug-ins" - else - die "Cannot find GIMP plugin directory" - fi - fi - - gmic_emake DESTDIR="${ED}" PLUGINDIR="${gimp_plugindir}" install - - # Upstream build scripts create PLUGINDIR and write some files to it - # regardless of whether the GIMP plug-in has been built or not, or even - # when they haven't been able to execute gimptool to get the base path. - use gimp || rm -rf "${ED}/${gimp_plugindir}" - - # These are already gzipped in the source tarballs - find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} \; || die -} diff --git a/media-gfx/gmic/metadata.xml b/media-gfx/gmic/metadata.xml deleted file mode 100644 index 03ab5c7d51c0..000000000000 --- a/media-gfx/gmic/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <use> - <flag name="cli">Build CLI interface</flag> - <flag name="opencv">Enable support for webcams using the OpenCV library</flag> - </use> - <upstream> - <remote-id type="github">GreycLab/gmic</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 269f558cef62..cabbf7535956 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -284,16 +284,6 @@ dev-libs/libtreadstone # Removal on 2023-11-25. Bug #722006. sci-electronics/freehdl -# Marek Szuba <mare...@gentoo.org> (2023-10-26) -# Upstream uses a massive home-made Makefile which has since the beginning -# required massive amounts of patching to make it behave reasonably -# (as well as to fix the problems which ostensibly led upstream to -# abandoning CMake, and which they immediately re-introduced in their NIH -# solution) and which if anything have only got worse since then. One, -# optional, reverse dependency in the tree. -# Removal on 2023-11-26. Bug #916289. -media-gfx/gmic - # Volkmar W. Pogatzki <gen...@pogatzki.net> (2023-10-23) # Java libraries. No reverse dependencies. # Removal on 2023-11-23. diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use index ec048da4370e..e55d347ecc35 100644 --- a/profiles/targets/desktop/package.use +++ b/profiles/targets/desktop/package.use @@ -35,10 +35,6 @@ dev-lang/python -bluetooth # Required by media-gfx/digikam, kde-apps/libkexiv2 media-gfx/exiv2 xmp -# Marek Szuba <mare...@gentoo.org> (2020-12-24) -# Required by qt5 -media-gfx/gmic fftw - # Lars Wendler <polynomia...@gentoo.org> (2020-08-06) # USE="qt5" and USE="libnotify" are mutually exclusive in this package # Disable libnotify here to have a better user experience
