1 |
commit: f77d2fb985376f03a272b2628ac5e140e76cbfe7 |
2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 14 15:32:47 2022 +0000 |
4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 14 15:35:06 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f77d2fb9 |
7 |
|
8 |
media-gfx/gmic: add 3.0.1, drop 2.9.9 |
9 |
|
10 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
11 |
|
12 |
media-gfx/gmic/Manifest | 2 +- |
13 |
.../gmic/{gmic-2.9.9.ebuild => gmic-3.0.1.ebuild} | 39 +++++++++++----------- |
14 |
2 files changed, 21 insertions(+), 20 deletions(-) |
15 |
|
16 |
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest |
17 |
index e4cdf89bbb61..d0e13ce81e85 100644 |
18 |
--- a/media-gfx/gmic/Manifest |
19 |
+++ b/media-gfx/gmic/Manifest |
20 |
@@ -1,2 +1,2 @@ |
21 |
-DIST gmic_2.9.9.tar.gz 7325061 BLAKE2B 256b4f1180edfc8ebb3a3e7f7666c7b44d95cd36a52c1b5539a355f022471eeef776c77b820864ca05b2ccc4a58a2e85970994cfdbce9e55aff31112af4e6000 SHA512 fcc129f5acfb32a3154d4c987f574c18ad68dd35e9e357fdc391166211747f5d7eed63a2fcde29c110a79e8665f2a6d1e70b68c81e19bb02be43a84ec7f1cc64 |
22 |
DIST gmic_3.0.0.tar.gz 10225122 BLAKE2B 1066c62c2c56fafbfd11608eb9e3b7c7e9a87b404aae1e7e673e21d9b7b76a599e241f16656786bfa35687f3b3921fcba96368227753105aa25e2fa451962bfa SHA512 89353d16d6304e322400c93bafb50f7557df93c933ed2994f33a17d877e4e12ec511a355b38058680f356bccab5aa84b607fab225354c19d4b8ab3e64424c87c |
23 |
+DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a |
24 |
|
25 |
diff --git a/media-gfx/gmic/gmic-2.9.9.ebuild b/media-gfx/gmic/gmic-3.0.1.ebuild |
26 |
similarity index 83% |
27 |
rename from media-gfx/gmic/gmic-2.9.9.ebuild |
28 |
rename to media-gfx/gmic/gmic-3.0.1.ebuild |
29 |
index 5591771336db..b2a210733dc4 100644 |
30 |
--- a/media-gfx/gmic/gmic-2.9.9.ebuild |
31 |
+++ b/media-gfx/gmic/gmic-3.0.1.ebuild |
32 |
@@ -1,10 +1,8 @@ |
33 |
-# Copyright 1999-2021 Gentoo Authors |
34 |
+# Copyright 1999-2022 Gentoo Authors |
35 |
# Distributed under the terms of the GNU General Public License v2 |
36 |
|
37 |
EAPI=8 |
38 |
|
39 |
-CMAKE_BUILD_TYPE=Release |
40 |
- |
41 |
inherit cmake bash-completion-r1 toolchain-funcs |
42 |
|
43 |
if [[ ${PV} == "9999" ]]; then |
44 |
@@ -12,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then |
45 |
inherit git-r3 |
46 |
else |
47 |
SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz" |
48 |
- KEYWORDS="amd64 arm64 x86" |
49 |
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" |
50 |
fi |
51 |
|
52 |
DESCRIPTION="GREYC's Magic Image Converter" |
53 |
@@ -20,10 +18,9 @@ HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic" |
54 |
|
55 |
LICENSE="CeCILL-2 GPL-3" |
56 |
SLOT="0" |
57 |
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib" |
58 |
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X zlib" |
59 |
REQUIRED_USE=" |
60 |
gimp? ( png zlib fftw X ) |
61 |
- krita? ( png zlib fftw X ) |
62 |
qt5? ( png zlib fftw X ) |
63 |
" |
64 |
|
65 |
@@ -43,7 +40,6 @@ COMMON_DEPEND=" |
66 |
) |
67 |
graphicsmagick? ( media-gfx/graphicsmagick:0= ) |
68 |
jpeg? ( virtual/jpeg:0 ) |
69 |
- krita? ( ${QT_DEPEND} ) |
70 |
opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) |
71 |
openexr? ( |
72 |
media-libs/ilmbase:0= |
73 |
@@ -62,13 +58,12 @@ RDEPEND="${COMMON_DEPEND} |
74 |
" |
75 |
DEPEND="${COMMON_DEPEND} |
76 |
gimp? ( dev-qt/linguist-tools ) |
77 |
- krita? ( dev-qt/linguist-tools ) |
78 |
qt5? ( dev-qt/linguist-tools ) |
79 |
" |
80 |
BDEPEND="virtual/pkgconfig" |
81 |
|
82 |
PATCHES=( |
83 |
- "${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch |
84 |
+ "${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch |
85 |
) |
86 |
|
87 |
pkg_pretend() { |
88 |
@@ -83,7 +78,7 @@ src_prepare() { |
89 |
cmake_src_prepare |
90 |
sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die |
91 |
|
92 |
- if use gimp || use krita || use qt5; then |
93 |
+ if use gimp || use qt5; then |
94 |
# respect user flags |
95 |
sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \ |
96 |
-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \ |
97 |
@@ -98,7 +93,7 @@ src_prepare() { |
98 |
src_configure() { |
99 |
local mycmakeargs=( |
100 |
-DBUILD_LIB=ON |
101 |
- -DBUILD_LIB_STATIC=$(usex static-libs) |
102 |
+ -DBUILD_LIB_STATIC=no |
103 |
-DBUILD_CLI=$(usex cli) |
104 |
-DBUILD_MAN=$(usex cli) |
105 |
-DBUILD_BASH_COMPLETION=$(usex cli) |
106 |
@@ -134,11 +129,6 @@ src_configure() { |
107 |
BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure |
108 |
fi |
109 |
|
110 |
- if use krita; then |
111 |
- mycmakeargs+=( -DGMIC_QT_HOST=krita ) |
112 |
- BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure |
113 |
- fi |
114 |
- |
115 |
if use qt5; then |
116 |
mycmakeargs+=( -DGMIC_QT_HOST=none ) |
117 |
BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure |
118 |
@@ -151,13 +141,12 @@ src_compile() { |
119 |
# build gmic-qt frontends |
120 |
local S="${S}/gmic-qt" |
121 |
use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; } |
122 |
- use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; } |
123 |
use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; } |
124 |
} |
125 |
|
126 |
src_install() { |
127 |
cmake_src_install |
128 |
- dodoc README |
129 |
+ |
130 |
use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN} |
131 |
|
132 |
local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins" |
133 |
@@ -169,6 +158,18 @@ src_install() { |
134 |
exeinto "${PLUGINDIR}" |
135 |
doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt |
136 |
fi |
137 |
- use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt |
138 |
use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt |
139 |
} |
140 |
+ |
141 |
+pkg_postinst() { |
142 |
+ if [[ -n "${REPLACING_VERSIONS}" ]]; then |
143 |
+ local v |
144 |
+ for v in ${REPLACING_VERSIONS}; do |
145 |
+ if ver_test "${v}" -le "3.0.0"; then |
146 |
+ einfo "Note that starting with version 3.0.1 ${CATEGORY}/${PN} no longer provides a Krita interface." |
147 |
+ einfo "Please use the built-in G'MIC plugin provided with Krita 5, or use an older version." |
148 |
+ break |
149 |
+ fi |
150 |
+ done |
151 |
+ fi |
152 |
+} |