Downgrade babl to 0.0.22 again.

The world, and especially gegl, is not ready for it yet.

Addresses PR 41573.

6 files changed, 40 insertions, 47 deletions

diff --git a/graphics/babl/Makefile b/graphics/babl/Makefile
index 5a7851b1e44..a32c3dfdf33 100644
--- a/graphics/babl/Makefile
+++ b/graphics/babl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/06/10 09:19:49 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/13 08:05:05 wiz Exp $
 
 DISTNAME=	babl-${BABL_VERSION}
 CATEGORIES=	graphics
@@ -8,8 +8,6 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	bjs@NetBSD.org
 HOMEPAGE=	http://gegl.org/babl/
 COMMENT=	Dynamic pixel conversion library
-LICENSE=	gnu-lgpl-v3
-
 ###
 ### NOTE: to build documentation--which requires additional dependencies--
 ###	  define BUILD_DOCS in MAKE_ENV.
diff --git a/graphics/babl/Makefile.version b/graphics/babl/Makefile.version
index 2be794dcb3b..a70f14d7456 100644
--- a/graphics/babl/Makefile.version
+++ b/graphics/babl/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.2 2009/06/10 09:19:49 wiz Exp $
+# $NetBSD: Makefile.version,v 1.3 2009/06/13 08:05:05 wiz Exp $
 #
 
-BABL_API_VERSION=	0.1
-BABL_PKG_VERSION=	0
+BABL_API_VERSION=	0.0
+BABL_PKG_VERSION=	22
 BABL_VERSION=		${BABL_API_VERSION}.${BABL_PKG_VERSION}
diff --git a/graphics/babl/PLIST b/graphics/babl/PLIST
index 8bbe5bea960..76b1dc1aca1 100644
--- a/graphics/babl/PLIST
+++ b/graphics/babl/PLIST
@@ -1,15 +1,22 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/10 09:19:49 wiz Exp $
-include/babl-0.0/babl/babl-macros.h
-include/babl-0.0/babl/babl-types.h
+@comment $NetBSD: PLIST,v 1.3 2009/06/13 08:05:05 wiz Exp $
+include/babl-0.0/babl/babl-component.h
+include/babl-0.0/babl/babl-conversion.h
+include/babl-0.0/babl/babl-extension.h
+include/babl-0.0/babl/babl-fish.h
+include/babl-0.0/babl/babl-format.h
+include/babl-0.0/babl/babl-image.h
+include/babl-0.0/babl/babl-model.h
+include/babl-0.0/babl/babl-sampling.h
+include/babl-0.0/babl/babl-type.h
 include/babl-0.0/babl/babl-version.h
 include/babl-0.0/babl/babl.h
-lib/babl-0.0/CIE-Lab.la
-lib/babl-0.0/gegl-fixups.la
-lib/babl-0.0/gggl-lies.la
-lib/babl-0.0/gggl.la
-lib/babl-0.0/gimp-8bit.la
-lib/babl-0.0/naive-CMYK.la
-lib/babl-0.0/sse-fixups.la
+lib/babl-0.0/CIE-Lab.so
+lib/babl-0.0/gegl-fixups.so
+lib/babl-0.0/gggl-lies.so
+lib/babl-0.0/gggl.so
+lib/babl-0.0/gimp-8bit.so
+lib/babl-0.0/naive-CMYK.so
+lib/babl-0.0/sse-fixups.so
 lib/libbabl-0.0.la
 lib/pkgconfig/babl.pc
 @dirrm lib/babl-0.0
diff --git a/graphics/babl/distinfo b/graphics/babl/distinfo
index 0f83c6c0ef1..d207b486742 100644
--- a/graphics/babl/distinfo
+++ b/graphics/babl/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.3 2009/06/10 09:19:49 wiz Exp $
+$NetBSD: distinfo,v 1.4 2009/06/13 08:05:05 wiz Exp $
 
-SHA1 (babl-0.1.0.tar.bz2) = 6e95e24c48b8018fefbf8e69ad62f4a4de56640c
-RMD160 (babl-0.1.0.tar.bz2) = 7bf933eacd9654ea20e639394fc7481bc918f79b
-Size (babl-0.1.0.tar.bz2) = 406488 bytes
+SHA1 (babl-0.0.22.tar.bz2) = 9de50fb5833f41691f50f6e735d6422aad52ea94
+RMD160 (babl-0.0.22.tar.bz2) = a10c07e70f1fe8944a969bba46484acf410c2583
+Size (babl-0.0.22.tar.bz2) = 396413 bytes
 SHA1 (patch-aa) = f9f29ca359160ca37193cab85c5ab794208e84b1
 SHA1 (patch-ab) = 1fc18c1767277f92c0c65a1e27a72e4636eb406b
-SHA1 (patch-ac) = f4a19fdd85c735ce8579aa4da20f1102366e747c
-SHA1 (patch-ad) = e80215f859a5049e0f5aba7c4829ee1cf9d7689b
+SHA1 (patch-ac) = ab520d63cc602790a818aa9b5d8d3c1995d444ac
diff --git a/graphics/babl/patches/patch-ac b/graphics/babl/patches/patch-ac
index 897c7e2564f..993c8d80a3f 100644
--- a/graphics/babl/patches/patch-ac
+++ b/graphics/babl/patches/patch-ac
@@ -1,13 +1,15 @@
-$NetBSD: patch-ac,v 1.2 2009/06/10 09:19:49 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2009/06/13 08:05:05 wiz Exp $
 
---- extensions/Makefile.am.orig	2009-04-17 17:05:15.000000000 +0000
-+++ extensions/Makefile.am
-@@ -12,7 +12,7 @@ AM_CPPFLAGS = \
- 	-I$(top_srcdir)/babl		\
- 	-I$(top_srcdir)/extensions
- 
--extdir = $(DESTDIR)$(libdir)/babl-@BABL_API_VERSION@
-+extdir = $(libdir)/babl-@BABL_API_VERSION@
- ext_LTLIBRARIES = \
- 	CIE-Lab.la      \
- 	gegl-fixups.la  \
+Mac OS X build fix, taken from:
+http://svn.gnome.org/viewvc/babl/trunk/babl/babl-cpuaccel.c?r1=316&r2=347
+
+--- babl/babl-cpuaccel.c.orig	2008-05-23 15:37:21.000000000 +0100
++++ babl/babl-cpuaccel.c	2009-01-25 15:13:14.000000000 +0000
+@@ -39,6 +39,7 @@
+ typedef unsigned int guint32;
+ typedef int gint;
+ typedef char gchar;
++typedef size_t gsize;
+ #define TRUE  1
+ #define FALSE 0
+ #define G_GNUC_CONST
diff --git a/graphics/babl/patches/patch-ad b/graphics/babl/patches/patch-ad
deleted file mode 100644
index 6ed1d82d9d3..00000000000
--- a/graphics/babl/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/06/10 09:19:49 wiz Exp $
-
---- extensions/Makefile.in.orig	2009-05-20 20:42:51.000000000 +0000
-+++ extensions/Makefile.in
-@@ -242,7 +242,7 @@ AM_CPPFLAGS = \
- 	-I$(top_srcdir)/babl		\
- 	-I$(top_srcdir)/extensions
- 
--extdir = $(DESTDIR)$(libdir)/babl-@BABL_API_VERSION@
-+extdir = $(libdir)/babl-@BABL_API_VERSION@
- ext_LTLIBRARIES = \
- 	CIE-Lab.la      \
- 	gegl-fixups.la  \