From 5814a7b60878952672bc6d73a5a7ddffaf935462 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Thu, 17 Oct 2002 00:02:00 +0000
Subject: Make this package OSS-aware.

---
 audio/xmms-crossfade/Makefile         |  4 +++-
 audio/xmms-crossfade/distinfo         |  5 +++--
 audio/xmms-crossfade/patches/patch-ab |  8 +++++---
 audio/xmms-crossfade/patches/patch-af | 13 +++++++++++++
 4 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 audio/xmms-crossfade/patches/patch-af

diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index 0b3d0ff0a17..64892c991db 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/09/21 01:31:24 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/10/17 00:02:00 jlam Exp $
 #
 
 DISTNAME=		xmms-crossfade-0.2.9
@@ -18,6 +18,8 @@ USE_LIBTOOL=		YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 LDFLAGS+=		${LIBOSSAUDIO}
+OSS_DEFS+=		-DDEFAULT_OSS_ALT_AUDIO_DEVICE=\\\"${DEVOSSSOUND}\\\"
+MAKE_ENV+=		OSS_DEFS="${OSS_DEFS}"
 
 .include "../../audio/xmms/buildlink2.mk"
 .include "../../mk/ossaudio.buildlink2.mk"
diff --git a/audio/xmms-crossfade/distinfo b/audio/xmms-crossfade/distinfo
index 4e1199c1908..f49945efd18 100644
--- a/audio/xmms-crossfade/distinfo
+++ b/audio/xmms-crossfade/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.2 2001/06/21 17:00:31 rh Exp $
+$NetBSD: distinfo,v 1.3 2002/10/17 00:02:00 jlam Exp $
 
 SHA1 (xmms-crossfade-0.2.9.tar.gz) = afe3ec2a17d9dae54fffe318ef0a14470e045894
 Size (xmms-crossfade-0.2.9.tar.gz) = 200553 bytes
 SHA1 (patch-aa) = 1f710760444071888612a76d4ac698930b7ea999
-SHA1 (patch-ab) = cd98f4d68b0a0aabcd590c8dfdd7bfa80dd4a0e9
+SHA1 (patch-ab) = ab26ceb14c568eb36728d0aa9498812a56b1e12b
 SHA1 (patch-ac) = 57e7452262c0522fd641ad27139398dfac3c046a
 SHA1 (patch-ad) = d2a1f96dc6544020d49b7e21b1860224a71fa1c6
 SHA1 (patch-ae) = fd3b3e9aae83884defbb449a2cae47a06aec4ee5
+SHA1 (patch-af) = a79ca55bc695169f57c3b7bc569a1ca69e416895
diff --git a/audio/xmms-crossfade/patches/patch-ab b/audio/xmms-crossfade/patches/patch-ab
index e3dda2e31ff..3bbb1e2cdb9 100644
--- a/audio/xmms-crossfade/patches/patch-ab
+++ b/audio/xmms-crossfade/patches/patch-ab
@@ -1,15 +1,17 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/05/23 20:17:22 rh Exp $
+$NetBSD: patch-ab,v 1.2 2002/10/17 00:02:01 jlam Exp $
 
---- crossfade.h.orig	Tue May  8 15:32:19 2001
+--- crossfade.h.orig	Mon May 14 04:27:08 2001
 +++ crossfade.h
-@@ -108,7 +108,11 @@
+@@ -108,7 +108,13 @@
  #define FC_OFFSET_LOCK_OUT 2
  #define FC_OFFSET_CUSTOM   3
  
++#ifndef DEFAULT_OSS_ALT_AUDIO_DEVICE
 +#ifdef __NetBSD__
 +#define DEFAULT_OSS_ALT_AUDIO_DEVICE "/dev/sound"
 +#else
  #define DEFAULT_OSS_ALT_AUDIO_DEVICE "/dev/dsp"
++#endif
 +#endif
  #define DEFAULT_OSS_ALT_MIXER_DEVICE "/dev/mixer"
  #define DEFAULT_OP_CONFIG_STRING     "libOSS.so=0,1,2304,0; libdisk_writer.so=1,0,2304,1"
diff --git a/audio/xmms-crossfade/patches/patch-af b/audio/xmms-crossfade/patches/patch-af
new file mode 100644
index 00000000000..8581d5de4cc
--- /dev/null
+++ b/audio/xmms-crossfade/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2002/10/17 00:02:01 jlam Exp $
+
+--- Makefile.in.orig	Thu Jun  7 09:35:11 2001
++++ Makefile.in
+@@ -109,7 +109,7 @@ CONFIG_CLEAN_FILES =  xmms-crossfade.spe
+ LTLIBRARIES =  $(lib_LTLIBRARIES)
+ 
+ 
+-DEFS = @DEFS@ -I. -I$(srcdir) -I.
++DEFS = @DEFS@ -I. -I$(srcdir) -I. $(OSS_DEFS)
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
-- 
cgit v1.2.3