From 42e82780761e75f17a5cc96626558a297782f385 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 10 Jun 2023 15:51:39 +0100 Subject: gentoo auto-resync : 10:06:2023 - 15:51:39 --- media-gfx/gmic/Manifest | 5 +- .../gmic/files/gmic-3.2.5-relative_rpath.patch | 22 ++++ media-gfx/gmic/gmic-3.2.4.ebuild | 139 --------------------- media-gfx/gmic/gmic-3.2.5.ebuild | 139 +++++++++++++++++++++ 4 files changed, 164 insertions(+), 141 deletions(-) create mode 100644 media-gfx/gmic/files/gmic-3.2.5-relative_rpath.patch delete mode 100644 media-gfx/gmic/gmic-3.2.4.ebuild create mode 100644 media-gfx/gmic/gmic-3.2.5.ebuild (limited to 'media-gfx/gmic') diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest index 9f7ed691ef82..262f363567d5 100644 --- a/media-gfx/gmic/Manifest +++ b/media-gfx/gmic/Manifest @@ -3,10 +3,11 @@ AUX gmic-3.2.0-grep38.patch 1330 BLAKE2B 22a241d8c574ca87691ec84107c718aa3640432 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 DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b DIST gmic_3.2.2.tar.gz 11321544 BLAKE2B e6786fdb0342e1dfa62043837fedeea25961b375af5d1dde247be373c0ef3e35a556dc78d6dd09b5b4c4ead3b531e2bb6a7b671a400dc9d477b22f1c6c7da6b9 SHA512 be695107f8cceb94789aaa021ca431ead3e0a7f87533478df0942ea6ad94f81639de8af827bb24fbef1baccc6ded8d41b4f5386ed9ee37704c2483ea7596800e -DIST gmic_3.2.4.tar.gz 11342611 BLAKE2B f189683e0d12e707c839009449804c9db7b8afc3ff02dd033e0f9b820e889f51f4ae84b0d1e790e836761384778f4da33d79bc7b159484bbf00ec9cf88df92b2 SHA512 0a261d6242b485d7661919c14680f25d7b15d175619d8115077808c5502edb4ed313f37b3b6c6981709751d49bc7df40332aaefc03e626303135a827a5d41daf +DIST gmic_3.2.5.tar.gz 11352319 BLAKE2B 812e28119bcbe485a7551c7afc89d7efb2a46ba3d9cc31597fddcd4c4ba48fa040827eccd92c1abbef3035c057d432f6b7b783ff9067da8be2806a05902bdf35 SHA512 e453b83201fa7aff7dc193c529c6b81306e94990a03356488abbbe3acdf8eb6b07e12c16e496e9607bcb730258218b3431c489b3fd1434bb31e28727be7eae27 EBUILD gmic-3.2.0.ebuild 3456 BLAKE2B 5e98b8d4ce0bc98c91ce5f77a92833ca4a48a17986fdac664528981451a723061b469ab3b502f5cb9988768cd9afd5bf03edf51573169f1a0bd261386b65fd98 SHA512 209ab91667f7574fb5cdd9e42a54f444d6c96ff91b55a5677c3e4c05284eae79d48237eac8bda942408df9ca7a2aa3b50f4827364cdba5a865e9774b4fe475d5 EBUILD gmic-3.2.2.ebuild 3471 BLAKE2B ca9e659dee49ae79135a998ba11109cafb0eb829ad0c5c1345b34fef1baabbf568e04a8d8c4ab428603a060417fd940f07d2d9c6bcb94ad98f6ee715106cb9d5 SHA512 8d9036a0d4f44725e50de73ce1812d0ee50b023ae11ababd4be3c9e8577f2168a65c4e133945c1009f56346b4470f9e2a78616b863732e76a9071357f22a55d7 -EBUILD gmic-3.2.4.ebuild 3471 BLAKE2B be12be0edcdc0cfb5bcc336058f4445b36dc3c168c9a007584860792c616ec3aba206d4397ac97f9f6ebfcdb39678f652d2e07a94a637dbf53b9fade6d9bc6d1 SHA512 9b8522d8c15a82cbed44e4a255487750d6a08cf4342c94a53d0cb25a73859a6ab180dabf6094cea5e587276fec2645188a6e75e808e1600ebf40ae5d3663524c +EBUILD gmic-3.2.5.ebuild 3471 BLAKE2B 877f5bcbf0b15e202ca28fdd35e6b5b38883cba8f808647c9a75cc6357b53b62eb66c5e54431afb4122028bdcff01cb79382163c2eba7387621ceb0af7f3edbd SHA512 f76eb11a0827bd026b3e234342e446bbc08e0ca8ba0a78a040dcd7a592b4749343a56def6f9f9eed81243f1a57dbbf45e9bc7fef1dc6735c52f9355459e1059b MISC metadata.xml 466 BLAKE2B 672259377cf7d693bc2493557b22150ddd3504d5bcb3f7b11c8e7e9a8ff591573503e5c9481d8a81e27757d4ebe205dd51a0fb57c0e691461988bc99fc714fc5 SHA512 62d65a13a3061fb31954fc08d753f6df7d76c262dc1c14304c1473dbe3f3412fb77cf808f0f205dc73d124f6dd1104c13d9dc79194eba702a0acdfb112fe6530 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 new file mode 100644 index 000000000000..113aa57c34c5 --- /dev/null +++ b/media-gfx/gmic/files/gmic-3.2.5-relative_rpath.patch @@ -0,0 +1,22 @@ +--- 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/gmic-3.2.4.ebuild b/media-gfx/gmic/gmic-3.2.4.ebuild deleted file mode 100644 index c8691f8d98b3..000000000000 --- a/media-gfx/gmic/gmic-3.2.4.ebuild +++ /dev/null @@ -1,139 +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-relative_rpath.patch - "${FILESDIR}"/${PN}-3.2.4-makefile_automagic.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.2.5.ebuild b/media-gfx/gmic/gmic-3.2.5.ebuild new file mode 100644 index 000000000000..e49f4fe6fe0d --- /dev/null +++ b/media-gfx/gmic/gmic-3.2.5.ebuild @@ -0,0 +1,139 @@ +# 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 +) + +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 +} -- cgit v1.2.3