ride on the png revbump and update to 0.1.2

changes: some fixes and optimizations (API change)

6 files changed, 168 insertions, 142 deletions

diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index 1825b31d2b0..840266ceab9 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:31 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/14 18:48:32 drochner Exp $
 
-DISTNAME=	gegl-0.1.0
-PKGREVISION=	4
+DISTNAME=	gegl-0.1.2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gegl/0.1/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/gegl/PLIST b/graphics/gegl/PLIST
index 8acc05cd16b..69b3ab4bb63 100644
--- a/graphics/gegl/PLIST
+++ b/graphics/gegl/PLIST
@@ -1,123 +1,121 @@
-@comment $NetBSD: PLIST,v 1.8 2009/08/21 19:41:13 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2010/06/14 18:48:32 drochner Exp $
 bin/gegl
-include/gegl-0.0/gegl-buffer.h
-include/gegl-0.0/gegl-chant.h
-include/gegl-0.0/gegl-color.h
-include/gegl-0.0/gegl-curve.h
-include/gegl-0.0/gegl-matrix.h
-include/gegl-0.0/gegl-paramspecs.h
-include/gegl-0.0/gegl-path.h
-include/gegl-0.0/gegl-plugin.h
-include/gegl-0.0/gegl-simd.h
-include/gegl-0.0/gegl-types.h
-include/gegl-0.0/gegl-utils.h
-include/gegl-0.0/gegl-version.h
-include/gegl-0.0/gegl.h
-include/gegl-0.0/operation/gegl-operation-area-filter.h
-include/gegl-0.0/operation/gegl-operation-composer.h
-include/gegl-0.0/operation/gegl-operation-composer3.h
-include/gegl-0.0/operation/gegl-operation-filter.h
-include/gegl-0.0/operation/gegl-operation-meta.h
-include/gegl-0.0/operation/gegl-operation-point-composer.h
-include/gegl-0.0/operation/gegl-operation-point-composer3.h
-include/gegl-0.0/operation/gegl-operation-point-filter.h
-include/gegl-0.0/operation/gegl-operation-point-render.h
-include/gegl-0.0/operation/gegl-operation-sink.h
-include/gegl-0.0/operation/gegl-operation-source.h
-include/gegl-0.0/operation/gegl-operation-temporal.h
-include/gegl-0.0/operation/gegl-operation.h
-lib/gegl-0.0/add.la
-lib/gegl-0.0/affine.la
-lib/gegl-0.0/bilateral-filter.la
-lib/gegl-0.0/box-blur.la
-lib/gegl-0.0/brightness-contrast.la
-lib/gegl-0.0/buffer-sink.la
-lib/gegl-0.0/buffer-source.la
-lib/gegl-0.0/c2g.la
-lib/gegl-0.0/checkerboard.la
-lib/gegl-0.0/clear.la
-lib/gegl-0.0/clone.la
-lib/gegl-0.0/color-burn.la
-lib/gegl-0.0/color-dodge.la
-lib/gegl-0.0/color-temperature.la
-lib/gegl-0.0/color.la
-lib/gegl-0.0/contrast-curve.la
-lib/gegl-0.0/convert-format.la
-lib/gegl-0.0/crop.la
-lib/gegl-0.0/darken.la
-lib/gegl-0.0/difference-of-gaussians.la
-lib/gegl-0.0/difference.la
-lib/gegl-0.0/divide.la
-lib/gegl-0.0/dropshadow.la
-lib/gegl-0.0/dst-atop.la
-lib/gegl-0.0/dst-in.la
-lib/gegl-0.0/dst-out.la
-lib/gegl-0.0/dst-over.la
-lib/gegl-0.0/dst.la
-lib/gegl-0.0/exclusion.la
-lib/gegl-0.0/exr-load.la
-lib/gegl-0.0/fractal-explorer.la
-lib/gegl-0.0/gamma.la
-lib/gegl-0.0/gaussian-blur.la
-lib/gegl-0.0/grey.la
-lib/gegl-0.0/hard-light.la
-lib/gegl-0.0/introspect.la
-lib/gegl-0.0/invert.la
-lib/gegl-0.0/jpg-load.la
-lib/gegl-0.0/layer.la
-lib/gegl-0.0/levels.la
-lib/gegl-0.0/lighten.la
-lib/gegl-0.0/load.la
-lib/gegl-0.0/magick-load.la
-lib/gegl-0.0/mblur.la
-lib/gegl-0.0/mono-mixer.la
-lib/gegl-0.0/multiply.la
-lib/gegl-0.0/noise.la
-lib/gegl-0.0/nop.la
-lib/gegl-0.0/normal.la
-lib/gegl-0.0/opacity.la
-lib/gegl-0.0/open-buffer.la
-lib/gegl-0.0/over.la
-lib/gegl-0.0/overlay.la
-lib/gegl-0.0/path.la
-lib/gegl-0.0/pixbuf.la
-lib/gegl-0.0/plus.la
-lib/gegl-0.0/png-load.la
-lib/gegl-0.0/png-save.la
-lib/gegl-0.0/ppm-load.la
-lib/gegl-0.0/ppm-save.la
-lib/gegl-0.0/raw-load.la
-lib/gegl-0.0/rectangle.la
-lib/gegl-0.0/remap.la
-lib/gegl-0.0/save-pixbuf.la
-lib/gegl-0.0/screen.la
-lib/gegl-0.0/snn-mean.la
-lib/gegl-0.0/soft-light.la
-lib/gegl-0.0/src-atop.la
-lib/gegl-0.0/src-in.la
-lib/gegl-0.0/src-out.la
-lib/gegl-0.0/src-over.la
-lib/gegl-0.0/src.la
-lib/gegl-0.0/stress.la
-lib/gegl-0.0/stretch-contrast.la
-lib/gegl-0.0/subtract.la
-lib/gegl-0.0/svg-huerotate.la
-${PLIST.svg}lib/gegl-0.0/svg-load.la
-lib/gegl-0.0/svg-luminancetoalpha.la
-lib/gegl-0.0/svg-matrix.la
-lib/gegl-0.0/svg-multiply.la
-lib/gegl-0.0/svg-saturate.la
-lib/gegl-0.0/text.la
-lib/gegl-0.0/threshold.la
-lib/gegl-0.0/tonemap.la
-lib/gegl-0.0/unsharp-mask.la
-${PLIST.v4l}lib/gegl-0.0/v4l.la
-lib/gegl-0.0/value-invert.la
-lib/gegl-0.0/weighted_blend.la
-lib/gegl-0.0/whitebalance.la
-lib/gegl-0.0/write-buffer.la
-lib/gegl-0.0/xor.la
-lib/libgegl-0.0.la
+include/gegl-0.1/gegl-buffer.h
+include/gegl-0.1/gegl-chant.h
+include/gegl-0.1/gegl-color.h
+include/gegl-0.1/gegl-curve.h
+include/gegl-0.1/gegl-lookup.h
+include/gegl-0.1/gegl-matrix.h
+include/gegl-0.1/gegl-paramspecs.h
+include/gegl-0.1/gegl-path.h
+include/gegl-0.1/gegl-plugin.h
+include/gegl-0.1/gegl-simd.h
+include/gegl-0.1/gegl-types.h
+include/gegl-0.1/gegl-utils.h
+include/gegl-0.1/gegl-version.h
+include/gegl-0.1/gegl.h
+include/gegl-0.1/operation/gegl-operation-area-filter.h
+include/gegl-0.1/operation/gegl-operation-composer.h
+include/gegl-0.1/operation/gegl-operation-composer3.h
+include/gegl-0.1/operation/gegl-operation-filter.h
+include/gegl-0.1/operation/gegl-operation-meta.h
+include/gegl-0.1/operation/gegl-operation-point-composer.h
+include/gegl-0.1/operation/gegl-operation-point-composer3.h
+include/gegl-0.1/operation/gegl-operation-point-filter.h
+include/gegl-0.1/operation/gegl-operation-point-render.h
+include/gegl-0.1/operation/gegl-operation-sink.h
+include/gegl-0.1/operation/gegl-operation-source.h
+include/gegl-0.1/operation/gegl-operation-temporal.h
+include/gegl-0.1/operation/gegl-operation.h
+lib/gegl-0.1/add.la
+lib/gegl-0.1/affine.la
+lib/gegl-0.1/bilateral-filter.la
+lib/gegl-0.1/box-blur.la
+lib/gegl-0.1/brightness-contrast.la
+lib/gegl-0.1/buffer-sink.la
+lib/gegl-0.1/buffer-source.la
+lib/gegl-0.1/c2g.la
+lib/gegl-0.1/checkerboard.la
+lib/gegl-0.1/clear.la
+lib/gegl-0.1/clone.la
+lib/gegl-0.1/color-burn.la
+lib/gegl-0.1/color-dodge.la
+lib/gegl-0.1/color-temperature.la
+lib/gegl-0.1/color.la
+lib/gegl-0.1/contrast-curve.la
+lib/gegl-0.1/convert-format.la
+lib/gegl-0.1/crop.la
+lib/gegl-0.1/darken.la
+lib/gegl-0.1/difference-of-gaussians.la
+lib/gegl-0.1/difference.la
+lib/gegl-0.1/divide.la
+lib/gegl-0.1/dropshadow.la
+lib/gegl-0.1/dst-atop.la
+lib/gegl-0.1/dst-in.la
+lib/gegl-0.1/dst-out.la
+lib/gegl-0.1/dst-over.la
+lib/gegl-0.1/dst.la
+lib/gegl-0.1/exclusion.la
+lib/gegl-0.1/exr-load.la
+lib/gegl-0.1/fractal-explorer.la
+lib/gegl-0.1/gamma.la
+lib/gegl-0.1/gaussian-blur.la
+lib/gegl-0.1/grey.la
+lib/gegl-0.1/hard-light.la
+lib/gegl-0.1/introspect.la
+lib/gegl-0.1/invert.la
+lib/gegl-0.1/jpg-load.la
+lib/gegl-0.1/layer.la
+lib/gegl-0.1/levels.la
+lib/gegl-0.1/lighten.la
+lib/gegl-0.1/load.la
+lib/gegl-0.1/magick-load.la
+lib/gegl-0.1/mblur.la
+lib/gegl-0.1/mono-mixer.la
+lib/gegl-0.1/multiply.la
+lib/gegl-0.1/noise.la
+lib/gegl-0.1/nop.la
+lib/gegl-0.1/opacity.la
+lib/gegl-0.1/open-buffer.la
+lib/gegl-0.1/over.la
+lib/gegl-0.1/overlay.la
+lib/gegl-0.1/path.la
+lib/gegl-0.1/pixbuf.la
+lib/gegl-0.1/plus.la
+lib/gegl-0.1/png-load.la
+lib/gegl-0.1/png-save.la
+lib/gegl-0.1/ppm-load.la
+lib/gegl-0.1/ppm-save.la
+lib/gegl-0.1/raw-load.la
+lib/gegl-0.1/rectangle.la
+lib/gegl-0.1/remap.la
+lib/gegl-0.1/save-pixbuf.la
+lib/gegl-0.1/screen.la
+lib/gegl-0.1/snn-mean.la
+lib/gegl-0.1/soft-light.la
+lib/gegl-0.1/src-atop.la
+lib/gegl-0.1/src-in.la
+lib/gegl-0.1/src-out.la
+lib/gegl-0.1/src-over.la
+lib/gegl-0.1/src.la
+lib/gegl-0.1/stress.la
+lib/gegl-0.1/stretch-contrast.la
+lib/gegl-0.1/subtract.la
+lib/gegl-0.1/svg-huerotate.la
+lib/gegl-0.1/svg-load.la
+lib/gegl-0.1/svg-luminancetoalpha.la
+lib/gegl-0.1/svg-matrix.la
+lib/gegl-0.1/svg-multiply.la
+lib/gegl-0.1/svg-saturate.la
+lib/gegl-0.1/text.la
+lib/gegl-0.1/threshold.la
+lib/gegl-0.1/unsharp-mask.la
+lib/gegl-0.1/value-invert.la
+lib/gegl-0.1/weighted-blend.la
+lib/gegl-0.1/whitebalance.la
+lib/gegl-0.1/write-buffer.la
+lib/gegl-0.1/xor.la
+lib/libgegl-0.1.la
 lib/pkgconfig/gegl.pc
 share/gtk-doc/html/gegl/gegl.css
 share/gtk-doc/html/gegl/gegl.devhelp
