-make sure the NetBSD <soundcard.h> is found instead of the version

 which comes with xmms, and link in -lossaudio
-fix the sun audio configuration dialog to avoid double unlocking of
 mutexes which NetBSD's libpthread gets mad about

5 files changed, 71 insertions, 0 deletions

diff --git a/audio/xmms/patches/patch-ab b/audio/xmms/patches/patch-ab
new file mode 100644
index 00000000000..351afe9c1a2
--- /dev/null
+++ b/audio/xmms/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.5 2004/05/12 18:50:21 drochner Exp $
+
+--- Output/OSS/OSS.h.orig	2004-05-12 21:21:08.000000000 +0200
++++ Output/OSS/OSS.h	2004-05-12 21:21:26.000000000 +0200
+@@ -37,7 +37,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
+-#include "soundcard.h"
++#include <soundcard.h>
+ 
+ #include "xmms/plugin.h"
+ #include "libxmms/configfile.h"
diff --git a/audio/xmms/patches/patch-ac b/audio/xmms/patches/patch-ac
new file mode 100644
index 00000000000..1ea06079864
--- /dev/null
+++ b/audio/xmms/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.6 2004/05/12 18:50:21 drochner Exp $
+
+--- Output/OSS/Makefile.in.orig	2004-05-12 21:38:26.000000000 +0200
++++ Output/OSS/Makefile.in	2004-05-12 21:40:23.000000000 +0200
+@@ -240,7 +240,7 @@
+ lib_LTLIBRARIES = $(ossltlibs)
+ 
+ libOSS_la_LDFLAGS = @PLUGIN_LDFLAGS@
+-libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@
++libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ -lossaudio
+ libOSS_la_SOURCES = $(ossbuildsources)
+ INCLUDES = @GTK_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
+ subdir = Output/OSS
diff --git a/audio/xmms/patches/patch-ad b/audio/xmms/patches/patch-ad
new file mode 100644
index 00000000000..5ad5b703ff8
--- /dev/null
+++ b/audio/xmms/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.5 2004/05/12 18:50:21 drochner Exp $
+
+--- Input/cdaudio/cdaudio.h.orig	2004-05-12 21:26:15.000000000 +0200
++++ Input/cdaudio/cdaudio.h	2004-05-12 21:27:13.000000000 +0200
+@@ -39,7 +39,7 @@
+ #include "cdinfo.h"
+ 
+ #ifdef HAVE_OSS
+-#include <Output/OSS/soundcard.h>
++#include <soundcard.h>
+ #endif
+ 
+ #ifdef HAVE_MNTENT_H
diff --git a/audio/xmms/patches/patch-ae b/audio/xmms/patches/patch-ae
new file mode 100644
index 00000000000..ddc38349fb1
--- /dev/null
+++ b/audio/xmms/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.7 2004/05/12 18:50:21 drochner Exp $
+
+--- Input/cdaudio/Makefile.in.orig	2004-05-12 21:39:31.000000000 +0200
++++ Input/cdaudio/Makefile.in	2004-05-12 21:40:22.000000000 +0200
+@@ -242,7 +242,7 @@
+ 
+ INCLUDES = @GTK_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
+ libcdaudio_la_LDFLAGS = @PLUGIN_LDFLAGS@
+-libcdaudio_la_LIBADD = @GTK_LIBS@
++libcdaudio_la_LIBADD = @GTK_LIBS@ -lossaudio
+ libcdaudio_la_SOURCES = $(cdaudiobuildsources)
+ subdir = Input/cdaudio
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/audio/xmms/patches/patch-af b/audio/xmms/patches/patch-af
new file mode 100644
index 00000000000..ad305a407ac
--- /dev/null
+++ b/audio/xmms/patches/patch-af
@@ -0,0 +1,19 @@
+$NetBSD: patch-af,v 1.6 2004/05/12 18:50:21 drochner Exp $
+
+--- Output/sun/configure.c.orig	2004-05-12 22:33:27.000000000 +0200
++++ Output/sun/configure.c	2004-05-12 22:34:11.000000000 +0200
+@@ -75,12 +75,12 @@
+ 	xmms_cfg_write_default_file(cfgfile);
+ 	xmms_cfg_free(cfgfile);
+ 
+-	configure_win_destroy();
++	gtk_widget_destroy(configure_win);
+ }
+ 
+ static void configure_win_cancel_cb(GtkWidget *w, gpointer data)
+ {
+-	configure_win_destroy();
++	gtk_widget_destroy(configure_win);
+ }
+ 
+ static void mixer_cbutton_toggled_cb(GtkWidget *w, int id)