commit: 13c54ec247bc0b7e1ee186027deea101b2e80753 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jan 25 21:44:03 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jan 25 22:40:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13c54ec2
media-libs/libmypaint: Drop 1.3.0_beta1, 1.3.0 (r0), 1.3.0-r2, 1.3.0-r2 Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/libmypaint/Manifest | 1 - .../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 ------------ 7 files changed, 382 deletions(-) diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest index 8cf927365f9..02d424b8dd0 100644 --- a/media-libs/libmypaint/Manifest +++ b/media-libs/libmypaint/Manifest @@ -1,3 +1,2 @@ -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 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 d59cacb3a5d..00000000000 --- 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 <[email protected]> -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@.@[email protected]: 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 41e2aee786f..00000000000 --- 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 <[email protected]> -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 4b4cf2fa194..00000000000 --- 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} - !<media-gfx/mypaint-1.2.1 - " - -S="${WORKDIR}"/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.0-gegl-0.4.14.patch -) - -src_prepare() { - xdg_environment_reset - default - eautoreconf -} - -src_configure() { - tc-ld-disable-gold # bug 589266 - econf \ - --disable-debug \ - --disable-docs \ - $(use_enable gegl) \ - --disable-gperftools \ - $(use_enable nls i18n) \ - $(use_enable introspection) \ - $(use_enable openmp) \ - --disable-profiling -} - -src_install() { - default - find "${D}" -name '*.la' -type f -delete || die -} diff --git a/media-libs/libmypaint/libmypaint-1.3.0-r3.ebuild b/media-libs/libmypaint/libmypaint-1.3.0-r3.ebuild deleted file mode 100644 index 00461e58187..00000000000 --- a/media-libs/libmypaint/libmypaint-1.3.0-r3.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} - !<media-gfx/mypaint-1.2.1 - " - -S="${WORKDIR}"/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.0-gegl-0.4.14.patch -) - -src_prepare() { - xdg_environment_reset - default - eautoreconf -} - -src_configure() { - tc-ld-disable-gold # bug 589266 - econf \ - --disable-debug \ - --disable-docs \ - $(use_enable gegl) \ - --disable-gperftools \ - $(use_enable nls i18n) \ - $(use_enable introspection) \ - $(use_enable openmp) \ - --disable-profiling -} - -src_install() { - default - find "${D}" -name '*.la' -type f -delete || die -} diff --git a/media-libs/libmypaint/libmypaint-1.3.0.ebuild b/media-libs/libmypaint/libmypaint-1.3.0.ebuild deleted file mode 100644 index 09ca008d3d5..00000000000 --- a/media-libs/libmypaint/libmypaint-1.3.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit eutils 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.3[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} - !<media-gfx/mypaint-1.2.1 - " - -S="${WORKDIR}"/${MY_P} - -src_prepare() { - xdg_environment_reset - eapply_user -} - -src_configure() { - tc-ld-disable-gold # bug 589266 - econf \ - --disable-debug \ - --disable-docs \ - $(use_enable gegl) \ - --disable-gperftools \ - $(use_enable nls i18n) \ - $(use_enable introspection) \ - $(use_enable openmp) \ - --disable-profiling -} diff --git a/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild b/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild deleted file mode 100644 index b56eba24562..00000000000 --- a/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit eutils 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 ~ppc64 ~x86" -IUSE="+gegl introspection nls openmp" - -CDEPEND=" - dev-libs/glib:2 - dev-libs/json-c:= - gegl? ( - media-libs/babl - media-libs/gegl:0.3[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} - !<media-gfx/mypaint-1.2.2 - " - -S="${WORKDIR}"/${MY_P} - -src_prepare() { - xdg_environment_reset - epatch "${FILESDIR}"/${PN}-1.3.0_beta1-as-needed.patch - eapply_user -} - -src_configure() { - tc-ld-disable-gold # bug 589266 - econf \ - --disable-debug \ - --disable-docs \ - $(use_enable gegl) \ - --disable-gperftools \ - $(use_enable nls i18n) \ - $(use_enable introspection) \ - $(use_enable openmp) \ - --disable-profiling -}
