[arch-commits] Commit in libmypaint/repos (3 files)

Wed Sep 4 21:08:31 UTC 2019

Date: Wednesday, September 4, 2019 @ 21:08:31
  Author: anthraxx
Revision: 361623

archrelease: copy trunk to testing-x86_64

Added:
  libmypaint/repos/testing-x86_64/
  libmypaint/repos/testing-x86_64/PKGBUILD
    (from rev 361622, libmypaint/trunk/PKGBUILD)
  libmypaint/repos/testing-x86_64/gegl-0.4.patch
    (from rev 361622, libmypaint/trunk/gegl-0.4.patch)

----------------+
 PKGBUILD       |   49 +++++++++++++++++++++++++++++++++
 gegl-0.4.patch |   80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+)

Copied: libmypaint/repos/testing-x86_64/PKGBUILD (from rev 361622, libmypaint/trunk/PKGBUILD)
===================================================================

--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2019-09-04 21:08:31 UTC (rev 361623)
@@ -0,0 +1,49 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: twa022 <twa022 at gmail dot com>
+
+pkgname=libmypaint
+pkgver=1.4.0
+pkgrel=1
+pkgdesc='Library for making brushstrokes which is used by MyPaint and other projects'
+url='http://mypaint.org/'
+arch=('x86_64')
+license=('ISC')
+depends=('glibc' 'json-c' 'gegl' 'glib2' 'json-glib' 'babl')
+makedepends=('intltool' 'python' 'gobject-introspection' 'python')
+source=(https://github.com/mypaint/libmypaint/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
+        libmypaint-1.4-gegl-version-revert.patch::https://github.com/anthraxx/libmypaint/commit/5e0290c5fb8a175a9f0dd4c6897ff234361c321f.patch
+        gegl-0.4.patch)
+sha512sums=('d6c17381dbfc8ee346762f9b4d337ccc691e48b9004f0890c682be0911a2a8c9d35592461d54d55063298c16e81353b1f004f7a0c34bb96d7e511bf9b39cd7a7'
+            'dd1b4cb146c52865f02857ce9eefff9fc2341cd722e754536dc65613be6d437e63f367208200ab7b2811c0a1cf0f9e782d761667bc6df48c9cdb5cfbc7649019'
+            '0df26f4c8f6f6c31a4d5718d97b3338455fbdb9168167bcae36942f5dc1d5c61db1db2448cfa62cb4551356c7454a7ef91885042cb4529a410d6fc59597fa4b9')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Rp1 < ../libmypaint-1.4-gegl-version-revert.patch
+  patch -Np1 < ../gegl-0.4.patch
+  sed 's|python2|python|' -i autogen.sh
+  ./autogen.sh
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure \
+    --prefix=/usr \
+    --enable-gegl
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+check() {
+  cd ${pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  install -Dm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
+  install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+# vim: ts=2 sw=2 et:

Copied: libmypaint/repos/testing-x86_64/gegl-0.4.patch (from rev 361622, libmypaint/trunk/gegl-0.4.patch)
===================================================================
--- testing-x86_64/gegl-0.4.patch	                        (rev 0)
+++ testing-x86_64/gegl-0.4.patch	2019-09-04 21:08:31 UTC (rev 361623)
@@ -0,0 +1,80 @@
+diff -u -r libmypaint-1.3.0/configure.ac libmypaint-1.3.0-gegl/configure.ac
+--- libmypaint-1.3.0/configure.ac	2018-05-13 16:49:44.997077642 +0200
++++ libmypaint-1.3.0-gegl/configure.ac	2018-05-13 16:49:36.223744476 +0200
+@@ -45,7 +45,7 @@
+           [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])
+ m4_define([introspection_required_version], [1.32.0])
+ 
+ AC_INIT([libmypaint],
+@@ -336,7 +336,7 @@
+ )
+ 
+ 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 -u -r libmypaint-1.3.0/gegl/libmypaint-gegl.pc.in libmypaint-1.3.0-gegl/gegl/libmypaint-gegl.pc.in
+--- libmypaint-1.3.0/gegl/libmypaint-gegl.pc.in	2016-12-01 23:47:14.000000000 +0100
++++ libmypaint-1.3.0-gegl/gegl/libmypaint-gegl.pc.in	2018-05-13 16:50:16.620410376 +0200
+@@ -6,6 +6,6 @@
+ 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 -u -r libmypaint-1.3.0/gegl/Makefile.am libmypaint-1.3.0-gegl/gegl/Makefile.am
+--- libmypaint-1.3.0/gegl/Makefile.am	2018-05-13 16:48:53.437078622 +0200
++++ libmypaint-1.3.0-gegl/gegl/Makefile.am	2018-05-13 16:49:58.523744053 +0200
+@@ -11,7 +11,7 @@
+ 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 @@
+ 	mypaint-gegl-surface.c
+ 
+ MyPaintGegl- at LIBMYPAINT_MAJOR_VERSION@. at LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl.la Makefile
+-MyPaintGegl_ at LIBMYPAINT_MAJOR_VERSION@_ at LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3
++MyPaintGegl_ at LIBMYPAINT_MAJOR_VERSION@_ at LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.4
+ MyPaintGegl_ at LIBMYPAINT_MAJOR_VERSION@_ at LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I..
+ MyPaintGegl_ at LIBMYPAINT_MAJOR_VERSION@_ at LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl.la ../libmypaint.la
+ MyPaintGegl_ at LIBMYPAINT_MAJOR_VERSION@_ at LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources)
+
+--- a/gegl/mypaint-gegl-surface.c
++++ b/gegl/mypaint-gegl-surface.c
+@@ -78,7 +78,11 @@ tile_request_start(MyPaintTiledSurface *tiled_surface, MyPaintTileRequest *reque
+ 
+     if (buffer_is_native(self)) {
+         GeglBufferIterator *iterator = gegl_buffer_iterator_new(self->buffer, &tile_bbox, 0, self->format,
++#if GEGL_MAJOR_VERSION == 0 && GEGL_MINOR_VERSION == 4 && GEGL_MICRO_VERSION >= 14
++                                      read_write_flags, GEGL_ABYSS_NONE, 8);
++#else
+                                       read_write_flags, GEGL_ABYSS_NONE);
++#endif
+ 
+         // Read out
+         gboolean completed = gegl_buffer_iterator_next(iterator);
+@@ -88,7 +92,11 @@ tile_request_start(MyPaintTiledSurface *tiled_surface, MyPaintTileRequest *reque
+             g_critical("Unable to get tile aligned access to GeglBuffer");
+             request->buffer = NULL;
+         } else {
++#if GEGL_MAJOR_VERSION == 0 && GEGL_MINOR_VERSION == 4 && GEGL_MICRO_VERSION >= 14
++            request->buffer = (uint16_t *)(iterator->items[0].data);
++#else
+             request->buffer = (uint16_t *)(iterator->data[0]);
++#endif
+         }
+ 
+         // So we can finish the iterator in tile_request_end()

