Update to 0.1.12:

2012-03-30 babl-0.1.12
optimizations for floating point conversions, HSV and HSL color models,
removal of dead code, fixed CIE Lab conversions.

6 files changed, 21 insertions, 70 deletions

diff --git a/graphics/babl/Makefile b/graphics/babl/Makefile
index 8dbf3c3a9b6..8edb90106cd 100644
--- a/graphics/babl/Makefile
+++ b/graphics/babl/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2014/08/19 10:42:55 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2015/08/14 18:25:40 wiz Exp $
 
-DISTNAME=	babl-0.1.10
+DISTNAME=	babl_0.1.12.orig
+PKGNAME=	babl-0.1.12
 CATEGORIES=	graphics
-MASTER_SITES=	http://ftp.gwdg.de/pub/misc/grafik/gimp/babl/${PKGVERSION_NOREV:R}/
+MASTER_SITES=	https://launchpad.net/ubuntu/+archive/primary/+files/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -10,6 +11,8 @@ HOMEPAGE=	http://gegl.org/babl/
 COMMENT=	Dynamic pixel conversion library
 LICENSE=	gnu-gpl-v3
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+
 # NOTE: to build documentation (which requires additional dependencies)
 #	define BUILD_DOCS in MAKE_ENV.
 
diff --git a/graphics/babl/PLIST b/graphics/babl/PLIST
index 01ab93b02e1..abc67a7f355 100644
--- a/graphics/babl/PLIST
+++ b/graphics/babl/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.7 2012/05/07 08:33:26 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/08/14 18:25:40 wiz Exp $
+include/babl-0.1/babl/babl-introspect.h
 include/babl-0.1/babl/babl-macros.h
 include/babl-0.1/babl/babl-types.h
 include/babl-0.1/babl/babl-version.h
 include/babl-0.1/babl/babl.h
 lib/babl-0.1/CIE.la
+lib/babl-0.1/HSL.la
+lib/babl-0.1/HSV.la
 lib/babl-0.1/cairo.la
 lib/babl-0.1/fast-float.la
 lib/babl-0.1/float.la
@@ -11,7 +14,13 @@ lib/babl-0.1/gegl-fixups.la
 lib/babl-0.1/gggl-lies.la
 lib/babl-0.1/gggl.la
 lib/babl-0.1/gimp-8bit.la
+lib/babl-0.1/grey.la
 lib/babl-0.1/naive-CMYK.la
-lib/babl-0.1/sse-fixups.la
+lib/babl-0.1/simple.la
+lib/babl-0.1/sse2-float.la
+lib/babl-0.1/sse2-int16.la
+lib/babl-0.1/sse2-int8.la
+lib/babl-0.1/two-table.la
+lib/babl-0.1/ycbcr.la
 lib/libbabl-0.1.la
 lib/pkgconfig/babl.pc
diff --git a/graphics/babl/distinfo b/graphics/babl/distinfo
index a8203c62c88..590cc787103 100644
--- a/graphics/babl/distinfo
+++ b/graphics/babl/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.11 2012/05/25 07:38:30 jdc Exp $
+$NetBSD: distinfo,v 1.12 2015/08/14 18:25:40 wiz Exp $
 
-SHA1 (babl-0.1.10.tar.bz2) = ee60089e8e9d9390e730d3ae5e41074549928b7a
-RMD160 (babl-0.1.10.tar.bz2) = a18b57be692cf5fec8b6649609d5d8ddb9a97f87
-Size (babl-0.1.10.tar.bz2) = 449537 bytes
-SHA1 (patch-ab) = 1fc18c1767277f92c0c65a1e27a72e4636eb406b
-SHA1 (patch-babl_babl-fish-reference.c) = 967239a45870e1045ef6c9445119fae0e12ab8ca
-SHA1 (patch-babl_babl-palette.c) = 84f0b803bd6a68db24774e937ce7a99cb7696b38
+SHA1 (babl_0.1.12.orig.tar.bz2) = b9a811d9d05717d66bc107a18447fbd74cff7eea
+RMD160 (babl_0.1.12.orig.tar.bz2) = 4429fc997a34c1e3f171c3097486a90437380ab5
+Size (babl_0.1.12.orig.tar.bz2) = 642234 bytes
diff --git a/graphics/babl/patches/patch-ab b/graphics/babl/patches/patch-ab
deleted file mode 100644
index d94a34e3feb..00000000000
--- a/graphics/babl/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/08/19 17:51:14 bjs Exp $
-
-Only build documentation if BUILD_DOCS is defined in MAKE_ENV.
-
---- Makefile.am.orig	2008-06-12 17:05:58.000000000 -0400
-+++ Makefile.am
-@@ -3,8 +3,11 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2
- SUBDIRS = \
- 	babl		\
- 	extensions	\
--	tests		\
-+	tests 		
-+ifdef BUILD_DOCS
-+SUBDIRS+= \
- 	docs
-+endif
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = babl.pc
diff --git a/graphics/babl/patches/patch-babl_babl-fish-reference.c b/graphics/babl/patches/patch-babl_babl-fish-reference.c
deleted file mode 100644
index 7f34750ba8e..00000000000
--- a/graphics/babl/patches/patch-babl_babl-fish-reference.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-babl_babl-fish-reference.c,v 1.1 2012/05/25 07:37:21 jdc Exp $
-
-Fix a segmentation fault when generating documentation.  See:
-
-  https://bugzilla.gnome.org/show_bug.cgi?id=676491
-
---- babl/babl-fish-reference.c.dist	2012-03-18 15:51:42.000000000 +0000
-+++ babl/babl-fish-reference.c	2012-05-21 12:12:38.000000000 +0000
-@@ -137,10 +137,11 @@
-             }
-         }
- 
--      babl_process (
--        assert_conversion_find (src_img->type[0], dst_img->type[0]),
--        src_img, dst_img,
--        n);
-+      if (dst_img->data[0] != NULL)
-+        babl_process (
-+          assert_conversion_find (src_img->type[0], dst_img->type[0]),
-+          src_img, dst_img,
-+          n);
-       src_img->data[0] += src_img->type[0]->bits / 8;
-     }
-   babl_free (src_img);
diff --git a/graphics/babl/patches/patch-babl_babl-palette.c b/graphics/babl/patches/patch-babl_babl-palette.c
deleted file mode 100644
index 78c8fc9d216..00000000000
--- a/graphics/babl/patches/patch-babl_babl-palette.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-babl_babl-palette.c,v 1.1 2012/05/07 08:33:27 adam Exp $
-
-Include standard limits.h instead of values.h
-
---- babl/babl-palette.c.orig	2012-05-07 07:29:12.000000000 +0000
-+++ babl/babl-palette.c
-@@ -19,7 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
--#include <values.h>
-+#include <limits.h>
- #include <assert.h>
- #include "config.h"
- #include "babl-internal.h"