Update to 0.3.15, changes undocumented.

Add debug option.

6 files changed, 34 insertions, 37 deletions

diff --git a/devel/liboil/Makefile b/devel/liboil/Makefile
index 7bc62779fc7..73ec8384eea 100644
--- a/devel/liboil/Makefile
+++ b/devel/liboil/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2008/07/14 12:56:02 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2008/07/30 09:53:36 wiz Exp $
 #
 
-DISTNAME=	liboil-0.3.14
+DISTNAME=	liboil-0.3.15
 CATEGORIES=	devel
 MASTER_SITES=	http://liboil.freedesktop.org/download/
 
@@ -16,13 +16,14 @@ USE_FEATURES=		asprintf
 USE_LIBTOOL=		yes
 
 CONFIGURE_ARGS+=	--disable-glib # Only used by examples.
-#CONFIGURE_ARGS+=	--enable-debug
 
 PKGCONFIG_OVERRIDE+=	liboil-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	liboil.pc.in
 
 TEST_TARGET=		check
 
+.include "options.mk"
+
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(MACHINE_PLATFORM:MSunOS-5.8-*)
diff --git a/devel/liboil/distinfo b/devel/liboil/distinfo
index 296b17b6a2a..b0419873b94 100644
--- a/devel/liboil/distinfo
+++ b/devel/liboil/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.13 2008/04/11 16:58:47 drochner Exp $
+$NetBSD: distinfo,v 1.14 2008/07/30 09:53:36 wiz Exp $
 
-SHA1 (liboil-0.3.14.tar.gz) = 5de4eedf0f4673b6c44e462d4d1caeb34f2126b6
-RMD160 (liboil-0.3.14.tar.gz) = 91ce7a87c90e0092fd94c4d075e3fe09f6903a21
-Size (liboil-0.3.14.tar.gz) = 819559 bytes
-SHA1 (patch-ab) = 36a06f38f34f43ab6d181f4e9028f7b9adf5332b
-SHA1 (patch-ac) = 8ccb2b0323b337902c384f4bdda856ca1cc2b023
-SHA1 (patch-ad) = 9c7e9fb22c4551e3eee150ac97bc74703d5b985a
+SHA1 (liboil-0.3.15.tar.gz) = 8791e3399aae619b89a1d00f40ffcafc7d7f5d9b
+RMD160 (liboil-0.3.15.tar.gz) = ba6a4889dd8c16f62dee5c238e019b42066e6a9b
+Size (liboil-0.3.15.tar.gz) = 822195 bytes
+SHA1 (patch-ab) = 13ff4bef610a28174a2a41b74029f24f04fd598f
+SHA1 (patch-ac) = 4559e8b635099d96df59bcc5525eb3c0322720ba
diff --git a/devel/liboil/options.mk b/devel/liboil/options.mk
new file mode 100644
index 00000000000..2e3f1d49cd5
--- /dev/null
+++ b/devel/liboil/options.mk
@@ -0,0 +1,10 @@
+# $NetBSD: options.mk,v 1.1 2008/07/30 09:53:36 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.liboil
+PKG_SUPPORTED_OPTIONS=	debug
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
diff --git a/devel/liboil/patches/patch-ab b/devel/liboil/patches/patch-ab
index 16565a9649d..93c7928f17c 100644
--- a/devel/liboil/patches/patch-ab
+++ b/devel/liboil/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2007/04/13 21:01:55 drochner Exp $
+$NetBSD: patch-ab,v 1.4 2008/07/30 09:53:36 wiz Exp $
 
