libmypaint-gegl.patch

   1 --- libmypaint-1.3.0/configure.ac~      2016-12-01 23:47:49.000000000 +0100
   2 +++ libmypaint-1.3.0/configure.ac       2018-04-29 14:07:21.040693575 +0200
   3 @@ -22,7 +22,7 @@ m4_define([libmypaint_version_full],
   4            [libmypaint_api_major().libmypaint_api_minor().libmypaint_api_micro()m4_bpatsubst(libmypaint_api_prerelease(), [^\(.\)], [-\1])])
   5
   6  # Dependencies.
   7 -m4_define([gegl_required_version], [0.3])
   8 +m4_define([gegl_required_version], [0.4])
   9  m4_define([introspection_required_version], [1.32.0])
  10
  11  AC_INIT([libmypaint],
  12 @@ -312,7 +312,7 @@ AC_ARG_ENABLE(gegl,
  13  )
  14
  15  if eval "test x$enable_gegl = xyes"; then
  16 -  PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version)
  17 +  PKG_CHECK_MODULES(GEGL, gegl-0.4 >= gegl_required_version)
  18  fi
  19  AM_CONDITIONAL(ENABLE_GEGL, test "x$enable_gegl" = "xyes")
  20
  21 --- libmypaint-1.3.0/gegl/Makefile.am~  2016-11-29 04:49:30.000000000 +0100
  22 +++ libmypaint-1.3.0/gegl/Makefile.am   2018-04-29 14:12:02.935879430 +0200
  23 @@ -11,7 +11,7 @@ AM_CPPFLAGS = \
  24  INTROSPECTION_GIRS =
  25  INTROSPECTION_SCANNER_ARGS = \
  26      --warn-all \
  27 -    --pkg="gegl-0.3" \
  28 +    --pkg="gegl-0.4" \
  29      --pkg="glib-2.0" \
  30      --namespace="MyPaintGegl" \
  31      --nsversion="$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION)" \
  32 @@ -38,7 +38,7 @@ introspection_sources = \
  33         mypaint-gegl-surface.c
  34
  35  MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl.la Makefile
  36 -MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3
  37 +MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.4
  38  MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I..
  39  MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl.la ../libmypaint.la
  40  MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources)
  41 --- libmypaint-1.3.0/gegl/libmypaint-gegl.pc.in.orig    2016-05-17 20:55:34.000000000 +0200
  42 +++ libmypaint-1.3.0/gegl/libmypaint-gegl.pc.in 2019-06-13 20:01:16.545170043 +0200
  43 @@ -6,6 +6,6 @@ includedir=@includedir@
  44  Name: libmypaint
  45  Description: MyPaint brush engine library, with GEGL integration.
  46  Version: @LIBMYPAINT_VERSION@
  47 -Requires: gegl-0.3 libmypaint
  48 +Requires: gegl-0.4 libmypaint
  49  Cflags: -I${includedir}/libmypaint-gegl
  50  Libs: -L${libdir} -lmypaint-gegl
  51 --- libmypaint-1.3.0/gegl/mypaint-gegl-surface.c.orig   2016-06-02 17:43:32.000000000 +0200
  52 +++ libmypaint-1.3.0/gegl/mypaint-gegl-surface.c        2019-06-13 19:04:35.830259962 +0200
  53 @@ -78,7 +78,7 @@ tile_request_start(MyPaintTiledSurface *
  54
  55      if (buffer_is_native(self)) {
  56          GeglBufferIterator *iterator = gegl_buffer_iterator_new(self->buffer, &tile_bbox, 0, self->format,
  57 -                                      read_write_flags, GEGL_ABYSS_NONE);
  58 +                                      read_write_flags, GEGL_ABYSS_NONE, 1);
  59
  60          // Read out
  61          gboolean completed = gegl_buffer_iterator_next(iterator);
  62 @@ -88,7 +88,7 @@ tile_request_start(MyPaintTiledSurface *
  63              g_critical("Unable to get tile aligned access to GeglBuffer");
  64              request->buffer = NULL;
  65          } else {
  66 -            request->buffer = (uint16_t *)(iterator->data[0]);
  67 +            request->buffer = (uint16_t *)(iterator->items[0].data);
  68          }
  69
  70          // So we can finish the iterator in tile_request_end()