From 45a553193c996bc7f204751330ce0d6d9f8a15e0 Mon Sep 17 00:00:00 2001
From: jmcneill <jmcneill@pkgsrc.org>
Date: Thu, 29 Dec 2011 10:00:49 +0000
Subject: use AUDIO_GETBUFINFO when available; bump pkg revision

---
 devel/SDL/Makefile                                 |  4 +-
 devel/SDL/distinfo                                 |  3 +-
 .../patches/patch-src_audio_sun_SDL__sunaudio.c    | 44 ++++++++++++++++++++++
 3 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 devel/SDL/patches/patch-src_audio_sun_SDL__sunaudio.c

(limited to 'devel')

diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index c1a1dd6b10e..c9475691f64 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2011/12/26 12:28:46 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2011/12/29 10:00:49 jmcneill Exp $
 
 DISTNAME=	SDL-1.2.14
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	devel games
 MASTER_SITES=	http://www.libsdl.org/release/
 
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index 3eb75500333..be17e8e7050 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2011/12/26 12:28:46 wiz Exp $
+$NetBSD: distinfo,v 1.59 2011/12/29 10:00:49 jmcneill Exp $
 
 SHA1 (SDL-1.2.14.tar.gz) = ba625b4b404589b97e92d7acd165992debe576dd
 RMD160 (SDL-1.2.14.tar.gz) = a3a9a691f5510eb5327ca159a034f55a70cb5801
@@ -6,5 +6,6 @@ Size (SDL-1.2.14.tar.gz) = 4014154 bytes
 SHA1 (patch-aa) = 5a3b922c1ad64837d2bc1461723e4f34622b481f
 SHA1 (patch-ab) = 03758f707c39c6241214f5e9ecbd47f937d18580
 SHA1 (patch-ac) = a5a04b04bffd24787282de3fa719809ba63193dd
+SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = e2bbc5577a397e418c3fb565428b8fc558089802
 SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 7e11bb2bbef815560da7ac967b71f3a0b7e4da44
 SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 6a35135581a29107099eb184765d340d9d202dc2
diff --git a/devel/SDL/patches/patch-src_audio_sun_SDL__sunaudio.c b/devel/SDL/patches/patch-src_audio_sun_SDL__sunaudio.c
new file mode 100644
index 00000000000..efdc8672446
--- /dev/null
+++ b/devel/SDL/patches/patch-src_audio_sun_SDL__sunaudio.c
@@ -0,0 +1,44 @@
+$NetBSD: patch-src_audio_sun_SDL__sunaudio.c,v 1.1 2011/12/29 10:00:50 jmcneill Exp $
+
+--- src/audio/sun/SDL_sunaudio.c.orig	2009-10-12 23:07:14.000000000 +0000
++++ src/audio/sun/SDL_sunaudio.c
+@@ -47,6 +47,10 @@
+ /* Open the audio device for playback, and don't block if busy */
+ #define OPEN_FLAGS	(O_WRONLY|O_NONBLOCK)
+ 
++#if defined(AUDIO_GETINFO) && !defined(AUDIO_GETBUFINFO) 
++#define AUDIO_GETBUFINFO AUDIO_GETINFO
++#endif
++
+ /* Audio driver functions */
+ static int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec);
+ static void DSP_WaitAudio(_THIS);
+@@ -119,11 +123,11 @@ AudioBootStrap SUNAUDIO_bootstrap = {
+ #ifdef DEBUG_AUDIO
+ void CheckUnderflow(_THIS)
+ {
+-#ifdef AUDIO_GETINFO
++#ifdef AUDIO_GETBUFINFO
+ 	audio_info_t info;
+ 	int left;
+ 
+-	ioctl(audio_fd, AUDIO_GETINFO, &info);
++	ioctl(audio_fd, AUDIO_GETBUFINFO, &info);
+ 	left = (written - info.play.samples);
+ 	if ( written && (left == 0) ) {
+ 		fprintf(stderr, "audio underflow!\n");
+@@ -134,12 +138,12 @@ void CheckUnderflow(_THIS)
+ 
+ void DSP_WaitAudio(_THIS)
+ {
+-#ifdef AUDIO_GETINFO
++#ifdef AUDIO_GETBUFINFO
+ #define SLEEP_FUDGE	10		/* 10 ms scheduling fudge factor */
+ 	audio_info_t info;
+ 	Sint32 left;
+ 
+-	ioctl(audio_fd, AUDIO_GETINFO, &info);
++	ioctl(audio_fd, AUDIO_GETBUFINFO, &info);
+ 	left = (written - info.play.samples);
+ 	if ( left > fragsize ) {
+ 		Sint32 sleepy;
-- 
cgit v1.2.3