From 2fd57282f0262ca084e05b0f2c63fbada395d02b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jan 2022 20:27:28 +0000 Subject: gentoo resync : 16.01.2021 --- media-gfx/gmic/Manifest | 6 +- media-gfx/gmic/gmic-2.9.9.ebuild | 174 -------------------------------------- media-gfx/gmic/gmic-3.0.0.ebuild | 2 +- media-gfx/gmic/gmic-3.0.1.ebuild | 175 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 179 insertions(+), 178 deletions(-) delete mode 100644 media-gfx/gmic/gmic-2.9.9.ebuild create mode 100644 media-gfx/gmic/gmic-3.0.1.ebuild (limited to 'media-gfx/gmic') diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest index 5ce8bfd1c79f..bcce2c0e1fec 100644 --- a/media-gfx/gmic/Manifest +++ b/media-gfx/gmic/Manifest @@ -1,7 +1,7 @@ AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e AUX gmic-3.0.0_ipa-sra.patch 665 BLAKE2B d1b47e2f0e8e63251172ee6cbc2c5b1bd86d100904a3d7bb0c5df39c051769b8b6c0aa0bb1f81010fd9ca195886a0dbce41528d31a811627ee28d1af58a83432 SHA512 4677fc93e72ed5e71a91197d364a04e1f8c6c13bb3f5b6eb5402a03c0d6ab395b54788669e028b932e207986121138419a58ed5f4333c0a45cbe6c0b9638ed96 -DIST gmic_2.9.9.tar.gz 7325061 BLAKE2B 256b4f1180edfc8ebb3a3e7f7666c7b44d95cd36a52c1b5539a355f022471eeef776c77b820864ca05b2ccc4a58a2e85970994cfdbce9e55aff31112af4e6000 SHA512 fcc129f5acfb32a3154d4c987f574c18ad68dd35e9e357fdc391166211747f5d7eed63a2fcde29c110a79e8665f2a6d1e70b68c81e19bb02be43a84ec7f1cc64 DIST gmic_3.0.0.tar.gz 10225122 BLAKE2B 1066c62c2c56fafbfd11608eb9e3b7c7e9a87b404aae1e7e673e21d9b7b76a599e241f16656786bfa35687f3b3921fcba96368227753105aa25e2fa451962bfa SHA512 89353d16d6304e322400c93bafb50f7557df93c933ed2994f33a17d877e4e12ec511a355b38058680f356bccab5aa84b607fab225354c19d4b8ab3e64424c87c -EBUILD gmic-2.9.9.ebuild 4259 BLAKE2B 5958f96d7bab5481fe3b3800a2f7327e1d4d6fe4b46e318206379ecf3b4b2e6e6a34963568eafe35e9426732a9fe81d6b45be6f80d6f2385a6f44b1fb3210234 SHA512 01867f8b3377db39ffb365033d2545bd2c73a4684bd4e3fd1a3b1b8ad4996f7a2fb036a44096aaee09123e9596ba635f9435a04791b973c40f084bef7c05bdb0 -EBUILD gmic-3.0.0.ebuild 4221 BLAKE2B 8551d6173a0f218b079d16fe9452a11b3b21a32a62e47a9f7cacb1bc049a2d928c8520f529e8737964995e1b278703f1be7fb9f4a7cbd82fe76e7f972e505944 SHA512 4c3a41b7d5f64bf2e27400aebec50c8c649ff62703a15ed0a298391281d2cce5a8ad24d3eddac79119620d4fe8197714318e783f855d0a45d73c94b995e8aa7c +DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a +EBUILD gmic-3.0.0.ebuild 4218 BLAKE2B bc0d0cad2242cb4ff8e828c390cc17b3ebf8bd50e18d81acbab8e02cf74b0de9a0bafb16545205bdaca11dd81c89caa343cfc2aa89747ee5102d5cb022f95eaf SHA512 9975caa9e60ca817e0257c5c872233e112bfa0199ca17521d4bda8d398f1a08588be3f7493bc7f7d6e7714972e83567f20de0a5502e683b9e2897a9acff3f3ed +EBUILD gmic-3.0.1.ebuild 4202 BLAKE2B fedf953be4fc0b777861128959cceaf68df2c08d73ca6c2f3c4f191ef110d6739e971959b26e31bc72132705b6adef83352b09e3d186ab125fb77120f16fd113 SHA512 9623391c7c58dce6be157c8c8e0917af2d1a0fdc853f28318e212cab6595fe94d84f9c4033d192d89c11e254c76d30bd47aed9d3b18a52b2fee24856aa611d18 MISC metadata.xml 534 BLAKE2B f229329b6cd7c9a79b7be93c64ce6e84e65391084c7d76b99ada95762c643fc445fe12fa55acc9b355b5f1fb86de7c0845ec34f921494df8cba3d90ca8c2a408 SHA512 e36403a679467cba0b0580810a27076214d676a74deb09a55f13a38bc06f5ff0999560e1ae00629047a682bcbf3b9e73243db8da3eaa24b275c24a0d1995fe3c diff --git a/media-gfx/gmic/gmic-2.9.9.ebuild b/media-gfx/gmic/gmic-2.9.9.ebuild deleted file mode 100644 index 5591771336db..000000000000 --- a/media-gfx/gmic/gmic-2.9.9.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_BUILD_TYPE=Release - -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 x86" -fi - -DESCRIPTION="GREYC's Magic Image Converter" -HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic" - -LICENSE="CeCILL-2 GPL-3" -SLOT="0" -IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib" -REQUIRED_USE=" - gimp? ( png zlib fftw X ) - krita? ( 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= -" -COMMON_DEPEND=" - curl? ( net-misc/curl ) - fftw? ( sci-libs/fftw:3.0=[threads] ) - gimp? ( - media-gfx/gimp:0/2 - ${QT_DEPEND} - ) - graphicsmagick? ( media-gfx/graphicsmagick:0= ) - jpeg? ( virtual/jpeg:0 ) - krita? ( ${QT_DEPEND} ) - opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) - openexr? ( - media-libs/ilmbase:0= - media-libs/openexr:0= - ) - png? ( media-libs/libpng:0= ) - qt5? ( ${QT_DEPEND} ) - tiff? ( media-libs/tiff:0 ) - X? ( - x11-libs/libX11 - x11-libs/libXext - ) - zlib? ( sys-libs/zlib:0= )" -RDEPEND="${COMMON_DEPEND} - ffmpeg? ( media-video/ffmpeg:0= ) -" -DEPEND="${COMMON_DEPEND} - gimp? ( dev-qt/linguist-tools ) - krita? ( dev-qt/linguist-tools ) - qt5? ( dev-qt/linguist-tools ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - if use openmp; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi - fi -} - -src_prepare() { - cmake_src_prepare - sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die - - if use gimp || use krita || 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=$(usex static-libs) - -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" - 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 krita; then - mycmakeargs+=( -DGMIC_QT_HOST=krita ) - BUILD_DIR="${BUILD_DIR}"/krita 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 krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; } - use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; } -} - -src_install() { - cmake_src_install - dodoc README - 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 krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt - use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt -} diff --git a/media-gfx/gmic/gmic-3.0.0.ebuild b/media-gfx/gmic/gmic-3.0.0.ebuild index f8eead423554..2ef54b68ee93 100644 --- a/media-gfx/gmic/gmic-3.0.0.ebuild +++ b/media-gfx/gmic/gmic-3.0.0.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" fi DESCRIPTION="GREYC's Magic Image Converter" diff --git a/media-gfx/gmic/gmic-3.0.1.ebuild b/media-gfx/gmic/gmic-3.0.1.ebuild new file mode 100644 index 000000000000..b2a210733dc4 --- /dev/null +++ b/media-gfx/gmic/gmic-3.0.1.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2022 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/dtschump/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= +" +COMMON_DEPEND=" + curl? ( net-misc/curl ) + fftw? ( sci-libs/fftw:3.0=[threads] ) + gimp? ( + media-gfx/gimp:0/2 + ${QT_DEPEND} + ) + graphicsmagick? ( media-gfx/graphicsmagick:0= ) + jpeg? ( virtual/jpeg:0 ) + opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) + openexr? ( + media-libs/ilmbase:0= + media-libs/openexr:0= + ) + png? ( media-libs/libpng:0= ) + qt5? ( ${QT_DEPEND} ) + tiff? ( media-libs/tiff:0 ) + X? ( + x11-libs/libX11 + x11-libs/libXext + ) + zlib? ( sys-libs/zlib:0= )" +RDEPEND="${COMMON_DEPEND} + ffmpeg? ( media-video/ffmpeg:0= ) +" +DEPEND="${COMMON_DEPEND} + gimp? ( dev-qt/linguist-tools ) + qt5? ( dev-qt/linguist-tools ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + if use openmp; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi + fi +} + +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" + 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, or use an older version." + break + fi + done + fi +} -- cgit v1.2.3