update to 0.3.13

This release merges lots of distributions patches and bug fixes
and adds new functionality used by the upcoming (now!) release
of Schroedinger-1.0.0.

pkgsrc note: someone with an arm (pun intended), or who knows how to
detect a "VFP" might want to tune the cpu feature detection code

6 files changed, 84 insertions, 30 deletions

diff --git a/devel/liboil/Makefile b/devel/liboil/Makefile
index 59e1a53cb93..f2182987501 100644
--- a/devel/liboil/Makefile
+++ b/devel/liboil/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/11/25 09:56:35 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2008/02/28 19:28:24 drochner Exp $
 #
 
-DISTNAME=	liboil-0.3.12
+DISTNAME=	liboil-0.3.13
 CATEGORIES=	devel
 MASTER_SITES=	http://liboil.freedesktop.org/download/
 
diff --git a/devel/liboil/PLIST b/devel/liboil/PLIST
index 15f4a9321e1..293f97864ee 100644
--- a/devel/liboil/PLIST
+++ b/devel/liboil/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2006/10/19 14:27:33 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/02/28 19:28:24 drochner Exp $
 bin/oil-bugreport
 include/liboil-0.3/liboil/liboil-stdint.h
 include/liboil-0.3/liboil/liboil.h
 include/liboil-0.3/liboil/liboilclasses.h
 include/liboil-0.3/liboil/liboilcpu.h
 include/liboil-0.3/liboil/liboildebug.h
+include/liboil-0.3/liboil/liboilfault.h
 include/liboil-0.3/liboil/liboilfuncs.h
 include/liboil-0.3/liboil/liboilfunction.h
 include/liboil-0.3/liboil/liboilgcc.h
@@ -15,6 +16,7 @@ include/liboil-0.3/liboil/liboilprototype.h
 include/liboil-0.3/liboil/liboilrandom.h
 include/liboil-0.3/liboil/liboiltest.h
 include/liboil-0.3/liboil/liboiltypes.h
+include/liboil-0.3/liboil/liboilutils.h
 lib/liboil-0.3.la
 lib/pkgconfig/liboil-0.3.pc
 share/gtk-doc/html/liboil/ch01.html
diff --git a/devel/liboil/distinfo b/devel/liboil/distinfo
index d4d867dfd61..fbc39de1b11 100644
--- a/devel/liboil/distinfo
+++ b/devel/liboil/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.9 2008/01/23 11:24:47 tnn Exp $
+$NetBSD: distinfo,v 1.10 2008/02/28 19:28:24 drochner Exp $
 
-SHA1 (liboil-0.3.12.tar.gz) = b6bf01ba31ce090e426391a9ea8ef6daf6739e96
-RMD160 (liboil-0.3.12.tar.gz) = 0fb494f816d60889a745320bd021add972be1684
-Size (liboil-0.3.12.tar.gz) = 810532 bytes
-SHA1 (patch-aa) = b4c44d24846cdd8295c1205073e057b028ceda49
+SHA1 (liboil-0.3.13.tar.gz) = 1c08d92810a76afce7a2cba2b5f969a096ecf8a0
+RMD160 (liboil-0.3.13.tar.gz) = aefcf9c7a100b5faff3449573bff6238db0bdb34
+Size (liboil-0.3.13.tar.gz) = 813995 bytes
 SHA1 (patch-ab) = 36a06f38f34f43ab6d181f4e9028f7b9adf5332b
 SHA1 (patch-ac) = 8ccb2b0323b337902c384f4bdda856ca1cc2b023
+SHA1 (patch-ad) = 9d38917949c5f7b06229587f2338de7d1745147f
+SHA1 (patch-ae) = ca873368c23a5e3bd7475e9aeb64ffb74e7e2ea7
diff --git a/devel/liboil/patches/patch-aa b/devel/liboil/patches/patch-aa
deleted file mode 100644
index d8997f5d67f..00000000000
--- a/devel/liboil/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2008/01/23 11:24:47 tnn Exp $
-
---- liboil/liboilcpu.c.orig	2007-04-11 08:25:16.000000000 +0200
-+++ liboil/liboilcpu.c
-@@ -578,7 +578,7 @@ oil_cpu_detect_getisax (void)
- static void
- oil_cpu_detect_kernel_support (void)
- {
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-   int ret, enabled;
-   size_t len;
- 
-@@ -598,7 +598,7 @@ oil_cpu_detect_kernel_support (void)
-   /* Solaris is OK */
- #elif defined(__NetBSD__)
-   /* NetBSD is OK */
--#elif
-+#else
-    
-   /* If we don't know that the operating system supports SSE, don't trust that
-    * it will properly support it.
diff --git a/devel/liboil/patches/patch-ad b/devel/liboil/patches/patch-ad
new file mode 100644
index 00000000000..d41ad676c7c
--- /dev/null
+++ b/devel/liboil/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2008/02/28 19:28:24 drochner Exp $
+
+--- examples/Makefile.in.orig	2008-02-25 22:51:20.000000000 +0100
++++ examples/Makefile.in
+@@ -287,7 +287,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = jpeg md5 uberopt work huffman taylor videoscale audioresample jit
++SUBDIRS = jpeg md5 uberopt work huffman taylor videoscale audioresample
+ example1_SOURCES = example1.c
+ example1_CFLAGS = $(LIBOIL_CFLAGS)
+ example1_LDADD = $(LIBOIL_LIBS)
diff --git a/devel/liboil/patches/patch-ae b/devel/liboil/patches/patch-ae
new file mode 100644
index 00000000000..e0f6889f04b
--- /dev/null
+++ b/devel/liboil/patches/patch-ae
@@ -0,0 +1,60 @@
+$NetBSD: patch-ae,v 1.1 2008/02/28 19:28:24 drochner Exp $
+
+--- liboil/liboilcpu-arm.c.orig	2008-02-28 20:07:11.000000000 +0100
++++ liboil/liboilcpu-arm.c
+@@ -60,10 +60,6 @@
+  *
+  */
+ 
+-static void oil_cpu_detect_arch(void);
+-
+-static unsigned long oil_cpu_flags;
+-
+ extern unsigned long (*_oil_profile_stamp)(void);
+ 
+ #if defined(__arm__)
+@@ -126,6 +122,35 @@ oil_cpu_arm_getflags_cpuinfo (char *cpui
+   free (cpuinfo_flags);
+ }
+ 
++static char *
++get_proc_cpuinfo (void)
++{
++  char *cpuinfo;
++  int fd;
++  int n;
++
++  cpuinfo = malloc(4096);
++  if (cpuinfo == NULL) return NULL;
++
++  fd = open("/proc/cpuinfo", O_RDONLY);
++  if (fd < 0) {
++    free (cpuinfo);
++    return NULL;
++  }
++
++  n = read(fd, cpuinfo, 4095);
++  if (n < 0) {
++    free (cpuinfo);
++    close (fd);
++    return NULL;
++  }
++  cpuinfo[n] = 0;
++
++  close (fd);
++
++  return cpuinfo;
++}
++
+ static void
+ oil_cpu_detect_arm(void)
+ {
+@@ -249,7 +274,7 @@ oil_cpu_detect_mips(void)
+ }
+ #endif
+ 
+-static void
++void
+ oil_cpu_detect_arch(void)
+ {
+ #if defined(__i386__) || defined(__amd64__)