cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- quit building audio(4) support

Browse Source 
- remove unused --disable-ltdl configure arg
This commit is contained in:
jakemsr 2010-01-12 11:19:06 +00:00
parent 2b40d8d8f2
commit d30e4ddda5
4 changed files with 12 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devel/sdl/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.73 2009/08/10 06:31:08 kili Exp $
# $OpenBSD: Makefile,v 1.74 2010/01/12 11:19:06 jakemsr Exp $
COMMENT= cross-platform multimedia library
VERSION= 1.2.13
DISTNAME= SDL-${VERSION}
PKGNAME= ${DISTNAME:L}p12
PKGNAME= ${DISTNAME:L}p13
CATEGORIES= devel
HOMEPAGE= http://www.libsdl.org/
@ -50,11 +50,9 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-arts \
--disable-esd \
--disable-oss \
--disable-ltdl \
--disable-pulseaudio \
--enable-nasm \
--enable-pthread-sem \
--enable-sunaudio
--enable-pthread-sem
.if ${FLAVOR:L:Maa}
LIB_DEPENDS+= aa::graphics/aalib

22
devel/sdl/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.20 2009/01/24 10:56:11 jakemsr Exp $
$OpenBSD: patch-configure,v 1.21 2010/01/12 11:19:06 jakemsr Exp $
--- configure.orig Sun Dec 30 21:09:39 2007
+++ configure Mon Sep 22 20:13:46 2008
+++ configure Tue Jan 12 02:48:55 2010
@@ -25411,6 +25411,20 @@ _ACEOF
fi
}
@ -40,16 +40,12 @@ $OpenBSD: patch-configure,v 1.20 2009/01/24 10:56:11 jakemsr Exp $
CheckPulseAudio
CheckNAS
CheckX11
@@ -33612,10 +33624,10 @@ _ACEOF
;;
netbsd|openbsd)
cat >>confdefs.h <<\_ACEOF
-#define SDL_AUDIO_DRIVER_BSD 1
+#define SDL_AUDIO_DRIVER_SUNAUDIO 1
_ACEOF
- SOURCES="$SOURCES $srcdir/src/audio/bsd/*.c"
+ SOURCES="$SOURCES $srcdir/src/audio/sun/*.c"
@@ -33610,7 +33622,7 @@ _ACEOF
SOURCES="$SOURCES $srcdir/src/audio/sun/*.c"
have_audio=yes
;;
aix)
- netbsd|openbsd)
+ netbsd)
cat >>confdefs.h <<\_ACEOF
#define SDL_AUDIO_DRIVER_BSD 1
_ACEOF

12
devel/sdl/patches/patch-src_audio_bsd_SDL_bsdaudio_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_audio_bsd_SDL_bsdaudio_c,v 1.1 2007/09/22 01:12:38 pvalchev Exp $
--- src/audio/bsd/SDL_bsdaudio.c.orig Sat Sep 8 22:34:02 2007
+++ src/audio/bsd/SDL_bsdaudio.c Sat Sep 8 22:34:34 2007
@@ -292,7 +292,7 @@ OBSD_Status(_THIS)
info.blocksize,
info.hiwat, info.lowat,
(info.mode == AUMODE_PLAY) ? "PLAY"
- : (info.mode = AUMODE_RECORD) ? "RECORD"
+ : (info.mode == AUMODE_RECORD) ? "RECORD"
: (info.mode == AUMODE_PLAY_ALL ? "PLAY_ALL"
: "?"));
}

325
devel/sdl/patches/patch-src_audio_sun_SDL_sunaudio_c
View File