---- ./liboil/sse/composite_sse_2pix.c.orig	2007-04-13 22:30:01.000000000 +0200
-+++ ./liboil/sse/composite_sse_2pix.c
-@@ -138,6 +138,11 @@ static __m128i over_argb_sse2(__m128i de
+--- liboil/sse/composite_sse_2pix.c.orig	2008-05-12 23:47:18.000000000 +0000
++++ liboil/sse/composite_sse_2pix.c
+@@ -141,6 +141,11 @@ over_argb_sse2(__m128i dest, __m128i src
    return _mm_adds_epu8(src, muldiv_255_sse2(dest, negate_argb_sse2(srca)));
  }
  
@@ -11,14 +11,14 @@ $NetBSD: patch-ab,v 1.3 2007/04/13 21:01:55 drochner Exp $
 + * (see NetBSD PR pkg/34886)
 + */
 +#if !(defined(__i386__) && __GNUC__ && (__GNUC__ < 4))
- static void
+ SSE_FUNCTION static void
  composite_in_argb_sse_2pix (uint32_t *dest, const uint32_t *src,
      const uint8_t *mask, int n)
-@@ -393,6 +398,7 @@ composite_in_over_argb_const_mask_sse_2p
+@@ -396,6 +401,7 @@ composite_in_over_argb_const_mask_sse_2p
  }
  OIL_DEFINE_IMPL_FULL_WRAPPER(composite_in_over_argb_const_mask_sse_2pix,
      composite_in_over_argb_const_mask, OIL_IMPL_FLAG_SSE2);
 +#endif /* i386 gcc<4 */
  
- static void
+ SSE_FUNCTION static void
  composite_over_u8_sse_2pix (uint8_t *dest, const uint8_t *src, int n)
diff --git a/devel/liboil/patches/patch-ac b/devel/liboil/patches/patch-ac
index 1f362876d53..6fd0030bb48 100644
--- a/devel/liboil/patches/patch-ac
+++ b/devel/liboil/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2007/04/13 21:01:56 drochner Exp $
+$NetBSD: patch-ac,v 1.4 2008/07/30 09:53:36 wiz Exp $
 
---- ./liboil/sse/composite_sse_4pix.c.orig	2007-04-13 22:37:07.000000000 +0200
-+++ ./liboil/sse/composite_sse_4pix.c
-@@ -274,6 +274,11 @@ composite_in_argb_const_mask_sse (uint32
+--- liboil/sse/composite_sse_4pix.c.orig	2008-05-12 23:47:18.000000000 +0000
++++ liboil/sse/composite_sse_4pix.c
+@@ -275,6 +275,11 @@ composite_in_argb_const_mask_sse (uint32
  OIL_DEFINE_IMPL_FULL_WRAPPER (composite_in_argb_const_mask_sse,
      composite_in_argb_const_mask, OIL_IMPL_FLAG_SSE2);
  
@@ -11,14 +11,14 @@ $NetBSD: patch-ac,v 1.3 2007/04/13 21:01:56 drochner Exp $
 + * (see NetBSD PR pkg/34886)
 + */
 +#if !(defined(__i386__) && __GNUC__ && (__GNUC__ < 4))
- static void
+ SSE_FUNCTION static void
  composite_over_argb_sse (uint32_t *dest, const uint32_t *src, int n)
  {
-@@ -508,6 +513,7 @@ composite_in_over_argb_const_mask_sse (u
+@@ -509,6 +514,7 @@ composite_in_over_argb_const_mask_sse (u
  }
  OIL_DEFINE_IMPL_FULL_WRAPPER (composite_in_over_argb_const_mask_sse,
      composite_in_over_argb_const_mask, OIL_IMPL_FLAG_SSE2);
 +#endif /* i386 gcc<4 */
  
- static void
+ SSE_FUNCTION static void
  composite_over_u8_sse (uint8_t *dest, const uint8_t *src, int n)
diff --git a/devel/liboil/patches/patch-ad b/devel/liboil/patches/patch-ad
deleted file mode 100644
index ebe5b4d7a4b..00000000000
--- a/devel/liboil/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2008/04/11 16:58:47 drochner Exp $
-
---- examples/Makefile.in.orig	2008-03-14 06:58:19.000000000 +0100
-+++ examples/Makefile.in
-@@ -126,7 +126,7 @@ RECURSIVE_TARGETS = all-recursive check-
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = jpeg md5 uberopt work huffman taylor videoscale \
--	audioresample jit
-+	audioresample
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@