1 |
commit: 2ce0cae31bea5242b5dc16fba53b61f837fe3f12 |
2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 28 09:50:31 2023 +0000 |
4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 28 10:42:27 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ce0cae3 |
7 |
|
8 |
media-gfx/gmic: drop 3.0.1-r3 |
9 |
|
10 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
11 |
|
12 |
media-gfx/gmic/Manifest | 1 - |
13 |
media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch | 16 -- |
14 |
.../gmic/files/gmic-3.0.1-openexr-3-imath.patch | 28 ---- |
15 |
media-gfx/gmic/gmic-3.0.1-r3.ebuild | 176 --------------------- |
16 |
4 files changed, 221 deletions(-) |
17 |
|
18 |
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest |
19 |
index 26174056ae0b..ccbaa655c45e 100644 |
20 |
--- a/media-gfx/gmic/Manifest |
21 |
+++ b/media-gfx/gmic/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a |
24 |
DIST gmic_3.1.6.tar.gz 10843311 BLAKE2B c50bcb9bd6c3d7d68a06f72faf0061d22b37c6fa357b40c16963c16a8841dba5ee8cf4509076a6734bb4eedbddfa2870897cb30687715ee6d7d84f2520700c17 SHA512 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775 |
25 |
DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b |
26 |
|
27 |
diff --git a/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch b/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch |
28 |
deleted file mode 100644 |
29 |
index 04cfa560f193..000000000000 |
30 |
--- a/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch |
31 |
+++ /dev/null |
32 |
@@ -1,16 +0,0 @@ |
33 |
-A GCC-specific setting from years ago. gcc-9 quietly ignores it (the |
34 |
-resulting binaries appear to be the same whether -fno-ipa-sra has been |
35 |
-specified or not), clang fails on it as not recognised. |
36 |
-Just get rid of it altogether. |
37 |
- |
38 |
---- a/CMakeLists.txt |
39 |
-+++ b/CMakeLists.txt |
40 |
-@@ -100,7 +100,7 @@ |
41 |
- if(APPLE) |
42 |
- list(APPEND GMIC_CXX_COMPILE_FLAGS -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive) |
43 |
- else() |
44 |
-- list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fno-ipa-sra -fpermissive) |
45 |
-+ list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fpermissive) |
46 |
- endif() |
47 |
- |
48 |
- if(NOT "${PRERELEASE_TAG}" STREQUAL "") |
49 |
|
50 |
diff --git a/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch b/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch |
51 |
deleted file mode 100644 |
52 |
index e97ef6bf6138..000000000000 |
53 |
--- a/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch |
54 |
+++ /dev/null |
55 |
@@ -1,28 +0,0 @@ |
56 |
-https://src.fedoraproject.org/rpms/gmic/raw/rawhide/f/gmic-openexr3.patch |
57 |
---- a/cmake/FindCImg.cmake |
58 |
-+++ b/cmake/FindCImg.cmake |
59 |
-@@ -147,7 +147,10 @@ if(ENABLE_JPEG) |
60 |
- endif() |
61 |
- |
62 |
- if(ENABLE_OPENEXR) |
63 |
-- find_package(OpenEXR) |
64 |
-+ find_package(OpenEXR CONFIG) |
65 |
-+ if(NOT TARGET OpenEXR::OpenEXR) |
66 |
-+ find_package(OpenEXR) |
67 |
-+ endif() |
68 |
- |
69 |
- if(OpenEXR_FOUND) |
70 |
- list(APPEND CLI_COMPILE_FLAGS "cimg_use_openexr") |
71 |
---- a/src/Makefile |
72 |
-+++ b/src/Makefile |
73 |
-@@ -307,8 +307,8 @@ |
74 |
- |
75 |
- # Enable native support of EXR image files, using the OpenEXR library. |
76 |
- # (http://www.openexr.com/) |
77 |
--OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR) |
78 |
--OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lIlmImf -lHalf) |
79 |
-+OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath) |
80 |
-+OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lOpenEXR -lImath) |
81 |
- |
82 |
- # Enable Fast Fourier Transforms, using the FFTW3 library. |
83 |
- # (http://www.fftw.org/) |
84 |
|
85 |
diff --git a/media-gfx/gmic/gmic-3.0.1-r3.ebuild b/media-gfx/gmic/gmic-3.0.1-r3.ebuild |
86 |
deleted file mode 100644 |
87 |
index bb07cf674b67..000000000000 |
88 |
--- a/media-gfx/gmic/gmic-3.0.1-r3.ebuild |
89 |
+++ /dev/null |
90 |
@@ -1,176 +0,0 @@ |
91 |
-# Copyright 1999-2023 Gentoo Authors |
92 |
-# Distributed under the terms of the GNU General Public License v2 |
93 |
- |
94 |
-EAPI=8 |
95 |
- |
96 |
-inherit cmake bash-completion-r1 toolchain-funcs |
97 |
- |
98 |
-if [[ ${PV} == "9999" ]]; then |
99 |
- EGIT_REPO_URI="https://github.com/dtschump/gmic.git" |
100 |
- inherit git-r3 |
101 |
-else |
102 |
- SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz" |
103 |
- KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" |
104 |
-fi |
105 |
- |
106 |
-DESCRIPTION="GREYC's Magic Image Converter" |
107 |
-HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic" |
108 |
- |
109 |
-LICENSE="CeCILL-2 GPL-3" |
110 |
-SLOT="0" |
111 |
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X zlib" |
112 |
-REQUIRED_USE=" |
113 |
- gimp? ( png zlib fftw X ) |
114 |
- qt5? ( png zlib fftw X ) |
115 |
-" |
116 |
- |
117 |
-MIN_QT_VER="5.2.0" |
118 |
-QT_DEPEND=" |
119 |
- >=dev-qt/qtcore-${MIN_QT_VER}:5= |
120 |
- >=dev-qt/qtgui-${MIN_QT_VER}:5= |
121 |
- >=dev-qt/qtnetwork-${MIN_QT_VER}:5= |
122 |
- >=dev-qt/qtwidgets-${MIN_QT_VER}:5= |
123 |
-" |
124 |
-DEPEND=" |
125 |
- curl? ( net-misc/curl ) |
126 |
- fftw? ( sci-libs/fftw:3.0=[threads] ) |
127 |
- gimp? ( |
128 |
- media-gfx/gimp:0/2 |
129 |
- ${QT_DEPEND} |
130 |
- ) |
131 |
- graphicsmagick? ( media-gfx/graphicsmagick:= ) |
132 |
- jpeg? ( media-libs/libjpeg-turbo:= ) |
133 |
- opencv? ( >=media-libs/opencv-2.3.1a-r1:= ) |
134 |
- openexr? ( |
135 |
- dev-libs/imath:= |
136 |
- media-libs/openexr:= |
137 |
- ) |
138 |
- png? ( media-libs/libpng:= ) |
139 |
- qt5? ( ${QT_DEPEND} ) |
140 |
- tiff? ( media-libs/tiff:= ) |
141 |
- X? ( |
142 |
- x11-libs/libX11 |
143 |
- x11-libs/libXext |
144 |
- ) |
145 |
- zlib? ( sys-libs/zlib:= )" |
146 |
-RDEPEND="${DEPEND} |
147 |
- ffmpeg? ( media-video/ffmpeg:= ) |
148 |
-" |
149 |
-BDEPEND=" |
150 |
- virtual/pkgconfig |
151 |
- gimp? ( dev-qt/linguist-tools:5 ) |
152 |
- qt5? ( dev-qt/linguist-tools:5 ) |
153 |
-" |
154 |
- |
155 |
-PATCHES=( |
156 |
- "${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch |
157 |
- "${FILESDIR}"/${PN}-3.0.1-openexr-3-imath.patch |
158 |
-) |
159 |
- |
160 |
-pkg_pretend() { |
161 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
162 |
-} |
163 |
- |
164 |
-pkg_setup() { |
165 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
166 |
-} |
167 |
- |
168 |
-src_prepare() { |
169 |
- cmake_src_prepare |
170 |
- sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die |
171 |
- |
172 |
- if use gimp || use qt5; then |
173 |
- # respect user flags |
174 |
- sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \ |
175 |
- -e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \ |
176 |
- -i gmic-qt/CMakeLists.txt || die |
177 |
- local S="${S}/gmic-qt" |
178 |
- # Bug #753377 |
179 |
- local PATCHES=() |
180 |
- cmake_src_prepare |
181 |
- fi |
182 |
-} |
183 |
- |
184 |
-src_configure() { |
185 |
- local mycmakeargs=( |
186 |
- -DBUILD_LIB=ON |
187 |
- -DBUILD_LIB_STATIC=no |
188 |
- -DBUILD_CLI=$(usex cli) |
189 |
- -DBUILD_MAN=$(usex cli) |
190 |
- -DBUILD_BASH_COMPLETION=$(usex cli) |
191 |
- -DCUSTOM_CFLAGS=ON |
192 |
- -DENABLE_CURL=$(usex curl) |
193 |
- -DENABLE_X=$(usex X) |
194 |
- -DENABLE_FFMPEG=$(usex ffmpeg) |
195 |
- -DENABLE_FFTW=$(usex fftw) |
196 |
- -DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick) |
197 |
- -DENABLE_JPEG=$(usex jpeg) |
198 |
- -DENABLE_OPENCV=$(usex opencv) |
199 |
- -DENABLE_OPENEXR=$(usex openexr) |
200 |
- -DENABLE_OPENMP=$(usex openmp) |
201 |
- -DENABLE_PNG=$(usex png) |
202 |
- -DENABLE_TIFF=$(usex tiff) |
203 |
- -DENABLE_ZLIB=$(usex zlib) |
204 |
- -DENABLE_DYNAMIC_LINKING=ON |
205 |
- ) |
206 |
- |
207 |
- cmake_src_configure |
208 |
- |
209 |
- # configure gmic-qt frontends |
210 |
- local CMAKE_USE_DIR="${S}/gmic-qt" |
211 |
- local mycmakeargs=( |
212 |
- -DENABLE_DYNAMIC_LINKING=ON |
213 |
- -DENABLE_CURL=$(usex curl) |
214 |
- -DGMIC_LIB_PATH="${BUILD_DIR}" |
215 |
- -DGMIC_PATH="${S}/src" |
216 |
- ) |
217 |
- |
218 |
- if use gimp; then |
219 |
- mycmakeargs+=( -DGMIC_QT_HOST=gimp ) |
220 |
- BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure |
221 |
- fi |
222 |
- |
223 |
- if use qt5; then |
224 |
- mycmakeargs+=( -DGMIC_QT_HOST=none ) |
225 |
- BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure |
226 |
- fi |
227 |
-} |
228 |
- |
229 |
-src_compile() { |
230 |
- cmake_src_compile |
231 |
- |
232 |
- # build gmic-qt frontends |
233 |
- local S="${S}/gmic-qt" |
234 |
- use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; } |
235 |
- use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; } |
236 |
-} |
237 |
- |
238 |
-src_install() { |
239 |
- cmake_src_install |
240 |
- |
241 |
- use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN} |
242 |
- |
243 |
- local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins" |
244 |
- insinto "${PLUGINDIR}" |
245 |
- doins resources/gmic_cluts.gmz |
246 |
- |
247 |
- # install gmic-qt frontends |
248 |
- if use gimp; then |
249 |
- exeinto "${PLUGINDIR}" |
250 |
- doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt |
251 |
- fi |
252 |
- use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt |
253 |
-} |
254 |
- |
255 |
-pkg_postinst() { |
256 |
- if [[ -n "${REPLACING_VERSIONS}" ]]; then |
257 |
- local v |
258 |
- for v in ${REPLACING_VERSIONS}; do |
259 |
- if ver_test "${v}" -le "3.0.0"; then |
260 |
- einfo "Note that starting with version 3.0.1 ${CATEGORY}/${PN} no longer provides a Krita interface." |
261 |
- einfo "Please use the built-in G'MIC plugin provided with Krita 5 instead." |
262 |
- break |
263 |
- fi |
264 |
- done |
265 |
- fi |
266 |
-} |