diff --git a/graphics/gegl/buildlink3.mk b/graphics/gegl/buildlink3.mk
index 3fc7647e45c..68fd515eafa 100644
--- a/graphics/gegl/buildlink3.mk
+++ b/graphics/gegl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:44:31 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/14 18:48:32 drochner Exp $
 
 BUILDLINK_TREE+=	gegl
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gegl
 GEGL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gegl+=	gegl>=0.0.20
-BUILDLINK_ABI_DEPENDS.gegl+=	gegl>=0.1.0nb4
+BUILDLINK_ABI_DEPENDS.gegl+=	gegl>=0.1.2
 BUILDLINK_PKGSRCDIR.gegl?=	../../graphics/gegl
 
 pkgbase := gegl
diff --git a/graphics/gegl/distinfo b/graphics/gegl/distinfo
index 9d33a1d1572..ba75f10506f 100644
--- a/graphics/gegl/distinfo
+++ b/graphics/gegl/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2010/02/04 12:28:43 adam Exp $
+$NetBSD: distinfo,v 1.5 2010/06/14 18:48:32 drochner Exp $
 
-SHA1 (gegl-0.1.0.tar.bz2) = ede1789ce318b9afe4ec7dcb42c1065b4f278b64
-RMD160 (gegl-0.1.0.tar.bz2) = fb03f5a2170d28ef37f94a7941d456b0dc92600b
-Size (gegl-0.1.0.tar.bz2) = 1342198 bytes
+SHA1 (gegl-0.1.2.tar.bz2) = 34b4a6be9e472324d6dd1233713a1f8851fcdc04
+RMD160 (gegl-0.1.2.tar.bz2) = e03faeac7ba3024f64ed0c43a22cf433f8e5eb19
+Size (gegl-0.1.2.tar.bz2) = 3128704 bytes
 SHA1 (patch-aa) = 5eeefaaa80a93eefd73dba81eff88652e5213167
