From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- media-libs/libmypaint/Manifest | 9 +- .../files/libmypaint-1.3.0-gegl-0.4.14.patch | 100 --------------------- .../files/libmypaint-1.3.0_beta1-as-needed.patch | 28 ------ media-libs/libmypaint/libmypaint-1.3.0-r2.ebuild | 68 -------------- media-libs/libmypaint/libmypaint-1.3.0-r3.ebuild | 68 -------------- media-libs/libmypaint/libmypaint-1.3.0.ebuild | 58 ------------ .../libmypaint/libmypaint-1.3.0_beta1.ebuild | 59 ------------ media-libs/libmypaint/libmypaint-1.4.0.ebuild | 4 +- 8 files changed, 3 insertions(+), 391 deletions(-) delete mode 100644 media-libs/libmypaint/files/libmypaint-1.3.0-gegl-0.4.14.patch delete mode 100644 media-libs/libmypaint/files/libmypaint-1.3.0_beta1-as-needed.patch delete mode 100644 media-libs/libmypaint/libmypaint-1.3.0-r2.ebuild delete mode 100644 media-libs/libmypaint/libmypaint-1.3.0-r3.ebuild delete mode 100644 media-libs/libmypaint/libmypaint-1.3.0.ebuild delete mode 100644 media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild (limited to 'media-libs/libmypaint') diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest index 1860006ddd59..d3a3525e918f 100644 --- a/media-libs/libmypaint/Manifest +++ b/media-libs/libmypaint/Manifest @@ -1,14 +1,7 @@ -AUX libmypaint-1.3.0-gegl-0.4.14.patch 4368 BLAKE2B f4094718153e1cf08a173f2a350fc63e0993de839763b1e733214c1966c00f14e8c5e760b0ccc113401d82078af92b19938f9bd6ea96ca3caf41883eef82d548 SHA512 cb0cf38330d820681d6b089884ac8af13ac24c0600807a5c301bd03a5387df9e1a17caf3519985deb188a28b4a9c8d6c5f9d19cf2a481a4a696c871f997244d2 -AUX libmypaint-1.3.0_beta1-as-needed.patch 804 BLAKE2B 8aa4f9215651b540cb9517851f13bea57df56b4ad9cacfe7d2e176060773a6ae4f0e7506cc4325b72cdb8b99e1c4bd0bb274dd1956262909a33d66834cdce618 SHA512 49853d92f723690d67edb35b01e0907c314b07f99f468e73256faaaa49d4d3a7a35fd4b7b0d897223c14f4567d2f8d33689a21deee80d82413f72e840fea888c AUX libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch 2841 BLAKE2B ae03c291a4d0bc46e9e9daeea2760937273e910edf233a32ff257a10f10d81dbf7b91922bcfcd9c472b0c5190dbc1a51b313f092140a89e963702e1981f65291 SHA512 8034b0a332a5adf3c922009262d7cc602e0d16dc3050e967190b69fcec2d77b57378ebff674a058fe8d7ccece4cf74e61c82b54c823d1f75c5501c82e658798b AUX libmypaint-1.4.0-gegl-0.4.14.patch 4198 BLAKE2B dad2b852ed3c8a68cba650993fa923491aecf31ff28784cd26f58486f62b1a66ee27c51320ba225489be66ad222389fabff819eaec1065e42f958bdd4f9b8a92 SHA512 100b0a6b3f2de32b6cee35924904e75a2c8c6ebd1483a8e02087945144ff078d6a570ebef8160c06194eb0965ebc78cd1d16232a85778414a8552926405bc783 -DIST libmypaint-1.3.0-beta.1.tar.xz 421424 BLAKE2B 3ca1718035de301ffe037ab25b5e6e7c48f92a31ba337b6652977cae71d94e2fa11f01f81b87598e71392d51e13747e82d813d35e981753c85674f0f8b5bb167 SHA512 ae98ec8947d521749d82bc1e683efcace2da7e3c8b8453e79e5191d65225f0963394344628d646947f79b141503d268277d26ce2eeaf482bbe24f1bfb1d103fa DIST libmypaint-1.3.0.tar.xz 438160 BLAKE2B a018ba2dc2b2cf2f771e871a0cb769887d962c18f83315d1c77864f567ae69aa16a1d55b770f46527990995f0dc940516371485d6f3d4f3cc332623fc408c248 SHA512 553eeb3439ffd0c013e33254a16334242583b8bab76d1a3e937f3ed1d7e05a832c6eb26acd7220dce20c6a7d997c32afe828202ce48e25a5fe57b67efd853fcf DIST libmypaint-1.4.0.tar.xz 441596 BLAKE2B d8c55f8dfedbb5cc07abe5c38c935abecf38f8e626b7fec83d7f7a29acdc722ededcd729f31e13e655242250f1d46cf44ca0473899b0de9510b062b123a711cb SHA512 c549a0b8f02976f7863c5ff49d5f16b5c3eae3e6e9e8803fef833edf78cc2a7413dd8dd751ed560c79d2527e0a54b462a92bb8059bcf69271654b2629f583c19 EBUILD libmypaint-1.3.0-r1.ebuild 1379 BLAKE2B e3603b7a33c563d63cae697e8bca9f1c4dbb94d6872f96207db9867a53108ca78270e637c6063a747158ecffcfedabb687c6a06b6a3c897f5679c32c45326635 SHA512 4343dc01b4d811b94f5b735a6b42a4ce11330c3f62675d5a0e06b68adf9b2ab49b3103f6189874f0c1a5fc5ede3b2a7de4547f47fa91dca90bcc0f0588e3ecc9 -EBUILD libmypaint-1.3.0-r2.ebuild 1461 BLAKE2B 2f6429f2b99c144dba254bce0f20d8110f553d6007c23b8d933090d2adbfe749249415ac42bcea68f4d0cd874fab7cc2b1c3791e899b05f85ed2689e5314cb8b SHA512 e21750363fc23262d7614ee879bd9580e95cfa0bf10cef555eea73a39f52edbe4cb8db7f71b5e755dca05170245326b244f8509111c7a87a31128ee39b0a1189 -EBUILD libmypaint-1.3.0-r3.ebuild 1460 BLAKE2B 2c7f85266a13d2111b3c22203e179f238b61afcd7b97a330be8c434ea2c0701cef33f0cb8d9b64cdb9f6182c55617f070be0a5481a8d09df3387430ab1532d80 SHA512 7e415ad9f8eada7da6e30f8a8bf45ecf2fc0c73286f8f01183d259383b7c4a36c58fa79042a75d96feb2a02c6283554da88031d938d661bab51a22bb9f4755bf -EBUILD libmypaint-1.3.0.ebuild 1308 BLAKE2B 3687ae2f158f53afe6768ae4db384098f0f34a606562224831bfc6a44f6aef8921067a93b8fad5678413abe6de328aed787ba8d5069d32c3e7ea5ba9622adca3 SHA512 b7efa95bd8315bedf22a8415e742507569ee38243c167d4f09668cc6477878f25642a4947867e550030f244b1c97f16647f0e90ebf8c8b52daa163608c200c9b -EBUILD libmypaint-1.3.0_beta1.ebuild 1346 BLAKE2B 84a0e4528d9ce0096f39d2f3f495f1809d1e49f20230f06f9411aec57097197a7aae94724807e85879eee30a1692dbf6b843c2b24f1aef96279aca4f81119bf1 SHA512 4ff1f158d528fac42e70c268a89884ff23b46810fcba8452a7426657537fd246c65e45e8e0e75280f8d0e03b863b2c5552b1c16164cfa97bf6d7a7096b0257e8 -EBUILD libmypaint-1.4.0.ebuild 1557 BLAKE2B b8b263f5e1b4b21b626935e804c7bb52fef66ee317fbb0a471037012600155a4ec0879aa3d145dd937d05aa208f416a4305b7ef66822ead7338f12a250e7e1e0 SHA512 8a1203f1af30c0d9ef23fc504ff7eef02f2d468bbe5001185c82b05e73226dddbd8a27af1b117b04135bb93d624338e81e9eb9f5d3eb63f3bd0b9792ee9bd40f +EBUILD libmypaint-1.4.0.ebuild 1555 BLAKE2B 20c7fde8d07575df537f208890bf45ba552aa1efe6aafe37a792daf21d28ec150e554290cfe169595cccd4020c082117cb6ffa49f43315781bc359329475508e SHA512 c3685b89a00747c57f7b2739d27914044b77b87fd14d6062aa97bd9732f89180f28ea0892e54c2045e57e351e76664dc97b5c38a7f88038cb49ac6a55a9f1cea MISC metadata.xml 335 BLAKE2B 9147fdc98c832807587c5435133f971898c59c5adc5bb17a49a4632c5eb051d1e7e43d7fbefb15f80763771c58faef55e505b8441309c5676130c3e0dd18eee3 SHA512 fd20f4baaf0a494c651b433e3c7a0a75d82db0264ce4ba0d8e34f965f7389bbc5ad27e222b3dcaab307042338993a2761765f217c87d80a83f53a909caadfbdc 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 deleted file mode 100644 index d59cacb3a5d3..000000000000 --- a/media-libs/libmypaint/files/libmypaint-1.3.0-gegl-0.4.14.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 068e5f7ecacf152a9872441fb2f67b8578448a5b Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Sun, 28 Apr 2019 20:24:05 +0200 -Subject: [PATCH] Depend on Gegl >=0.4.14 rather than 0.3.x - -Inspired by -https://src.fedoraproject.org/rpms/libmypaint/raw/master/f/libmypaint-1.3.0-gegl04.patch - -Gegl commit introducing breaking change to GeglBufferIterator: -https://gitlab.gnome.org/GNOME/gegl/commit/9dcd2cde63f95a080bf16a58c10e9ffbdd99aace ---- - configure.ac | 4 ++-- - gegl/Makefile.am | 4 ++-- - gegl/libmypaint-gegl.pc.in | 2 +- - gegl/mypaint-gegl-surface.c | 5 +++-- - 4 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7a5b231..95473d0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,7 @@ m4_define([libmypaint_version_full], - [libmypaint_api_major().libmypaint_api_minor().libmypaint_api_micro()m4_bpatsubst(libmypaint_api_prerelease(), [^\(.\)], [-\1])]) - - # Dependencies. --m4_define([gegl_required_version], [0.3]) -+m4_define([gegl_required_version], [0.4.14]) - m4_define([introspection_required_version], [1.32.0]) - - AC_INIT([libmypaint], -@@ -312,7 +312,7 @@ AC_ARG_ENABLE(gegl, - ) - - if eval "test x$enable_gegl = xyes"; then -- PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version) -+ PKG_CHECK_MODULES(GEGL, gegl-0.4 >= gegl_required_version) - fi - AM_CONDITIONAL(ENABLE_GEGL, test "x$enable_gegl" = "xyes") - -diff --git a/gegl/Makefile.am b/gegl/Makefile.am -index b45707d..5ef22c1 100644 ---- a/gegl/Makefile.am -+++ b/gegl/Makefile.am -@@ -11,7 +11,7 @@ AM_CPPFLAGS = \ - INTROSPECTION_GIRS = - INTROSPECTION_SCANNER_ARGS = \ - --warn-all \ -- --pkg="gegl-0.3" \ -+ --pkg="gegl-0.4" \ - --pkg="glib-2.0" \ - --namespace="MyPaintGegl" \ - --nsversion="$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION)" \ -@@ -38,7 +38,7 @@ introspection_sources = \ - mypaint-gegl-surface.c - - MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl.la Makefile --MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3 -+MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.4 - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I.. - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl.la ../libmypaint.la - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources) -diff --git a/gegl/libmypaint-gegl.pc.in b/gegl/libmypaint-gegl.pc.in -index 75aa729..9184980 100644 ---- a/gegl/libmypaint-gegl.pc.in -+++ b/gegl/libmypaint-gegl.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: libmypaint - Description: MyPaint brush engine library, with GEGL integration. - Version: @LIBMYPAINT_VERSION@ --Requires: gegl-0.3 libmypaint -+Requires: gegl-0.4 libmypaint - Cflags: -I${includedir}/libmypaint-gegl - Libs: -L${libdir} -lmypaint-gegl -diff --git a/gegl/mypaint-gegl-surface.c b/gegl/mypaint-gegl-surface.c -index 5c86d3c..e51bb5f 100644 ---- a/gegl/mypaint-gegl-surface.c -+++ b/gegl/mypaint-gegl-surface.c -@@ -77,8 +77,9 @@ tile_request_start(MyPaintTiledSurface *tiled_surface, MyPaintTileRequest *reque - } - - if (buffer_is_native(self)) { -+ const gint max_slots = 6; /* i.e. <0.4.14 internal GEGL_BUFFER_MAX_ITERATORS */ - GeglBufferIterator *iterator = gegl_buffer_iterator_new(self->buffer, &tile_bbox, 0, self->format, -- read_write_flags, GEGL_ABYSS_NONE); -+ read_write_flags, GEGL_ABYSS_NONE, max_slots); - - // Read out - gboolean completed = gegl_buffer_iterator_next(iterator); -@@ -88,7 +89,7 @@ tile_request_start(MyPaintTiledSurface *tiled_surface, MyPaintTileRequest *reque - g_critical("Unable to get tile aligned access to GeglBuffer"); - request->buffer = NULL; - } else { -- request->buffer = (uint16_t *)(iterator->data[0]); -+ request->buffer = (uint16_t *)(iterator->items[0].data); - } - - // So we can finish the iterator in tile_request_end() --- -2.21.0 - 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 deleted file mode 100644 index 41e2aee786f4..000000000000 --- a/media-libs/libmypaint/files/libmypaint-1.3.0_beta1-as-needed.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b8eab3a5c264c90c30ab68c3abfccdfcfd1c6860 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Mon, 25 Jul 2016 14:00:04 +0200 -Subject: [PATCH] Fix "make check" link errors - -.. for ./configure LDFLAGS="-Wl,--as-needed" --enable-gegl ---- - tests/gegl/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/gegl/Makefile.am b/tests/gegl/Makefile.am -index a1f34ec..2804316 100644 ---- a/tests/gegl/Makefile.am -+++ b/tests/gegl/Makefile.am -@@ -29,8 +29,8 @@ endif - LDADD = \ - $(DEPS) \ - $(GEGL_LIBS) \ -+ $(top_builddir)/tests/libmypaint-tests.a \ - $(top_builddir)/libmypaint.la \ -- $(top_builddir)/gegl/libmypaint-gegl.la \ -- $(top_builddir)/tests/libmypaint-tests.a -+ $(top_builddir)/gegl/libmypaint-gegl.la - - endif --- -2.9.2 - diff --git a/media-libs/libmypaint/libmypaint-1.3.0-r2.ebuild b/media-libs/libmypaint/libmypaint-1.3.0-r2.ebuild deleted file mode 100644 index 4b4cf2fa1944..000000000000 --- a/media-libs/libmypaint/libmypaint-1.3.0-r2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 ) - -inherit autotools python-any-r1 xdg-utils toolchain-funcs - -MY_PV=${PV/_beta/-beta.} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Library for making brushstrokes" -HOMEPAGE="https://github.com/mypaint/libmypaint" -SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_P}.tar.xz" - -LICENSE="ISC" -SLOT="0/0" # first soname component for subslot -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="+gegl introspection nls openmp" - -CDEPEND=" - dev-libs/glib:2 - dev-libs/json-c:= - gegl? ( - media-libs/babl - >=media-libs/gegl-0.4.14:0.4[introspection?] - ) - introspection? ( >=dev-libs/gobject-introspection-1.32 ) - openmp? ( sys-devel/gcc:*[openmp] ) - nls? ( sys-devel/gettext ) - " -DEPEND="${CDEPEND} - ${PYTHON_DEPS} - nls? ( dev-util/intltool ) - " -RDEPEND="${CDEPEND} - !