Attachment #597446 for bug #701098

Lines 45-51 m4_define([libmypaint_api_platform_version], Link Here

(-)a/configure.ac (-2 / +2 lines)
45		45
46	## Dependencies ##	46	## Dependencies ##
47		47
48	m4_define([gegl_required_version], [0.3])	48	m4_define([gegl_required_version], [0.4])
49	m4_define([introspection_required_version], [1.32.0])	49	m4_define([introspection_required_version], [1.32.0])
50		50
51	AC_INIT([libmypaint],	51	AC_INIT([libmypaint],
Lines 273-279 AC_ARG_ENABLE(gegl, Link Here
273	)	273	)
274		274
275	if eval "test x$enable_gegl = xyes"; then	275	if eval "test x$enable_gegl = xyes"; then
276	PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version)	276	PKG_CHECK_MODULES(GEGL, gegl-0.4 >= gegl_required_version)
277	fi	277	fi
278	AM_CONDITIONAL(ENABLE_GEGL, test "x$enable_gegl" = "xyes")	278	AM_CONDITIONAL(ENABLE_GEGL, test "x$enable_gegl" = "xyes")
279		279

Lines 11-17 AM_CPPFLAGS = \ Link Here

(-)a/gegl/Makefile.am (-2 / +2 lines)
11	INTROSPECTION_GIRS =	11	INTROSPECTION_GIRS =
12	INTROSPECTION_SCANNER_ARGS = \	12	INTROSPECTION_SCANNER_ARGS = \
13	--warn-all \	13	--warn-all \
14	--pkg="gegl-0.3" \	14	--pkg="gegl-0.4" \
15	--pkg="glib-2.0" \	15	--pkg="glib-2.0" \
16	--namespace="MyPaintGegl" \	16	--namespace="MyPaintGegl" \
17	--nsversion="$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION)" \	17	--nsversion="$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION)" \
Lines 38-44 introspection_sources = \ Link Here
38	mypaint-gegl-surface.c	38	mypaint-gegl-surface.c
39		39
40	MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl-@LIBMYPAINT_API_PLATFORM_VERSION@.la Makefile	40	MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl-@LIBMYPAINT_API_PLATFORM_VERSION@.la Makefile
41	MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3	41	MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.4
42	MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I..	42	MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I..
43	MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl-@LIBMYPAINT_API_PLATFORM_VERSION@.la ../libmypaint-@LIBMYPAINT_API_PLATFORM_VERSION@.la	43	MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl-@LIBMYPAINT_API_PLATFORM_VERSION@.la ../libmypaint-@LIBMYPAINT_API_PLATFORM_VERSION@.la
44	MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources)	44	MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources)

Lines 6-11 includedir=@includedir@ Link Here

(-)a/gegl/libmypaint-gegl.pc.in (-1 / +1 lines)
6	Name: libmypaint	6	Name: libmypaint
7	Description: MyPaint brush engine library, with GEGL integration.	7	Description: MyPaint brush engine library, with GEGL integration.
8	Version: @LIBMYPAINT_VERSION@	8	Version: @LIBMYPAINT_VERSION@
9	Requires: gegl-0.3 libmypaint-@LIBMYPAINT_API_PLATFORM_VERSION@	9	Requires: gegl-0.4 libmypaint-@LIBMYPAINT_API_PLATFORM_VERSION@
10	Cflags: -I${includedir}/libmypaint-gegl	10	Cflags: -I${includedir}/libmypaint-gegl
11	Libs: -L${libdir} -lmypaint-gegl	11	Libs: -L${libdir} -lmypaint-gegl

Lines 78-84 tile_request_start(MyPaintTiledSurface tiled_surface, MyPaintTileRequest reque Link Here

(-)a/gegl/mypaint-gegl-surface.c (-3 / +2 lines)
78		78
79	if (buffer_is_native(self)) {	79	if (buffer_is_native(self)) {
80	GeglBufferIterator *iterator = gegl_buffer_iterator_new(self->buffer, &tile_bbox, 0, self->format,	80	GeglBufferIterator *iterator = gegl_buffer_iterator_new(self->buffer, &tile_bbox, 0, self->format,
81	read_write_flags, GEGL_ABYSS_NONE);	81	read_write_flags, GEGL_ABYSS_NONE, 8);
82		82
83	// Read out	83	// Read out
84	gboolean completed = gegl_buffer_iterator_next(iterator);	84	gboolean completed = gegl_buffer_iterator_next(iterator);
Lines 88-94 tile_request_start(MyPaintTiledSurface tiled_surface, MyPaintTileRequest reque Link Here
88	g_critical("Unable to get tile aligned access to GeglBuffer");	88	g_critical("Unable to get tile aligned access to GeglBuffer");
89	request->buffer = NULL;	89	request->buffer = NULL;
90	} else {	90	} else {
91	request->buffer = (uint16_t *)(iterator->data[0]);	91	request->buffer = (uint16_t *)(iterator->items[0].data);
92	}	92	}
93		93
94	// So we can finish the iterator in tile_request_end()	94	// So we can finish the iterator in tile_request_end()
95	-

Return to bug 701098