-SHA1 (patch-ab) = 6f0d59625b4fbbc61af8156ffc3cb01ade593a29
+SHA1 (patch-ac) = b34d1fd99e26dc64fe160076b4ac9dcad48fdc86
diff --git a/graphics/gegl/patches/patch-ab b/graphics/gegl/patches/patch-ab
deleted file mode 100644
index 6aef1b0e26c..00000000000
--- a/graphics/gegl/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2010/02/04 12:28:44 adam Exp $
-
---- gegl/process/gegl-eval-visitor.c.orig	2010-02-03 09:32:18.000000000 +0000
-+++ gegl/process/gegl-eval-visitor.c
-@@ -56,7 +56,7 @@ gegl_eval_visitor_init (GeglEvalVisitor 
- {
- }
- 
--extern long babl_total_usecs;
-+long babl_total_usecs;
- 
- /* this is the visitor that does the real computations for GEGL */
- static void
diff --git a/graphics/gegl/patches/patch-ac b/graphics/gegl/patches/patch-ac
new file mode 100644
index 00000000000..ef4b95eda14
--- /dev/null
+++ b/graphics/gegl/patches/patch-ac
@@ -0,0 +1,42 @@
+$NetBSD: patch-ac,v 1.1 2010/06/14 18:48:33 drochner Exp $
+
+--- gegl/buffer/gegl-buffer.c.orig	2010-02-07 15:31:58.000000000 +0000
++++ gegl/buffer/gegl-buffer.c
+@@ -77,12 +77,14 @@
+ 
+ //#define GEGL_BUFFER_DEBUG_ALLOCATIONS
+ 
++#ifdef GEGL_BUFFER_DEBUG_ALLOCATIONS
+ /* #define GEGL_BUFFER_DEBUG_ALLOCATIONS to print allocation stack
+  * traces for leaked GeglBuffers using GNU C libs backtrace_symbols()
+  */
+ #ifndef G_OS_WIN32
+ #include <execinfo.h>
+ #endif
++#endif
+ 
+ 
+ G_DEFINE_TYPE (GeglBuffer, gegl_buffer, GEGL_TYPE_TILE_HANDLER)
+@@ -870,7 +872,6 @@ gegl_buffer_class_init (GeglBufferClass 
+ }
+ 
+ #ifdef GEGL_BUFFER_DEBUG_ALLOCATIONS
+-#endif
+ #define MAX_N_FUNCTIONS 100
+ static gchar *
+ gegl_buffer_get_alloc_stack (void)
+@@ -908,11 +909,14 @@ gegl_buffer_get_alloc_stack (void)
+ 
+   return result;
+ }
++#endif
+ 
+ void gegl_bt (void);
+ void gegl_bt (void)
+ {
++#ifdef GEGL_BUFFER_DEBUG_ALLOCATIONS
+   g_print ("%s\n", gegl_buffer_get_alloc_stack ());
++#endif
+ }
+ 
+ static void