From 76639e956cb332de1bfbf50143f11084d2686c65 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Aug 2023 03:47:58 +0100 Subject: gentoo auto-resync : 23:08:2023 - 03:47:58 --- media-gfx/gmic/Manifest | 4 - .../gmic/files/gmic-3.2.0-makefile_automagic.patch | 133 -------------------- .../gmic/files/gmic-3.2.0-relative_rpath.patch | 11 -- media-gfx/gmic/gmic-3.2.0.ebuild | 138 --------------------- 4 files changed, 286 deletions(-) delete mode 100644 media-gfx/gmic/files/gmic-3.2.0-makefile_automagic.patch delete mode 100644 media-gfx/gmic/files/gmic-3.2.0-relative_rpath.patch delete mode 100644 media-gfx/gmic/gmic-3.2.0.ebuild (limited to 'media-gfx/gmic') diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest index 293033de9216..eb2c2f523d77 100644 --- a/media-gfx/gmic/Manifest +++ b/media-gfx/gmic/Manifest @@ -1,12 +1,8 @@ AUX gmic-3.1.6-ar_so.patch 758 BLAKE2B 95031f8c3af292ef91d5cdf94406db158c74864c644571ad98630f9b3bd57d816c512a103cf6dd2adc86aa859d06bf73b3596f0c789d3e0d373f0ae0a7a6505f SHA512 19b424e189ddd3b3660a8a80821a907de86f79f22f6014f9af9f8f895bdef0e61c023b9d6859370bfec018274bacf3d13a0da5addf62430b6020f290ccca3f6f AUX gmic-3.2.0-grep38.patch 1330 BLAKE2B 22a241d8c574ca87691ec84107c718aa36404325891e3f50458753cc9051f1da3100206286ebeab2142360146b81b94ba3c063897722dd7b01730790f5672276 SHA512 46c078ef39cae6a0763a6e4e8d6ff9ac736b51e0b5f73fc6f75609fffa06eddd895f6803b5d39cfcd3bccb6e09549bdc0ca2ca3a7c1a2c8fa075869599eeb7d1 -AUX gmic-3.2.0-makefile_automagic.patch 5397 BLAKE2B f5678cf7aba485c9d035fc34c0a2a75133567e6c4b91dc0a58f8511f8858c6c5facc4fced4fb4582a2336d03b68f6a5e95cc3490de0385e4a083568a20769c17 SHA512 904dbddee273c6ebb80d94e24a508043766e43c712464d02631fa584634248379f01e989749d218965afa593865883da2ebe267ac9b1755ca116573cdcfeeb73 -AUX gmic-3.2.0-relative_rpath.patch 406 BLAKE2B cb92f21c090bfdb3c91aef60fc854fd21531ba8e7560458503ae0c123baf89a703057b870dc9a4366f179575373861696dedebd930c472a51644d4ef41553520 SHA512 8653697eea7da0b0db5ad9f7d8882a147a6aa9bd80085e6bfba21922431e52fa0b7e67c1c74afe8237a994861864f1df07ca2855c5d99bc0e69d0c630f11ebc7 AUX gmic-3.2.4-makefile_automagic.patch 5367 BLAKE2B 7f720d964746fdb745f7741b092f3b313d9d92fb885e4660cc869ee0cd11affd57ec405e6db4002bd1085d8809c9b5af310b78103cf036ca3a7af272adcc1f63 SHA512 bca841fbd9bbca0c89833fcc77c3921db1a3fd83a156b1d58c2d8cebdb025ff0c9ab5c29a2ff9e9ffefb739f9513a1e2844fd0746973423cfcd2ace60ab95743 AUX gmic-3.2.5-relative_rpath.patch 759 BLAKE2B 0c6deda724d6f983e9d1cf3101862fc5c3096fecd5951fc185c814bdb8e59774a30591ec969b4121951c3a1662ab5cb4040d4e9b9cfaa463496fc90bc59a301f SHA512 9c5daf6ad03002867594fc48c19c19b1050d9e7be3cab161e8fbe2f84a5fc31ceece2241c0bfa6cc9eaced44a6ceb0d716f485ca04e62a1160530316e4a3d50c AUX gmic-3.2.6-makefile_target_deps.patch 354 BLAKE2B bfa068ecb9f2b1e98c2eb992f9a5a90fbe3ed017c64840bec016677b204a2c18d5983a4e1fe6a9a372637684c51dcff1664bd82a5ad29fee0d03a9b81d12c64f SHA512 5d4b7ff4b08b24dede995f842ea768c69db03073c0026e0ca472abf6bb8cfe76c793a2980360fe162f6f9b611b22c567e393c6c5abab0b86dd8cf8566cdafe48 -DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b DIST gmic_3.2.6.tar.gz 11574989 BLAKE2B abd33048a448ca8406169c61a9d97bf6e785cbb286cec1d5104f12960640de9eb292677256c074eee5371fa77ed7041671f77a63140c2fa58070c01404962be6 SHA512 26b222c94d68273a8ad4a0c72dca315cb0e17695e601f69cb06d44c49166b8c1050926b8c5d73d21a64613e6ba3b0462e730617db83d2c67b53674bf22e50395 -EBUILD gmic-3.2.0.ebuild 3456 BLAKE2B 5e98b8d4ce0bc98c91ce5f77a92833ca4a48a17986fdac664528981451a723061b469ab3b502f5cb9988768cd9afd5bf03edf51573169f1a0bd261386b65fd98 SHA512 209ab91667f7574fb5cdd9e42a54f444d6c96ff91b55a5677c3e4c05284eae79d48237eac8bda942408df9ca7a2aa3b50f4827364cdba5a865e9774b4fe475d5 EBUILD gmic-3.2.6.ebuild 3522 BLAKE2B b36b004afc0b27a3a4d60bbe69fa89da8d3cc1ebbbaf864883f8bb6c58d2c22f011305b6b26cb575e389748e12970b8ea5f13c5a5074614b06e942c15408cc1c SHA512 b8cc14db663ff47889a4a653608229a8be0b16a088bfb557029df88eb086990b586f03da2b0d9769080b1b14b5e8df5147bd51b9fdfe1a49c20631e32870d482 MISC metadata.xml 466 BLAKE2B 672259377cf7d693bc2493557b22150ddd3504d5bcb3f7b11c8e7e9a8ff591573503e5c9481d8a81e27757d4ebe205dd51a0fb57c0e691461988bc99fc714fc5 SHA512 62d65a13a3061fb31954fc08d753f6df7d76c262dc1c14304c1473dbe3f3412fb77cf808f0f205dc73d124f6dd1104c13d9dc79194eba702a0acdfb112fe6530 diff --git a/media-gfx/gmic/files/gmic-3.2.0-makefile_automagic.patch b/media-gfx/gmic/files/gmic-3.2.0-makefile_automagic.patch deleted file mode 100644 index 6cab84226e98..000000000000 --- a/media-gfx/gmic/files/gmic-3.2.0-makefile_automagic.patch +++ /dev/null @@ -1,133 +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,56 +306,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$(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) - 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.2.0-relative_rpath.patch b/media-gfx/gmic/files/gmic-3.2.0-relative_rpath.patch deleted file mode 100644 index 85db75fbb4c4..000000000000 --- a/media-gfx/gmic/files/gmic-3.2.0-relative_rpath.patch +++ /dev/null @@ -1,11 +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) diff --git a/media-gfx/gmic/gmic-3.2.0.ebuild b/media-gfx/gmic/gmic-3.2.0.ebuild deleted file mode 100644 index d7382d8cbecc..000000000000 --- a/media-gfx/gmic/gmic-3.2.0.ebuild +++ /dev/null @@ -1,138 +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.0-makefile_automagic.patch - "${FILESDIR}"/${PN}-3.2.0-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" - ) - - # 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 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 -} -- cgit v1.2.3