Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libmypaint/files/, media-libs/libmypaint/
Date: Sat, 25 Jan 2020 22:41:31
Message-Id: 1579992051.13c54ec247bc0b7e1ee186027deea101b2e80753.asturm@gentoo
1 commit: 13c54ec247bc0b7e1ee186027deea101b2e80753
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 25 21:44:03 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 25 22:40:51 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13c54ec2
7
8 media-libs/libmypaint: Drop 1.3.0_beta1, 1.3.0 (r0), 1.3.0-r2, 1.3.0-r2
9
10 Package-Manager: Portage-2.3.85, Repoman-2.3.20
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-libs/libmypaint/Manifest | 1 -
14 .../files/libmypaint-1.3.0-gegl-0.4.14.patch | 100 ---------------------
15 .../files/libmypaint-1.3.0_beta1-as-needed.patch | 28 ------
16 media-libs/libmypaint/libmypaint-1.3.0-r2.ebuild | 68 --------------
17 media-libs/libmypaint/libmypaint-1.3.0-r3.ebuild | 68 --------------
18 media-libs/libmypaint/libmypaint-1.3.0.ebuild | 58 ------------
19 .../libmypaint/libmypaint-1.3.0_beta1.ebuild | 59 ------------
20 7 files changed, 382 deletions(-)
21
22 diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
23 index 8cf927365f9..02d424b8dd0 100644
24 --- a/media-libs/libmypaint/Manifest
25 +++ b/media-libs/libmypaint/Manifest
26 @@ -1,3 +1,2 @@
27 -DIST libmypaint-1.3.0-beta.1.tar.xz 421424 BLAKE2B 3ca1718035de301ffe037ab25b5e6e7c48f92a31ba337b6652977cae71d94e2fa11f01f81b87598e71392d51e13747e82d813d35e981753c85674f0f8b5bb167 SHA512 ae98ec8947d521749d82bc1e683efcace2da7e3c8b8453e79e5191d65225f0963394344628d646947f79b141503d268277d26ce2eeaf482bbe24f1bfb1d103fa
28 DIST libmypaint-1.3.0.tar.xz 438160 BLAKE2B a018ba2dc2b2cf2f771e871a0cb769887d962c18f83315d1c77864f567ae69aa16a1d55b770f46527990995f0dc940516371485d6f3d4f3cc332623fc408c248 SHA512 553eeb3439ffd0c013e33254a16334242583b8bab76d1a3e937f3ed1d7e05a832c6eb26acd7220dce20c6a7d997c32afe828202ce48e25a5fe57b67efd853fcf
29 DIST libmypaint-1.4.0.tar.xz 441596 BLAKE2B d8c55f8dfedbb5cc07abe5c38c935abecf38f8e626b7fec83d7f7a29acdc722ededcd729f31e13e655242250f1d46cf44ca0473899b0de9510b062b123a711cb SHA512 c549a0b8f02976f7863c5ff49d5f16b5c3eae3e6e9e8803fef833edf78cc2a7413dd8dd751ed560c79d2527e0a54b462a92bb8059bcf69271654b2629f583c19
30
31 diff --git a/media-libs/libmypaint/files/libmypaint-1.3.0-gegl-0.4.14.patch b/media-libs/libmypaint/files/libmypaint-1.3.0-gegl-0.4.14.patch
32 deleted file mode 100644
33 index d59cacb3a5d..00000000000
34 --- a/media-libs/libmypaint/files/libmypaint-1.3.0-gegl-0.4.14.patch
35 +++ /dev/null
36 @@ -1,100 +0,0 @@
37 -From 068e5f7ecacf152a9872441fb2f67b8578448a5b Mon Sep 17 00:00:00 2001
38 -From: Sebastian Pipping <sebastian@×××××××.org>
39 -Date: Sun, 28 Apr 2019 20:24:05 +0200
40 -Subject: [PATCH] Depend on Gegl >=0.4.14 rather than 0.3.x
41 -
42 -Inspired by
43 -https://src.fedoraproject.org/rpms/libmypaint/raw/master/f/libmypaint-1.3.0-gegl04.patch
44 -
45 -Gegl commit introducing breaking change to GeglBufferIterator:
46 -https://gitlab.gnome.org/GNOME/gegl/commit/9dcd2cde63f95a080bf16a58c10e9ffbdd99aace
47 ----
48 - configure.ac | 4 ++--
49 - gegl/Makefile.am | 4 ++--
50 - gegl/libmypaint-gegl.pc.in | 2 +-
51 - gegl/mypaint-gegl-surface.c | 5 +++--
52 - 4 files changed, 8 insertions(+), 7 deletions(-)
53 -
54 -diff --git a/configure.ac b/configure.ac
55 -index 7a5b231..95473d0 100644
56 ---- a/configure.ac
57 -+++ b/configure.ac
58 -@@ -22,7 +22,7 @@ m4_define([libmypaint_version_full],
59 - [libmypaint_api_major().libmypaint_api_minor().libmypaint_api_micro()m4_bpatsubst(libmypaint_api_prerelease(), [^\(.\)], [-\1])])
60 -
61 - # Dependencies.
62 --m4_define([gegl_required_version], [0.3])
63 -+m4_define([gegl_required_version], [0.4.14])
64 - m4_define([introspection_required_version], [1.32.0])
65 -
66 - AC_INIT([libmypaint],
67 -@@ -312,7 +312,7 @@ AC_ARG_ENABLE(gegl,
68 - )
69 -
70 - if eval "test x$enable_gegl = xyes"; then
71 -- PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version)
72 -+ PKG_CHECK_MODULES(GEGL, gegl-0.4 >= gegl_required_version)
73 - fi
74 - AM_CONDITIONAL(ENABLE_GEGL, test "x$enable_gegl" = "xyes")
75 -
76 -diff --git a/gegl/Makefile.am b/gegl/Makefile.am
77 -index b45707d..5ef22c1 100644
78 ---- a/gegl/Makefile.am
79 -+++ b/gegl/Makefile.am
80 -@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
81 - INTROSPECTION_GIRS =
82 - INTROSPECTION_SCANNER_ARGS = \
83 - --warn-all \
84 -- --pkg="gegl-0.3" \
85 -+ --pkg="gegl-0.4" \
86 - --pkg="glib-2.0" \
87 - --namespace="MyPaintGegl" \
88 - --nsversion="$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION)" \
89 -@@ -38,7 +38,7 @@ introspection_sources = \
90 - mypaint-gegl-surface.c
91 -
92 - MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl.la Makefile
93 --MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3
94 -+MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.4
95 - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I..
96 - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl.la ../libmypaint.la
97 - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources)
98 -diff --git a/gegl/libmypaint-gegl.pc.in b/gegl/libmypaint-gegl.pc.in
99 -index 75aa729..9184980 100644
100 ---- a/gegl/libmypaint-gegl.pc.in
101 -+++ b/gegl/libmypaint-gegl.pc.in
102 -@@ -6,6 +6,6 @@ includedir=@includedir@
103 - Name: libmypaint
104 - Description: MyPaint brush engine library, with GEGL integration.
105 - Version: @LIBMYPAINT_VERSION@
106 --Requires: gegl-0.3 libmypaint
107 -+Requires: gegl-0.4 libmypaint
108 - Cflags: -I${includedir}/libmypaint-gegl
109 - Libs: -L${libdir} -lmypaint-gegl
110 -diff --git a/gegl/mypaint-gegl-surface.c b/gegl/mypaint-gegl-surface.c
111 -index 5c86d3c..e51bb5f 100644
112 ---- a/gegl/mypaint-gegl-surface.c
113 -+++ b/gegl/mypaint-gegl-surface.c
114 -@@ -77,8 +77,9 @@ tile_request_start(MyPaintTiledSurface *tiled_surface, MyPaintTileRequest *reque
115 - }
116 -
117 - if (buffer_is_native(self)) {
118 -+ const gint max_slots = 6; /* i.e. <0.4.14 internal GEGL_BUFFER_MAX_ITERATORS */
119 - GeglBufferIterator *iterator = gegl_buffer_iterator_new(self->buffer, &tile_bbox, 0, self->format,
120 -- read_write_flags, GEGL_ABYSS_NONE);
121 -+ read_write_flags, GEGL_ABYSS_NONE, max_slots);
122 -
123 - // Read out
124 - gboolean completed = gegl_buffer_iterator_next(iterator);
125 -@@ -88,7 +89,7 @@ tile_request_start(MyPaintTiledSurface *tiled_surface, MyPaintTileRequest *reque
126 - g_critical("Unable to get tile aligned access to GeglBuffer");
127 - request->buffer = NULL;
128 - } else {
129 -- request->buffer = (uint16_t *)(iterator->data[0]);
130 -+ request->buffer = (uint16_t *)(iterator->items[0].data);
131 - }
132 -
133 - // So we can finish the iterator in tile_request_end()
134 ---
135 -2.21.0
136 -
137
138 diff --git a/media-libs/libmypaint/files/libmypaint-1.3.0_beta1-as-needed.patch b/media-libs/libmypaint/files/libmypaint-1.3.0_beta1-as-needed.patch
139 deleted file mode 100644
140 index 41e2aee786f..00000000000
141 --- a/media-libs/libmypaint/files/libmypaint-1.3.0_beta1-as-needed.patch
142 +++ /dev/null
143 @@ -1,28 +0,0 @@
144 -From b8eab3a5c264c90c30ab68c3abfccdfcfd1c6860 Mon Sep 17 00:00:00 2001
145 -From: Sebastian Pipping <sebastian@×××××××.org>
146 -Date: Mon, 25 Jul 2016 14:00:04 +0200
147 -Subject: [PATCH] Fix "make check" link errors
148 -
149 -.. for ./configure LDFLAGS="-Wl,--as-needed" --enable-gegl
150 ----
151 - tests/gegl/Makefile.am | 4 ++--
152 - 1 file changed, 2 insertions(+), 2 deletions(-)
153 -
154 -diff --git a/tests/gegl/Makefile.am b/tests/gegl/Makefile.am
155 -index a1f34ec..2804316 100644
156 ---- a/tests/gegl/Makefile.am
157 -+++ b/tests/gegl/Makefile.am
158 -@@ -29,8 +29,8 @@ endif
159 - LDADD = \
160 - $(DEPS) \
161 - $(GEGL_LIBS) \
162 -+ $(top_builddir)/tests/libmypaint-tests.a \
163 - $(top_builddir)/libmypaint.la \
164 -- $(top_builddir)/gegl/libmypaint-gegl.la \
165 -- $(top_builddir)/tests/libmypaint-tests.a
166 -+ $(top_builddir)/gegl/libmypaint-gegl.la
167 -
168 - endif
169 ---
170 -2.9.2
171 -
172
173 diff --git a/media-libs/libmypaint/libmypaint-1.3.0-r2.ebuild b/media-libs/libmypaint/libmypaint-1.3.0-r2.ebuild
174 deleted file mode 100644
175 index 4b4cf2fa194..00000000000
176 --- a/media-libs/libmypaint/libmypaint-1.3.0-r2.ebuild
177 +++ /dev/null
178 @@ -1,68 +0,0 @@
179 -# Copyright 1999-2019 Gentoo Authors
180 -# Distributed under the terms of the GNU General Public License v2
181 -
182 -EAPI=7
183 -PYTHON_COMPAT=( python2_7 )
184 -
185 -inherit autotools python-any-r1 xdg-utils toolchain-funcs
186 -
187 -MY_PV=${PV/_beta/-beta.}
188 -MY_P=${PN}-${MY_PV}
189 -
190 -DESCRIPTION="Library for making brushstrokes"
191 -HOMEPAGE="https://github.com/mypaint/libmypaint"
192 -SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_P}.tar.xz"
193 -
194 -LICENSE="ISC"
195 -SLOT="0/0" # first soname component for subslot
196 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
197 -IUSE="+gegl introspection nls openmp"
198 -
199 -CDEPEND="
200 - dev-libs/glib:2
201 - dev-libs/json-c:=
202 - gegl? (
203 - media-libs/babl
204 - >=media-libs/gegl-0.4.14:0.4[introspection?]
205 - )
206 - introspection? ( >=dev-libs/gobject-introspection-1.32 )
207 - openmp? ( sys-devel/gcc:*[openmp] )
208 - nls? ( sys-devel/gettext )
209 - "
210 -DEPEND="${CDEPEND}
211 - ${PYTHON_DEPS}
212 - nls? ( dev-util/intltool )
213 - "
214 -RDEPEND="${CDEPEND}
215 - !<media-gfx/mypaint-1.2.1
216 - "
217 -
218 -S="${WORKDIR}"/${MY_P}
219 -
220 -PATCHES=(
221 - "${FILESDIR}"/${PN}-1.3.0-gegl-0.4.14.patch
222 -)
223 -
224 -src_prepare() {
225 - xdg_environment_reset
226 - default
227 - eautoreconf
228 -}
229 -
230 -src_configure() {
231 - tc-ld-disable-gold # bug 589266
232 - econf \
233 - --disable-debug \
234 - --disable-docs \
235 - $(use_enable gegl) \
236 - --disable-gperftools \
237 - $(use_enable nls i18n) \
238 - $(use_enable introspection) \
239 - $(use_enable openmp) \
240 - --disable-profiling
241 -}
242 -
243 -src_install() {
244 - default
245 - find "${D}" -name '*.la' -type f -delete || die
246 -}
247
248 diff --git a/media-libs/libmypaint/libmypaint-1.3.0-r3.ebuild b/media-libs/libmypaint/libmypaint-1.3.0-r3.ebuild
249 deleted file mode 100644
250 index 00461e58187..00000000000
251 --- a/media-libs/libmypaint/libmypaint-1.3.0-r3.ebuild
252 +++ /dev/null
253 @@ -1,68 +0,0 @@
254 -# Copyright 1999-2019 Gentoo Authors
255 -# Distributed under the terms of the GNU General Public License v2
256 -
257 -EAPI=7
258 -PYTHON_COMPAT=( python2_7 )
259 -
260 -inherit autotools python-any-r1 xdg-utils toolchain-funcs
261 -
262 -MY_PV=${PV/_beta/-beta.}
263 -MY_P=${PN}-${MY_PV}
264 -
265 -DESCRIPTION="Library for making brushstrokes"
266 -HOMEPAGE="https://github.com/mypaint/libmypaint"
267 -SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_P}.tar.xz"
268 -
269 -LICENSE="ISC"
270 -SLOT="0/0" # first soname component for subslot
271 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
272 -IUSE="gegl introspection nls openmp"
273 -
274 -CDEPEND="
275 - dev-libs/glib:2
276 - dev-libs/json-c:=
277 - gegl? (
278 - media-libs/babl
279 - >=media-libs/gegl-0.4.14:0.4[introspection?]
280 - )
281 - introspection? ( >=dev-libs/gobject-introspection-1.32 )
282 - openmp? ( sys-devel/gcc:*[openmp] )
283 - nls? ( sys-devel/gettext )
284 - "
285 -DEPEND="${CDEPEND}
286 - ${PYTHON_DEPS}
287 - nls? ( dev-util/intltool )
288 - "
289 -RDEPEND="${CDEPEND}
290 - !<media-gfx/mypaint-1.2.1
291 - "
292 -
293 -S="${WORKDIR}"/${MY_P}
294 -
295 -PATCHES=(
296 - "${FILESDIR}"/${PN}-1.3.0-gegl-0.4.14.patch
297 -)
298 -
299 -src_prepare() {
300 - xdg_environment_reset
301 - default
302 - eautoreconf
303 -}
304 -
305 -src_configure() {
306 - tc-ld-disable-gold # bug 589266
307 - econf \
308 - --disable-debug \
309 - --disable-docs \
310 - $(use_enable gegl) \
311 - --disable-gperftools \
312 - $(use_enable nls i18n) \
313 - $(use_enable introspection) \
314 - $(use_enable openmp) \
315 - --disable-profiling
316 -}
317 -
318 -src_install() {
319 - default
320 - find "${D}" -name '*.la' -type f -delete || die
321 -}
322
323 diff --git a/media-libs/libmypaint/libmypaint-1.3.0.ebuild b/media-libs/libmypaint/libmypaint-1.3.0.ebuild
324 deleted file mode 100644
325 index 09ca008d3d5..00000000000
326 --- a/media-libs/libmypaint/libmypaint-1.3.0.ebuild
327 +++ /dev/null
328 @@ -1,58 +0,0 @@
329 -# Copyright 1999-2018 Gentoo Foundation
330 -# Distributed under the terms of the GNU General Public License v2
331 -
332 -EAPI=6
333 -PYTHON_COMPAT=( python2_7 )
334 -
335 -inherit eutils python-any-r1 xdg-utils toolchain-funcs
336 -
337 -MY_PV=${PV/_beta/-beta.}
338 -MY_P=${PN}-${MY_PV}
339 -
340 -DESCRIPTION="Library for making brushstrokes"
341 -HOMEPAGE="https://github.com/mypaint/libmypaint"
342 -SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_P}.tar.xz"
343 -
344 -LICENSE="ISC"
345 -SLOT="0/0" # first soname component for subslot
346 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
347 -IUSE="+gegl introspection nls openmp"
348 -
349 -CDEPEND="
350 - dev-libs/glib:2
351 - dev-libs/json-c:=
352 - gegl? (
353 - media-libs/babl
354 - media-libs/gegl:0.3[introspection?]
355 - )
356 - introspection? ( >=dev-libs/gobject-introspection-1.32 )
357 - openmp? ( sys-devel/gcc:*[openmp] )
358 - nls? ( sys-devel/gettext )
359 - "
360 -DEPEND="${CDEPEND}
361 - ${PYTHON_DEPS}
362 - nls? ( dev-util/intltool )
363 - "
364 -RDEPEND="${CDEPEND}
365 - !<media-gfx/mypaint-1.2.1
366 - "
367 -
368 -S="${WORKDIR}"/${MY_P}
369 -
370 -src_prepare() {
371 - xdg_environment_reset
372 - eapply_user
373 -}
374 -
375 -src_configure() {
376 - tc-ld-disable-gold # bug 589266
377 - econf \
378 - --disable-debug \
379 - --disable-docs \
380 - $(use_enable gegl) \
381 - --disable-gperftools \
382 - $(use_enable nls i18n) \
383 - $(use_enable introspection) \
384 - $(use_enable openmp) \
385 - --disable-profiling
386 -}
387
388 diff --git a/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild b/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild
389 deleted file mode 100644
390 index b56eba24562..00000000000
391 --- a/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild
392 +++ /dev/null
393 @@ -1,59 +0,0 @@
394 -# Copyright 1999-2018 Gentoo Foundation
395 -# Distributed under the terms of the GNU General Public License v2
396 -
397 -EAPI=6
398 -PYTHON_COMPAT=( python2_7 )
399 -
400 -inherit eutils python-any-r1 xdg-utils toolchain-funcs
401 -
402 -MY_PV=${PV/_beta/-beta.}
403 -MY_P=${PN}-${MY_PV}
404 -
405 -DESCRIPTION="Library for making brushstrokes"
406 -HOMEPAGE="https://github.com/mypaint/libmypaint"
407 -SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_P}.tar.xz"
408 -
409 -LICENSE="ISC"
410 -SLOT="0/0" # first soname component for subslot
411 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
412 -IUSE="+gegl introspection nls openmp"
413 -
414 -CDEPEND="
415 - dev-libs/glib:2
416 - dev-libs/json-c:=
417 - gegl? (
418 - media-libs/babl
419 - media-libs/gegl:0.3[introspection?]
420 - )
421 - introspection? ( >=dev-libs/gobject-introspection-1.32 )
422 - openmp? ( sys-devel/gcc:*[openmp] )
423 - nls? ( sys-devel/gettext )
424 - "
425 -DEPEND="${CDEPEND}
426 - ${PYTHON_DEPS}
427 - nls? ( dev-util/intltool )
428 - "
429 -RDEPEND="${CDEPEND}
430 - !<media-gfx/mypaint-1.2.2
431 - "
432 -
433 -S="${WORKDIR}"/${MY_P}
434 -
435 -src_prepare() {
436 - xdg_environment_reset
437 - epatch "${FILESDIR}"/${PN}-1.3.0_beta1-as-needed.patch
438 - eapply_user
439 -}
440 -
441 -src_configure() {
442 - tc-ld-disable-gold # bug 589266
443 - econf \
444 - --disable-debug \
445 - --disable-docs \
446 - $(use_enable gegl) \
447 - --disable-gperftools \
448 - $(use_enable nls i18n) \
449 - $(use_enable introspection) \
450 - $(use_enable openmp) \
451 - --disable-profiling
452 -}
Report Message
Find on MARC Find on Google Groups