@ -1,325 +0,0 @@
$OpenBSD: patch-src_audio_sun_SDL_sunaudio_c,v 1.4 2007/09/22 01:12:38 pvalchev Exp $
--- src/audio/sun/SDL_sunaudio.c.orig Fri Jul 20 01:52:10 2007
+++ src/audio/sun/SDL_sunaudio.c Sat Sep 8 22:23:18 2007
@@ -25,7 +25,7 @@
#include <fcntl.h>
#include <errno.h>
-#ifdef __NETBSD__
+#if defined(__NETBSD__) || defined(__OpenBSD__)
#include <sys/ioctl.h>
#include <sys/audioio.h>
#endif
@@ -135,12 +135,19 @@ void CheckUnderflow(_THIS)
void DSP_WaitAudio(_THIS)
{
#ifdef AUDIO_GETINFO
-#define SLEEP_FUDGE 10 /* 10 ms scheduling fudge factor */
+#define SLEEP_FUDGE 100 /* 100 ms scheduling fudge factor */
+ u_long left;
+
+#ifdef AUDIO_WSEEK
+ ioctl(audio_fd, AUDIO_WSEEK, &left);
+ left = left / (this->spec.channels * (this->spec.format & 0xff) / 8);
+#else
audio_info_t info;
- Sint32 left;
+ /* OpenBSD and NetBSD return bytes, not samples in info.play.samples */
ioctl(audio_fd, AUDIO_GETINFO, &info);
left = (written - info.play.samples);
+#endif
if ( left > fragsize ) {
Sint32 sleepy;
@@ -214,9 +221,22 @@ void DSP_PlayAudio(_THIS)
#ifdef DEBUG_AUDIO
CheckUnderflow(this);
#endif
- if ( write(audio_fd, mixbuf, this->spec.size) < 0 ) {
+ while ( write(audio_fd, mixbuf, this->spec.size) < 0 ) {
+#ifdef DEBUG_AUDIO
+ fprintf(stderr, "audio write error: %s\n", strerror(errno));
+#endif
+#ifndef AUDIO_GETINFO
/* Assume fatal error, for now */
this->enabled = 0;
+ break;
+#else
+ /* no guarantee against EAGAIN doing our own timing */
+ if (!((errno == EAGAIN) && (OPEN_FLAGS & O_NONBLOCK))) {
+ /* Assume fatal error, for now */
+ this->enabled = 0;
+ break;
+ }
+#endif
}
written += fragsize;
}
@@ -244,7 +264,10 @@ int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec)
{
char audiodev[1024];
#ifdef AUDIO_SETINFO
+ audio_info_t info, ginfo;
+ audio_encoding_t audio_enc;
int enc;
+ int encodings, i;
#endif
int desired_freq = spec->freq;
@@ -259,16 +282,34 @@ int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec)
case 8: { /* Unsigned 8 bit audio data */
spec->format = AUDIO_U8;
#ifdef AUDIO_SETINFO
+#ifdef __OpenBSD__
+#if BYTE_ORDER == LITTLE_ENDIAN
+ enc = AUDIO_ENCODING_ULINEAR_LE;
+#else
+ enc = AUDIO_ENCODING_ULINEAR_BE;
+#endif
+#else
enc = AUDIO_ENCODING_LINEAR8;
#endif
+#endif
}
break;
case 16: { /* Signed 16 bit audio data */
- spec->format = AUDIO_S16SYS;
#ifdef AUDIO_SETINFO
+#ifdef __OpenBSD__
+ if (spec->format & 0x1000) {
+ spec->format = AUDIO_S16MSB;
+ enc = AUDIO_ENCODING_SLINEAR_BE;
+ } else {
+ spec->format = AUDIO_S16LSB;
+ enc = AUDIO_ENCODING_SLINEAR_LE;
+ }
+#else
+ spec->format = AUDIO_S16SYS;
enc = AUDIO_ENCODING_LINEAR;
#endif
+#endif
}
break;
@@ -287,10 +328,128 @@ int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec)
return(-1);
}
+ /* find native encodings */
+ /* all drivers support one of ulinear:8, slinear_le:16, slinear_be:16 */
+ /* except audioce on sparc, which is ulaw only */
+ /* and SDL doesn't do ulaw */
+
+ encodings = 0;
+ for (i = 0; ; i++) {
+ audio_enc.index = i;
+ if (ioctl(audio_fd, AUDIO_GETENC, &audio_enc) < 0)
+ break;
+
+ if ((audio_enc.encoding == AUDIO_ENCODING_SLINEAR_LE) &&
+ (audio_enc.precision == 16) &&
+ !(audio_enc.flags & AUDIO_ENCODINGFLAG_EMULATED))
+ encodings |= 0x1;
+
+ if ((audio_enc.encoding == AUDIO_ENCODING_SLINEAR_BE) &&
+ (audio_enc.precision == 16) &&
+ !(audio_enc.flags & AUDIO_ENCODINGFLAG_EMULATED))
+ encodings |= 0x2;
+
+ if ((audio_enc.encoding == AUDIO_ENCODING_ULINEAR) &&
+ (audio_enc.precision == 8) &&
+ !(audio_enc.flags & AUDIO_ENCODINGFLAG_EMULATED))
+ encodings |= 0x4;
+
+ /* there's really no endianness with 1 byte formats */
+ /* and some drivers don't add the generic form above */
+
+ if ((audio_enc.encoding == AUDIO_ENCODING_ULINEAR_LE) &&
+ (audio_enc.precision == 8) &&
+ !(audio_enc.flags & AUDIO_ENCODINGFLAG_EMULATED))
+ encodings |= 0x4;
+
+ if ((audio_enc.encoding == AUDIO_ENCODING_ULINEAR_BE) &&
+ (audio_enc.precision == 8) &&
+ !(audio_enc.flags & AUDIO_ENCODINGFLAG_EMULATED))
+ encodings |= 0x4;
+ }
+
+ if (encodings == 0) {
+ SDL_SetError("No native audio encodings found for %s",
+ audiodev);
+ return(-1);
+ }
+ if (encodings & 0x1) {
+ if (enc == AUDIO_ENCODING_SLINEAR_BE && !(encodings & 0x2)) {
+ enc = AUDIO_ENCODING_SLINEAR_LE;
+ spec->format = AUDIO_S16LSB;
+ }
+ if (enc == AUDIO_ENCODING_ULINEAR_LE && !(encodings & 0x4)) {
+ enc = AUDIO_ENCODING_SLINEAR_LE;
+ spec->format = AUDIO_S16LSB;
+ }
+ }
+ if (encodings & 0x2) {
+ if (enc == AUDIO_ENCODING_SLINEAR_LE && !(encodings & 0x1)) {
+ enc = AUDIO_ENCODING_SLINEAR_BE;
+ spec->format = AUDIO_S16MSB;
+ }
+ if (enc == AUDIO_ENCODING_ULINEAR_BE && !(encodings & 0x4)) {
+ enc = AUDIO_ENCODING_SLINEAR_BE;
+ spec->format = AUDIO_S16MSB;
+ }
+ }
+ if (encodings & 0x4) {
+ if (enc == AUDIO_ENCODING_SLINEAR_LE && !(encodings & 0x1)) {
+ enc = AUDIO_ENCODING_ULINEAR_LE;
+ spec->format = AUDIO_U8;
+ }
+ if (enc == AUDIO_ENCODING_SLINEAR_BE && !(encodings & 0x2)) {
+ enc = AUDIO_ENCODING_ULINEAR_BE;
+ spec->format = AUDIO_U8;
+ }
+ }
+
+ AUDIO_INITINFO(&info);
+ info.play.precision = spec->format & 0xff;
+ info.play.encoding = enc;
+ /* this should always pass, based on AUDIO_GETENC work above */
+ if (ioctl(audio_fd, AUDIO_SETINFO, &info) == -1 ) {
+ SDL_SetError("Setting encoding %d failed", enc);
+ return(-1);
+ }
+ if (ioctl(audio_fd, AUDIO_GETINFO, &ginfo) != -1 ) {
+ if (ginfo.play.encoding != enc) {
+ SDL_SetError("error setting encoding, "
+ "tried %d, returned %d",
+ enc, ginfo.play.encoding);
+ return(-1);
+ }
+ if (ginfo.play.precision != (spec->format & 0xff)) {
+ SDL_SetError("error setting precision, "
+ "tried %d, returned %d",
+ spec->format & 0xff, ginfo.play.precision);
+ return(-1);
+ }
+ }
+
+ /* now check the number of channels */
+ info.play.channels = spec->channels;
+ if (ioctl(audio_fd, AUDIO_SETINFO, &info) == -1 ) {
+ if (spec->channels == 2)
+ spec->channels = 1;
+ else
+ spec->channels = 2;
+
+ info.play.channels = spec->channels;
+ (void)ioctl(audio_fd, AUDIO_SETINFO, &info);
+ }
+ if (ioctl(audio_fd, AUDIO_GETINFO, &ginfo) != -1 ) {
+ if (ginfo.play.channels != spec->channels) {
+ SDL_SetError("error setting channels, "
+ "tried %d, returned %d",
+ spec->channels, ginfo.play.channels);
+ return(-1);
+ }
+ }
+
ulaw_only = 0; /* modern Suns do support linear audio */
#ifdef AUDIO_SETINFO
for(;;) {
- audio_info_t info;
AUDIO_INITINFO(&info); /* init all fields to "no change" */
/* Try to set the requested settings */
@@ -299,8 +458,25 @@ int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec)
info.play.precision = (enc == AUDIO_ENCODING_ULAW)
? 8 : spec->format & 0xff;
info.play.encoding = enc;
- if( ioctl(audio_fd, AUDIO_SETINFO, &info) == 0 ) {
+ if (ioctl(audio_fd, AUDIO_SETINFO, &info) == -1 ) {
+
+ /* some devices only play at certain frequencies */
+ /* try the current frequency */
+ (void)ioctl(audio_fd, AUDIO_GETINFO, &ginfo);
+ info.play.sample_rate = ginfo.play.sample_rate;
+ if (ioctl(audio_fd, AUDIO_SETINFO, &info) == -1 ) {
+
+ /* some may play only @ 48000 Hz */
+ info.play.sample_rate = 48000;
+ if( ioctl(audio_fd, AUDIO_SETINFO, &info) == -1 ) {
+
+ /* some may play only @ 44100 Hz */
+ info.play.sample_rate = 44100;
+ }
+ }
+ }
+ if( ioctl(audio_fd, AUDIO_SETINFO, &info) == 0 ) {
/* Check to be sure we got what we wanted */
if(ioctl(audio_fd, AUDIO_GETINFO, &info) < 0) {
SDL_SetError("Error getting audio parameters: %s",
@@ -317,13 +493,34 @@ int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec)
}
switch(enc) {
+#ifdef __OpenBSD__
+ case AUDIO_ENCODING_ULINEAR:
+ case AUDIO_ENCODING_ULINEAR_LE:
+ case AUDIO_ENCODING_ULINEAR_BE:
+#else
case AUDIO_ENCODING_LINEAR8:
+#endif
/* unsigned 8bit apparently not supported here */
- enc = AUDIO_ENCODING_LINEAR;
spec->format = AUDIO_S16SYS;
+#ifdef AUDIO_SETINFO
+#ifdef __OpenBSD__
+#if BYTE_ORDER == LITTLE_ENDIAN
+ enc = AUDIO_ENCODING_SLINEAR_LE;
+#else
+ enc = AUDIO_ENCODING_SLINEAR_BE;
+#endif
+#else
+ enc = AUDIO_ENCODING_LINEAR;
+#endif
+#endif
break; /* try again */
+#ifdef __OpenBSD__
+ case AUDIO_ENCODING_SLINEAR_LE:
+ case AUDIO_ENCODING_SLINEAR_BE:
+#else
case AUDIO_ENCODING_LINEAR:
+#endif
/* linear 16bit didn't work either, resort to µ-law */
enc = AUDIO_ENCODING_ULAW;
spec->channels = 1;
@@ -342,6 +539,9 @@ int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec)
#endif /* AUDIO_SETINFO */
written = 0;
+ /* reset counters */
+ ioctl(audio_fd, AUDIO_FLUSH, NULL);
+
/* We can actually convert on-the-fly to U-Law */
if ( ulaw_only ) {
spec->freq = desired_freq;
@@ -354,8 +554,14 @@ int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec)
}
spec->channels = 1;
} else {
- fragsize = spec->samples;
- frequency = spec->freq/1000;
+ if (ioctl(audio_fd, AUDIO_GETINFO, &ginfo) != -1) {
+ int sampsize = ginfo.play.precision / 8 * ginfo.play.channels;
+ fragsize = spec->samples = ginfo.blocksize / sampsize;
+ frequency = ginfo.play.sample_rate / 1000;
+ } else {
+ fragsize = spec->samples;
+ frequency = spec->freq/1000;
+ }
}
#ifdef DEBUG_AUDIO
fprintf(stderr, "Audio device %s U-Law only\n",