Fix build, fix module loading on NetBSD.

4 files changed, 48 insertions, 5 deletions

diff --git a/audio/alsa-lib/distinfo b/audio/alsa-lib/distinfo
index f2047d0e9a3..23e701753af 100644
--- a/audio/alsa-lib/distinfo
+++ b/audio/alsa-lib/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2008/12/19 05:14:00 jmcneill Exp $
 
 SHA1 (alsa-lib-1.0.18.tar.bz2) = 54e6916738e479a0eec7e9f4715c22efee4d8594
 RMD160 (alsa-lib-1.0.18.tar.bz2) = 88a7a5ce6133704d100f034b9e08e9ffdf0627d9
 Size (alsa-lib-1.0.18.tar.bz2) = 790052 bytes
 SHA1 (patch-aa) = 5a8e9571ac6fb1f1f6cbd18d3859468a7b64076f
-SHA1 (patch-ab) = a29fcc96e01dc188d6f75677878b7daa3d9d114b
+SHA1 (patch-ab) = ab300175db0e2390fa10141a23a883e92e244af4
 SHA1 (patch-ac) = 6f4e585a419d86ce9704157e45253c637494757e
 SHA1 (patch-ad) = 16d5890ac5f947a2c4e3798c15d6a90fb1f7d817
 SHA1 (patch-ae) = 6f918ae55898c1f15bfd5243e62ecd5594a312ca
@@ -36,3 +36,5 @@ SHA1 (patch-bd) = 63a102186f4df59da93bedaac772530e166a9fde
 SHA1 (patch-be) = e071d0f3518dac8bbda216d4bd850a2a3557b103
 SHA1 (patch-bf) = a1159663f1c03437a9afdfc781ac3d0019c4774b
 SHA1 (patch-bg) = 19d678643c68c250eebc75fbe17119d478e738cc
+SHA1 (patch-bh) = 2d05c967caa72a9256057c6fef4190288871b1c2
+SHA1 (patch-bi) = b5038db277068034281787c0072201beae8df8ff
diff --git a/audio/alsa-lib/patches/patch-ab b/audio/alsa-lib/patches/patch-ab
index 5dd5a1f76b6..c6cbf58ddb9 100644
--- a/audio/alsa-lib/patches/patch-ab
+++ b/audio/alsa-lib/patches/patch-ab
@@ -1,8 +1,23 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-ab,v 1.2 2008/12/19 05:14:00 jmcneill Exp $
 
 --- configure.orig	2008-10-29 08:46:35.000000000 -0400
-+++ configure
-@@ -22342,6 +22342,11 @@ test "x$prefix" = xNONE && prefix=$ac_de
++++ configure	2008-12-19 00:09:49.000000000 -0500
+@@ -20983,6 +20983,14 @@
+ echo "${ECHO_T}no" >&6; }
+ fi
+ 
++case $host_os in
++  netbsd*)
++    HAVE_LIBDL=yes
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LIBDL 1
++_ACEOF
++    ;;
++esac
+ 
+ if test "$HAVE_LIBDL"="yes"; then
+   BUILD_MODULES_TRUE=
+@@ -22342,6 +22350,11 @@
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
  DEFS=-DHAVE_CONFIG_H
diff --git a/audio/alsa-lib/patches/patch-bh b/audio/alsa-lib/patches/patch-bh
new file mode 100644
index 00000000000..7f61c81e98d
--- /dev/null
+++ b/audio/alsa-lib/patches/patch-bh
@@ -0,0 +1,14 @@
+$NetBSD: patch-bh,v 1.1 2008/12/19 05:14:00 jmcneill Exp $
+
+--- src/pcm/pcm_meter.c.orig	2008-12-19 00:05:13.000000000 -0500
++++ src/pcm/pcm_meter.c	2008-12-19 00:05:34.000000000 -0500
+@@ -27,7 +27,9 @@
+  */
+   
+ 
++#ifndef __NetBSD__
+ #include <byteswap.h>
++#endif
+ #include <time.h>
+ #include <pthread.h>
+ #include <dlfcn.h>
diff --git a/audio/alsa-lib/patches/patch-bi b/audio/alsa-lib/patches/patch-bi
new file mode 100644
index 00000000000..beefafb2bd4
--- /dev/null
+++ b/audio/alsa-lib/patches/patch-bi
@@ -0,0 +1,12 @@
+$NetBSD: patch-bi,v 1.1 2008/12/19 05:14:00 jmcneill Exp $
+
+--- src/pcm/pcm_ladspa.c.orig	2008-12-19 00:06:18.000000000 -0500
++++ src/pcm/pcm_ladspa.c	2008-12-19 00:06:31.000000000 -0500
+@@ -33,6 +33,7 @@
+  */
+   
+ #include <dirent.h>
++#include <dlfcn.h>
+ #include <locale.h>
+ #include <math.h>
+ #include "pcm_local.h"