diff options
author | Marek Szuba <marecki@gentoo.org> | 2023-04-02 23:17:15 +0100 |
---|---|---|
committer | Marek Szuba <marecki@gentoo.org> | 2023-04-02 23:19:50 +0100 |
commit | befe18f11de94a39094f23513a2fc94db233ab0e (patch) | |
tree | 2fd055c7965c6335e75838abe77893cc2c84d022 /media-gfx | |
parent | dev-vcs/git-machete: add 3.16.2 (diff) | |
download | gentoo-befe18f11de94a39094f23513a2fc94db233ab0e.tar.gz gentoo-befe18f11de94a39094f23513a2fc94db233ab0e.tar.bz2 gentoo-befe18f11de94a39094f23513a2fc94db233ab0e.zip |
media-gfx/gmic: drop 3.1.6-r1
Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/gmic/Manifest | 1 | ||||
-rw-r--r-- | media-gfx/gmic/files/gmic-3.1.6-grep38.patch | 27 | ||||
-rw-r--r-- | media-gfx/gmic/files/gmic-3.1.6-makefile_automagic.patch | 131 | ||||
-rw-r--r-- | media-gfx/gmic/files/gmic-3.1.6-relative_rpath.patch | 11 | ||||
-rw-r--r-- | media-gfx/gmic/gmic-3.1.6-r1.ebuild | 142 |
5 files changed, 0 insertions, 312 deletions
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest index 01aac4b89f1e..eae50d0177ae 100644 --- a/media-gfx/gmic/Manifest +++ b/media-gfx/gmic/Manifest @@ -1,3 +1,2 @@ -DIST gmic_3.1.6.tar.gz 10843311 BLAKE2B c50bcb9bd6c3d7d68a06f72faf0061d22b37c6fa357b40c16963c16a8841dba5ee8cf4509076a6734bb4eedbddfa2870897cb30687715ee6d7d84f2520700c17 SHA512 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775 DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b DIST gmic_3.2.2.tar.gz 11321544 BLAKE2B e6786fdb0342e1dfa62043837fedeea25961b375af5d1dde247be373c0ef3e35a556dc78d6dd09b5b4c4ead3b531e2bb6a7b671a400dc9d477b22f1c6c7da6b9 SHA512 be695107f8cceb94789aaa021ca431ead3e0a7f87533478df0942ea6ad94f81639de8af827bb24fbef1baccc6ded8d41b4f5386ed9ee37704c2483ea7596800e diff --git a/media-gfx/gmic/files/gmic-3.1.6-grep38.patch b/media-gfx/gmic/files/gmic-3.1.6-grep38.patch deleted file mode 100644 index ec1df70002c3..000000000000 --- a/media-gfx/gmic/files/gmic-3.1.6-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 -@@ -88,16 +88,16 @@ - EXE = - WGET = wget --no-check-certificate --quiet -O - PLUGINDIR = $(shell gimptool-2.0 --gimpplugindir)/plug-ins --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.1.6-makefile_automagic.patch b/media-gfx/gmic/files/gmic-3.1.6-makefile_automagic.patch deleted file mode 100644 index a716de6e55cc..000000000000 --- a/media-gfx/gmic/files/gmic-3.1.6-makefile_automagic.patch +++ /dev/null @@ -1,131 +0,0 @@ ---- a/src/Makefile -+++ b/src/Makefile -@@ -226,8 +226,12 @@ - - # Enable parallelization in CImg, using OpenMP. - # (http://www.openmp.org/) --OPENMP_CFLAGS = -fopenmp -Dcimg_use_openmp -+ifeq ($(GMIC_USE_OPENMP),yes) -+OPENMP_CFLAGS = -fopenmp -Dcimg_use_openmp=1 - OPENMP_LIBS = -lgomp -+else -+OPENMP_CFLAGS = -Dcimg_use_openmp=0 -+endif - - # Enable software debugging. - # (Use address sanitizer and thus slows down the code) -@@ -249,9 +253,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) -@@ -263,8 +271,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$(USR)/X11R6/lib) -lXext -+endif - - # Enable image display, using GDI32 (Windows). - GDI32_CFLAGS = -Dcimg_display=2 -@@ -273,8 +283,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) -@@ -287,56 +299,76 @@ - - # 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$(USR)/$(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$(USR)/$(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) - ifneq ($(OS),Windows) - FFTW_LIBS += -lfftw3_threads - endif -+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.1.6-relative_rpath.patch b/media-gfx/gmic/files/gmic-3.1.6-relative_rpath.patch deleted file mode 100644 index e2da793f31a8..000000000000 --- a/media-gfx/gmic/files/gmic-3.1.6-relative_rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/Makefile -+++ b/src/Makefile -@@ -187,7 +187,7 @@ - ifndef NO_SRIPDLIB - MANDATORY_CFLAGS += -std=c++11 -pedantic - endif --MANDATORY_LIBS += -L. -L$(USR)/$(LIB) -Wl,-rpath,. -+MANDATORY_LIBS += -L. -L$(USR)/$(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) diff --git a/media-gfx/gmic/gmic-3.1.6-r1.ebuild b/media-gfx/gmic/gmic-3.1.6-r1.ebuild deleted file mode 100644 index 900c5180f8da..000000000000 --- a/media-gfx/gmic/gmic-3.1.6-r1.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit 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" -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.1.6-grep38.patch - "${FILESDIR}"/${PN}-3.1.6-makefile_automagic.patch - "${FILESDIR}"/${PN}-3.1.6-relative_rpath.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" - ) - - tc-is-clang && mymakeargs+=( OPENMP_LIBS="-lomp" ) - - emake -j1 -C src \ - "${mymakeargs[@]}" \ - $@ -} - -src_compile() { - gmic_emake lib 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 -} |