Thu Dec 29 10:00:50 2011 UTC ()
use AUDIO_GETBUFINFO when available; bump pkg revision
(jmcneill)
diff -r1.96 -r1.97 pkgsrc/devel/SDL/Makefile
diff -r1.58 -r1.59 pkgsrc/devel/SDL/distinfo
diff -r0 -r1.1 pkgsrc/devel/SDL/patches/patch-src_audio_sun_SDL__sunaudio.c
--- pkgsrc/devel/SDL/Makefile 2011/12/26 12:28:46 1.96
+++ pkgsrc/devel/SDL/Makefile 2011/12/29 10:00:49 1.97
| @@ -1,17 +1,17 @@ | | | @@ -1,17 +1,17 @@ |
| 1 | # $NetBSD: Makefile,v 1.96 2011/12/26 12:28:46 wiz Exp $ | | 1 | # $NetBSD: Makefile,v 1.97 2011/12/29 10:00:49 jmcneill Exp $ |
| 2 | | | 2 | |
| 3 | DISTNAME= SDL-1.2.14 | | 3 | DISTNAME= SDL-1.2.14 |
| 4 | PKGREVISION= 5 | | 4 | PKGREVISION= 6 |
| 5 | CATEGORIES= devel games | | 5 | CATEGORIES= devel games |
| 6 | MASTER_SITES= http://www.libsdl.org/release/ | | 6 | MASTER_SITES= http://www.libsdl.org/release/ |
| 7 | | | 7 | |
| 8 | MAINTAINER= wiz@NetBSD.org | | 8 | MAINTAINER= wiz@NetBSD.org |
| 9 | HOMEPAGE= http://www.libsdl.org/ | | 9 | HOMEPAGE= http://www.libsdl.org/ |
| 10 | COMMENT= Simple DirectMedia Layer, a cross-platform multimedia library | | 10 | COMMENT= Simple DirectMedia Layer, a cross-platform multimedia library |
| 11 | LICENSE= gnu-lgpl-v2.1 | | 11 | LICENSE= gnu-lgpl-v2.1 |
| 12 | | | 12 | |
| 13 | PKG_DESTDIR_SUPPORT= user-destdir | | 13 | PKG_DESTDIR_SUPPORT= user-destdir |
| 14 | | | 14 | |
| 15 | USE_LANGUAGES= c c++ | | 15 | USE_LANGUAGES= c c++ |
| 16 | USE_LIBTOOL= yes | | 16 | USE_LIBTOOL= yes |
| 17 | USE_TOOLS+= gmake | | 17 | USE_TOOLS+= gmake |
--- pkgsrc/devel/SDL/distinfo 2011/12/26 12:28:46 1.58
+++ pkgsrc/devel/SDL/distinfo 2011/12/29 10:00:49 1.59
| @@ -1,10 +1,11 @@ | | | @@ -1,10 +1,11 @@ |
| 1 | $NetBSD: distinfo,v 1.58 2011/12/26 12:28:46 wiz Exp $ | | 1 | $NetBSD: distinfo,v 1.59 2011/12/29 10:00:49 jmcneill Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (SDL-1.2.14.tar.gz) = ba625b4b404589b97e92d7acd165992debe576dd | | 3 | SHA1 (SDL-1.2.14.tar.gz) = ba625b4b404589b97e92d7acd165992debe576dd |
| 4 | RMD160 (SDL-1.2.14.tar.gz) = a3a9a691f5510eb5327ca159a034f55a70cb5801 | | 4 | RMD160 (SDL-1.2.14.tar.gz) = a3a9a691f5510eb5327ca159a034f55a70cb5801 |
| 5 | Size (SDL-1.2.14.tar.gz) = 4014154 bytes | | 5 | Size (SDL-1.2.14.tar.gz) = 4014154 bytes |
| 6 | SHA1 (patch-aa) = 5a3b922c1ad64837d2bc1461723e4f34622b481f | | 6 | SHA1 (patch-aa) = 5a3b922c1ad64837d2bc1461723e4f34622b481f |
| 7 | SHA1 (patch-ab) = 03758f707c39c6241214f5e9ecbd47f937d18580 | | 7 | SHA1 (patch-ab) = 03758f707c39c6241214f5e9ecbd47f937d18580 |
| 8 | SHA1 (patch-ac) = a5a04b04bffd24787282de3fa719809ba63193dd | | 8 | SHA1 (patch-ac) = a5a04b04bffd24787282de3fa719809ba63193dd |
| | | 9 | SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = e2bbc5577a397e418c3fb565428b8fc558089802 |
| 9 | SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 7e11bb2bbef815560da7ac967b71f3a0b7e4da44 | | 10 | SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 7e11bb2bbef815560da7ac967b71f3a0b7e4da44 |
| 10 | SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 6a35135581a29107099eb184765d340d9d202dc2 | | 11 | SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 6a35135581a29107099eb184765d340d9d202dc2 |
$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;