From af56f3fa6ce4e32caf6373c250de7f4d4eeb114d Mon Sep 17 00:00:00 2001
From: robert <robert@openbsd.org>
Date: Wed, 27 Apr 2005 16:31:34 +0000
Subject: [PATCH] open the audio device with the O_WRONLY flag instead of
 O_RDWR so it should work with uaudio(4) too; from Urs Breinlinger
 <urs@mailq.de>

fix the LIB_DEPENDS line of the -mp3 subpackage;
---
 audio/xmms/Makefile                         |  8 +++---
 audio/xmms/patches/patch-Output_sun_audio_c | 29 ++++++++++++++++++---
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index d716af72d64..4175b6437fc 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2005/04/13 19:20:02 robert Exp $
+# $OpenBSD: Makefile,v 1.41 2005/04/27 16:31:34 robert Exp $
 
 COMMENT=		"Multimedia player for the X Window System"
 COMMENT-esd=		"Esound output plugin for XMMS"
@@ -6,8 +6,8 @@ COMMENT-vorbis=		"Ogg Vorbis input plugin for XMMS"
 COMMENT-mikmod=		"Mikmod input plugin for XMMS"
 COMMENT-mp3=		"MP3 input plugin for XMMS"
 
-VERSION=		1.2.10p2
-DISTNAME=		xmms-${VERSION:S,p2,,}
+VERSION=		1.2.10p3
+DISTNAME=		xmms-${VERSION:S,p3,,}
 PKGNAME=		xmms-${VERSION}
 PKGNAME-esd=		xmms-esd-${VERSION}
 PKGNAME-vorbis=		xmms-vorbis-${VERSION}
@@ -89,7 +89,7 @@ RUN_DEPENDS=		::audio/xmms
 . if ${SUBPACKAGE} == "-mp3"
 PERMIT_PACKAGE_CDROM=	"patent issues"
 PERMIT_DISTFILES_CDROM= "patent issues"
-LIB_DEPENDS+		xmms.4:xmms-$(VERSION)*:${FULLPKGPATH:S/,-mp3//}
+LIB_DEPENDS+=		xmms.4:xmms-$(VERSION)*:${FULLPKGPATH:S/,-mp3//}
 WANTLIB+=		z
 . endif
 .else
diff --git a/audio/xmms/patches/patch-Output_sun_audio_c b/audio/xmms/patches/patch-Output_sun_audio_c
index 2c01c84b147..d326e367486 100644
--- a/audio/xmms/patches/patch-Output_sun_audio_c
+++ b/audio/xmms/patches/patch-Output_sun_audio_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Output_sun_audio_c,v 1.4 2005/04/13 19:20:02 robert Exp $
+$OpenBSD: patch-Output_sun_audio_c,v 1.5 2005/04/27 16:31:34 robert Exp $
 --- Output/sun/audio.c.orig	Sun Jun  2 15:42:03 2002
-+++ Output/sun/audio.c	Wed Apr 13 20:56:19 2005
++++ Output/sun/audio.c	Wed Apr 27 18:13:18 2005
 @@ -123,14 +123,12 @@
  	
  	sun = sun_format(fmt);
@@ -43,9 +43,30 @@ $OpenBSD: patch-Output_sun_audio_c,v 1.4 2005/04/13 19:20:02 robert Exp $
  			output.frequency, strerror(errno));
  		return;
  	}
-@@ -537,7 +535,7 @@
+@@ -328,7 +326,7 @@
+ 		output_time_offset += (output_bytes * 1000) / output.bps;
+ 		output_bytes = 0;
+ 		close(audio.fd);
+-		audio.fd = open(audio.devaudio, O_RDWR);
++		audio.fd = open(audio.devaudio, O_WRONLY);
+ 		sun_setformat(new_format, new_frequency, new_channels);
+ 	}
+ 	if (effects_enabled() && ep && ep->mod_samples)
+@@ -518,7 +516,7 @@
+ 		{
+ 			audio.unpause = FALSE;
+ 			close(audio.fd);
+-			audio.fd = open(audio.devaudio, O_RDWR);
++			audio.fd = open(audio.devaudio, O_WRONLY);
+ 			sun_setparams();
+ 			audio.paused = FALSE;
+ 		}
+@@ -535,9 +533,9 @@
  
- 	if ((audio.fd = open(audio.devaudio, O_RDWR)) < 0)
+ 	AUDIO_INITINFO(&info);
+ 
+-	if ((audio.fd = open(audio.devaudio, O_RDWR)) < 0)
++	if ((audio.fd = open(audio.devaudio, O_WRONLY)) < 0)
  	{
 -		g_error("%s: %s", audio.devaudio, strerror(errno));
 +		g_warning("%s: %s", audio.devaudio, strerror(errno));