From 56ec9b103c5702ec9844cdf571e2429d73dc54b5 Mon Sep 17 00:00:00 2001
From: ben <ben@pkgsrc.org>
Date: Sat, 28 Aug 2004 21:09:08 +0000
Subject: Patch wine to use mk/ossaudio.buildlink3.mk and DEVOSSAUDIO instead
 of hardcoding /dev/dsp.

---
 emulators/wine/Makefile         |  5 +++--
 emulators/wine/distinfo         |  3 ++-
 emulators/wine/patches/patch-af | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 emulators/wine/patches/patch-af

(limited to 'emulators/wine')

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 2f5dcac84f1..231f7170cd2 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2004/05/06 15:51:35 adam Exp $
+# $NetBSD: Makefile,v 1.73 2004/08/28 21:09:08 ben Exp $
 #
 
 DISTNAME=	Wine-20040505
@@ -40,6 +40,7 @@ REPLACE_PERL=		tools/winemaker tools/winedump/function_grep.pl
 # against the libraries.
 #
 CONFIGURE_ENV+=		X_LIBS="${LDFLAGS}"
+CONFIGURE_ENV+=		CFLAGS="${CFLAGS} -DDEVOSSAUDIO=\"\\\"${DEVOSSAUDIO}\\\"\""
 LIBS+=			${LDFLAGS}
 
 .include "../../mk/bsd.prefs.mk"
@@ -62,6 +63,6 @@ post-install:
 .include "../../graphics/glut/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
-
+.include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 247c680a2eb..5595fa21775 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2004/05/06 15:51:35 adam Exp $
+$NetBSD: distinfo,v 1.26 2004/08/28 21:09:08 ben Exp $
 
 SHA1 (Wine-20040505.tar.gz) = 42de0d3323cfe001eb6c720d25cd1c531ec7928d
 Size (Wine-20040505.tar.gz) = 10499070 bytes
@@ -7,3 +7,4 @@ SHA1 (patch-ab) = 313180ea924c224ebecad0b8764584230497f8ed
 SHA1 (patch-ac) = e0b2c811a7bbcd07a7ca65d7eda30e1a7e4acef7
 SHA1 (patch-ad) = 28c15181eab48f1e82d10046b77fa1ebac3c4ef6
 SHA1 (patch-ae) = 691113bab9f24bcbabd786e7f1ff2fe0933d721f
+SHA1 (patch-af) = 4cc9be69097560f0b25730c693a18b4875282404
diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af
new file mode 100644
index 00000000000..96a4d67ac76
--- /dev/null
+++ b/emulators/wine/patches/patch-af
@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.8 2004/08/28 21:09:08 ben Exp $
+
+--- dlls/winmm/wineoss/audio.c.orig	Tue May  4 18:09:24 2004
++++ dlls/winmm/wineoss/audio.c
+@@ -958,10 +958,10 @@ LONG OSS_WaveInit(void)
+     for (i = 0; i < MAX_WAVEDRV; ++i)
+     {
+ 	if (i == 0) {
+-	    sprintf((char *)OSS_Devices[i].dev_name, "/dev/dsp");
++	    sprintf((char *)OSS_Devices[i].dev_name, DEVOSSAUDIO);
+ 	    sprintf((char *)OSS_Devices[i].mixer_name, "/dev/mixer");
+ 	} else {
+-	    sprintf((char *)OSS_Devices[i].dev_name, "/dev/dsp%d", i);
++	    sprintf((char *)OSS_Devices[i].dev_name, "%s%d", DEVOSSAUDIO, i);
+ 	    sprintf((char *)OSS_Devices[i].mixer_name, "/dev/mixer%d", i);
+ 	}
+ 
-- 
cgit v1.2.3