also removes the incorrect handling of SDL_AUDIO_DRIVER which I mistakenly added some time ago. the correct var is SDL_AUDIODRIVER,
any objections? (yes, I'll remove sdl,esd from devel/Makefile too) -- [email protected] SDF Public Access UNIX System - http://sdf.lonestar.org Index: Makefile =================================================================== RCS file: /cvs/ports/devel/sdl/Makefile,v retrieving revision 1.68 diff -u -r1.68 Makefile --- Makefile 23 Dec 2008 07:45:32 -0000 1.68 +++ Makefile 28 Dec 2008 09:09:07 -0000 @@ -4,7 +4,7 @@ VERSION= 1.2.13 DISTNAME= SDL-${VERSION} -PKGNAME= ${DISTNAME:L}p7 +PKGNAME= ${DISTNAME:L}p8 CATEGORIES= devel HOMEPAGE= http://www.libsdl.org/ @@ -27,7 +27,7 @@ BUILD_DEPENDS+= :yasm-*:devel/yasm .endif -FLAVORS= esd arts aa caca no_x11 altivec +FLAVORS= aa caca no_x11 altivec FLAVOR?= USE_LIBTOOL= Yes @@ -47,28 +47,14 @@ ac_cv_header_usb_h=no CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ + --disable-arts \ + --disable-esd \ --disable-oss \ --disable-ltdl \ --disable-pulseaudio \ --enable-nasm \ --enable-pthread-sem \ --enable-sunaudio - -.if ${FLAVOR:L:Mesd} -# used via dlopen() -LIB_DEPENDS+= esd.>=2::audio/esound -CONFIGURE_ARGS+= --enable-esd -.else -CONFIGURE_ARGS+= --disable-esd -.endif - -.if ${FLAVOR:L:Marts} -LIB_DEPENDS+= artsc::x11/kde/arts3 -WANTLIB+= glib-2.0 gmodule-2.0 gthread-2.0 intl pcre stdc++ -CONFIGURE_ARGS+= --enable-arts --disable-arts-shared -.else -CONFIGURE_ARGS+= --disable-arts -.endif .if ${FLAVOR:L:Maa} LIB_DEPENDS+= aa::graphics/aalib Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/devel/sdl/patches/patch-configure,v retrieving revision 1.18 diff -u -r1.18 patch-configure --- patches/patch-configure 2 Nov 2008 14:53:51 -0000 1.18 +++ patches/patch-configure 28 Dec 2008 09:09:07 -0000 @@ -22,15 +22,6 @@ CheckPulseAudio() { # Check whether --enable-pulseaudio was given. -@@ -25578,7 +25592,7 @@ fi - : # arts isn't installed - else - ARTS_CFLAGS=`$ARTSCONFIG --cflags` -- ARTS_LIBS=`$ARTSCONFIG --libs` -+ ARTS_LIBS="`$ARTSCONFIG --libs` -lstdc++" - ARTS_PREFIX=`$ARTSCONFIG --arts-prefix` - { echo "$as_me:$LINENO: checking for aRts development environment" >&5 - echo $ECHO_N "checking for aRts development environment... $ECHO_C" >&6; } @@ -26333,9 +26347,6 @@ echo "${ECHO_T}$CompileNASM_ret" >&6; } win32) NASMFLAGS="-f win32" Index: patches/patch-src_audio_SDL_audio_c =================================================================== RCS file: /cvs/ports/devel/sdl/patches/patch-src_audio_SDL_audio_c,v retrieving revision 1.14 diff -u -r1.14 patch-src_audio_SDL_audio_c --- patches/patch-src_audio_SDL_audio_c 2 Nov 2008 14:53:51 -0000 1.14 +++ patches/patch-src_audio_SDL_audio_c 28 Dec 2008 09:09:07 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-src_audio_SDL_audio_c,v 1.14 2008/11/02 14:53:51 jakemsr Exp $ --- src/audio/SDL_audio.c.orig Sun Dec 30 20:47:59 2007 -+++ src/audio/SDL_audio.c Sun Oct 26 19:32:21 2008 ++++ src/audio/SDL_audio.c Sun Dec 28 00:45:48 2008 @@ -36,6 +36,9 @@ /* Available audio drivers */ @@ -11,37 +11,7 @@ #if SDL_AUDIO_DRIVER_BSD &BSD_AUDIO_bootstrap, #endif -@@ -341,6 +344,7 @@ int SDL_AudioInit(const char *driver_name) - } - #endif /* SDL_AUDIO_DRIVER_ESD */ - if ( audio == NULL ) { -+ char *env_driver = getenv("SDL_AUDIO_DRIVER"); - if ( driver_name != NULL ) { - #if 0 /* This will be replaced with a better driver selection API */ - if ( SDL_strrchr(driver_name, ':') != NULL ) { -@@ -357,12 +361,16 @@ int SDL_AudioInit(const char *driver_name) - } - } else { - for ( i=0; bootstrap[i]; ++i ) { -- if ( bootstrap[i]->available() ) { -- audio = bootstrap[i]->create(idx); -- if ( audio != NULL ) { -- break; -- } -+ if (env_driver != NULL) { -+ if (SDL_strcasecmp(bootstrap[i]->name, env_driver) == 0) -+ audio = bootstrap[i]->create(idx); -+ } else { -+ if (bootstrap[i]->available()) -+ audio = bootstrap[i]->create(idx); - } -+ if ( audio != NULL ) { -+ break; -+ } - } - } - if ( audio == NULL ) { -@@ -518,8 +526,9 @@ int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpe +@@ -518,8 +521,9 @@ int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpe /* See if we need to do any conversion */ if ( obtained != NULL ) { @@ -53,7 +23,7 @@ desired->format != audio->spec.format || desired->channels != audio->spec.channels ) { /* Build an audio conversion block */ -@@ -532,7 +541,7 @@ int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpe +@@ -532,7 +536,7 @@ int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpe return(-1); } if ( audio->convert.needed ) { Index: patches/patch-src_audio_arts_SDL_artsaudio_c =================================================================== RCS file: patches/patch-src_audio_arts_SDL_artsaudio_c diff -N patches/patch-src_audio_arts_SDL_artsaudio_c --- patches/patch-src_audio_arts_SDL_artsaudio_c 19 Mar 2008 13:33:29 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,38 +0,0 @@ -$OpenBSD: patch-src_audio_arts_SDL_artsaudio_c,v 1.1 2008/03/19 13:33:29 jakemsr Exp $ ---- src/audio/arts/SDL_artsaudio.c.orig Sun Dec 30 20:47:57 2007 -+++ src/audio/arts/SDL_artsaudio.c Mon Mar 10 00:04:32 2008 -@@ -307,29 +307,21 @@ static int ARTS_OpenAudio(_THIS, SDL_AudioSpec *spec) - SDL_SetError("Unable to initialize ARTS: %s", SDL_NAME(arts_error_text)(error_code)); - return(-1); - } -+#if 0 - if ( ! SDL_NAME(arts_suspended)() ) { - SDL_SetError("ARTS can not open audio device"); - return(-1); - } -+#endif - stream = SDL_NAME(arts_play_stream)(spec->freq, bits, spec->channels, "SDL"); - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(spec); - -- /* Determine the power of two of the fragment size */ -- for ( frag_spec = 0; (0x01<<frag_spec) < spec->size; ++frag_spec ); -- if ( (0x01<<frag_spec) != spec->size ) { -- SDL_SetError("Fragment size must be a power of two"); -- return(-1); -- } -- frag_spec |= 0x00020000; /* two fragments, for low latency */ -+ /* set total buffer size (latency) to what we expect */ -+ SDL_NAME(arts_stream_set)(stream, ARTS_P_BUFFER_SIZE, spec->size); - --#ifdef ARTS_P_PACKET_SETTINGS -- SDL_NAME(arts_stream_set)(stream, ARTS_P_PACKET_SETTINGS, frag_spec); --#else -- SDL_NAME(arts_stream_set)(stream, ARTS_P_PACKET_SIZE, frag_spec&0xffff); -- SDL_NAME(arts_stream_set)(stream, ARTS_P_PACKET_COUNT, frag_spec>>16); --#endif -+ /* and use artsd's preferred write() size */ - spec->size = SDL_NAME(arts_stream_get)(stream, ARTS_P_PACKET_SIZE); - - /* Allocate mixing buffer */ Index: pkg/DESCR =================================================================== RCS file: /cvs/ports/devel/sdl/pkg/DESCR,v retrieving revision 1.9 diff -u -r1.9 DESCR --- pkg/DESCR 9 Dec 2007 13:40:16 -0000 1.9 +++ pkg/DESCR 28 Dec 2008 09:09:07 -0000 @@ -5,14 +5,8 @@ Packages can be built with additional FLAVORs: - esd: SDL built with the esound package. - This FLAVOR requires the esound package. - caca: SDL built with colour ASCII art support. This FLAVOR requires the libcaca package. - - arts: SDL built with ARTS support. - This FLAVOR requires the kdelibs package. aa: SDL built with ASCII art support. This FLAVOR requires the aalib package.
