[pkgsrc/trunk]: pkgsrc/audio/alsa-lib Fix build, fix module loading on NetBSD.

[jmcneill <jmcneill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8ede8fb2188f
branches:  trunk
changeset: 551708:8ede8fb2188f
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Fri Dec 19 05:14:00 2008 +0000

description:
Fix build, fix module loading on NetBSD.

diffstat:

 audio/alsa-lib/distinfo         |   6 ++++--
 audio/alsa-lib/patches/patch-ab |  21 ++++++++++++++++++---
 audio/alsa-lib/patches/patch-bh |  14 ++++++++++++++
 audio/alsa-lib/patches/patch-bi |  12 ++++++++++++
 4 files changed, 48 insertions(+), 5 deletions(-)

diffs (86 lines):

diff -r 3ef5d5c9b8b5 -r 8ede8fb2188f audio/alsa-lib/distinfo
--- a/audio/alsa-lib/distinfo   Fri Dec 19 04:42:38 2008 +0000
+++ b/audio/alsa-lib/distinfo   Fri Dec 19 05:14:00 2008 +0000
@@ -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-be) = e071d0f3518dac8bbda216d4bd850a2a3557b103
 SHA1 (patch-bf) = a1159663f1c03437a9afdfc781ac3d0019c4774b
 SHA1 (patch-bg) = 19d678643c68c250eebc75fbe17119d478e738cc
+SHA1 (patch-bh) = 2d05c967caa72a9256057c6fef4190288871b1c2
+SHA1 (patch-bi) = b5038db277068034281787c0072201beae8df8ff
diff -r 3ef5d5c9b8b5 -r 8ede8fb2188f audio/alsa-lib/patches/patch-ab
--- a/audio/alsa-lib/patches/patch-ab   Fri Dec 19 04:42:38 2008 +0000
+++ b/audio/alsa-lib/patches/patch-ab   Fri Dec 19 05:14:00 2008 +0000
@@ -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 -r 3ef5d5c9b8b5 -r 8ede8fb2188f audio/alsa-lib/patches/patch-bh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/alsa-lib/patches/patch-bh   Fri Dec 19 05:14:00 2008 +0000
@@ -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 -r 3ef5d5c9b8b5 -r 8ede8fb2188f audio/alsa-lib/patches/patch-bi
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/alsa-lib/patches/patch-bi   Fri Dec 19 05:14:00 2008 +0000
@@ -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"