diff options
author | jmmv <jmmv> | 2003-07-26 23:05:34 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2003-07-26 23:05:34 +0000 |
commit | 8450f61a87a01f15ce396e9cccb3d6da2de0e072 (patch) | |
tree | d1f6631934b8bb6336f11c8d5b49f8cf475701ef /devel/SDL | |
parent | 6ea0663b483a3dee35fd3d91af3ca6770738d839 (diff) | |
download | pkgsrc-8450f61a87a01f15ce396e9cccb3d6da2de0e072.tar.gz |
Let the NAS audio driver be a plugin too, to get rid of the SDL_USE_NAS build
definition. Bump revision again, to 6, for better dependancy handling.
Diffstat (limited to 'devel/SDL')
-rw-r--r-- | devel/SDL/Makefile | 4 | ||||
-rw-r--r-- | devel/SDL/Makefile.common | 9 | ||||
-rw-r--r-- | devel/SDL/buildlink2.mk | 5 | ||||
-rw-r--r-- | devel/SDL/distinfo | 5 | ||||
-rw-r--r-- | devel/SDL/patches/patch-ba | 29 | ||||
-rw-r--r-- | devel/SDL/patches/patch-bd | 22 |
6 files changed, 47 insertions, 27 deletions
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index 03ad3dc039f..f59710400bc 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.50 2003/07/26 21:38:22 jmmv Exp $ +# $NetBSD: Makefile,v 1.51 2003/07/26 23:05:34 jmmv Exp $ # .include "Makefile.common" -PKGREVISION= 5 +PKGREVISION= 6 LIBTOOL_OVERRIDE= ${WRKSRC}/libtool diff --git a/devel/SDL/Makefile.common b/devel/SDL/Makefile.common index 75ee2303d7a..5ec6b3a1b9e 100644 --- a/devel/SDL/Makefile.common +++ b/devel/SDL/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2003/07/26 21:38:22 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.2 2003/07/26 23:05:34 jmmv Exp $ # DISTNAME= SDL-1.2.5 @@ -28,15 +28,10 @@ NASMFLAGS_ELF= -f elf NASMFLAGS_a.out= -f aoutb .endif -.if defined(SDL_USE_NAS) -. include "../../audio/nas/buildlink2.mk" -.else -CONFIGURE_ARGS+= --disable-nas -.endif - CONFIGURE_ARGS+= --enable-dlopen CONFIGURE_ARGS+= --disable-arts CONFIGURE_ARGS+= --disable-esd +CONFIGURE_ARGS+= --disable-nas CONFIGURE_ARGS+= --enable-video-aalib CONFIGURE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}" diff --git a/devel/SDL/buildlink2.mk b/devel/SDL/buildlink2.mk index 4dc9c965e0f..78c1bd324b3 100644 --- a/devel/SDL/buildlink2.mk +++ b/devel/SDL/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.7 2003/07/26 21:38:22 jmmv Exp $ +# $NetBSD: buildlink2.mk,v 1.8 2003/07/26 23:05:34 jmmv Exp $ .if !defined(SDL_BUILDLINK2_MK) SDL_BUILDLINK2_MK= # defined @@ -19,9 +19,6 @@ USE_X11= YES PTHREAD_OPTS+= require -.if defined(SDL_USE_NAS) -. include "../../audio/nas/buildlink2.mk" -.endif .include "../../graphics/MesaLib/buildlink2.mk" .include "../../graphics/glut/buildlink2.mk" .include "../../graphics/aalib-x11/buildlink2.mk" diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo index 5856878f3a0..0d6ec269c8d 100644 --- a/devel/SDL/distinfo +++ b/devel/SDL/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2003/07/26 21:38:22 jmmv Exp $ +$NetBSD: distinfo,v 1.20 2003/07/26 23:05:34 jmmv Exp $ SHA1 (SDL-1.2.5.tar.gz) = c1bdc68d390d421158778f68f3498f5b9d63a9e4 Size (SDL-1.2.5.tar.gz) = 1854550 bytes @@ -13,6 +13,7 @@ SHA1 (patch-am) = 8dfa873452ea6380b10acda81e11eac1405cc190 SHA1 (patch-ap) = ca979b24a57a8f115f5e1bdf6b1e5672a60d20a9 SHA1 (patch-ar) = 1a78f0bcb6a8f65f71af23accb2a9780331f275b SHA1 (patch-as) = a53286d5e0a2cab7e0a1d80baf3b76681f996b7a -SHA1 (patch-ba) = d7bb35971f63366356c68987d6038cf07c2585f1 +SHA1 (patch-ba) = 0621af3f2c0abba700c30d7f4809f405a7ffe729 SHA1 (patch-bb) = 1918b2e247f9fbbe583fd1111c94dc3a58bfd929 SHA1 (patch-bc) = 8a47e8899f203d56f9855aea6516c4369ab327fe +SHA1 (patch-bd) = c5e714b59212202c4889c129eb2b140660474816 diff --git a/devel/SDL/patches/patch-ba b/devel/SDL/patches/patch-ba index 668178cc032..3bcc2e58be5 100644 --- a/devel/SDL/patches/patch-ba +++ b/devel/SDL/patches/patch-ba @@ -1,8 +1,8 @@ -$NetBSD: patch-ba,v 1.1 2003/07/26 21:38:23 jmmv Exp $ +$NetBSD: patch-ba,v 1.2 2003/07/26 23:05:34 jmmv Exp $ --- src/audio/SDL_audio.c.orig 2002-10-05 18:50:56.000000000 +0200 +++ src/audio/SDL_audio.c -@@ -38,8 +38,14 @@ static char rcsid = +@@ -38,8 +38,15 @@ static char rcsid = #include "SDL_audiomem.h" #include "SDL_sysaudio.h" @@ -11,13 +11,14 @@ $NetBSD: patch-ba,v 1.1 2003/07/26 21:38:23 jmmv Exp $ + /* Available audio drivers */ static AudioBootStrap *bootstrap[] = { -+ NULL, /* Optional 1: either arts or esd */ -+ NULL, /* Optional 2: either arts or esd */ -+#define PLUGIN_COUNT 2 ++ NULL, /* Optional 1: either arts, esd, nas */ ++ NULL, /* Optional 2: either arts, esd, nas */ ++ NULL, /* Optional 3: either arts, esd, nas */ ++#define PLUGIN_COUNT 3 #ifdef OPENBSD_AUDIO_SUPPORT &OPENBSD_AUDIO_bootstrap, #endif -@@ -56,12 +62,6 @@ static AudioBootStrap *bootstrap[] = { +@@ -56,15 +63,6 @@ static AudioBootStrap *bootstrap[] = { #ifdef DMEDIA_SUPPORT &DMEDIA_bootstrap, #endif @@ -27,10 +28,13 @@ $NetBSD: patch-ba,v 1.1 2003/07/26 21:38:23 jmmv Exp $ -#ifdef ESD_SUPPORT - &ESD_bootstrap, -#endif - #ifdef NAS_SUPPORT - &NAS_bootstrap, +-#ifdef NAS_SUPPORT +- &NAS_bootstrap, +-#endif + #ifdef ENABLE_DIRECTX + &DSOUND_bootstrap, #endif -@@ -252,16 +252,47 @@ static void SDL_UnlockAudio_Default(SDL_ +@@ -252,16 +250,48 @@ static void SDL_UnlockAudio_Default(SDL_ SDL_mutexV(audio->mixer_lock); } @@ -58,6 +62,7 @@ $NetBSD: patch-ba,v 1.1 2003/07/26 21:38:23 jmmv Exp $ + + DO_LOAD("arts", "libaudio_arts.so", "ARTSC_bootstrap", "audio/SDL-arts"); + DO_LOAD("esound", "libaudio_esd.so", "ESD_bootstrap", "audio/SDL-esound"); ++ DO_LOAD("nas", "libaudio_nas.so", "NAS_bootstrap", "audio/SDL-nas"); +#undef DO_LOAD + + return first; @@ -79,7 +84,7 @@ $NetBSD: patch-ba,v 1.1 2003/07/26 21:38:23 jmmv Exp $ /* Select the proper audio driver */ audio = NULL; idx = 0; -@@ -271,7 +302,7 @@ int SDL_AudioInit(const char *driver_nam +@@ -271,7 +301,7 @@ int SDL_AudioInit(const char *driver_nam to use ESD, but don't start it if it's not already running. This probably isn't the place to do this, but... Shh! :) */ @@ -88,7 +93,7 @@ $NetBSD: patch-ba,v 1.1 2003/07/26 21:38:23 jmmv Exp $ if ( strcmp(bootstrap[i]->name, "esd") == 0 ) { const char *esd_no_spawn; -@@ -300,7 +331,7 @@ int SDL_AudioInit(const char *driver_nam +@@ -300,7 +330,7 @@ int SDL_AudioInit(const char *driver_nam idx = atoi(strrchr(driver_name, ':')+1); } #endif @@ -97,7 +102,7 @@ $NetBSD: patch-ba,v 1.1 2003/07/26 21:38:23 jmmv Exp $ if (strncmp(bootstrap[i]->name, driver_name, strlen(bootstrap[i]->name)) == 0) { if ( bootstrap[i]->available() ) { -@@ -310,7 +341,7 @@ int SDL_AudioInit(const char *driver_nam +@@ -310,7 +340,7 @@ int SDL_AudioInit(const char *driver_nam } } } else { diff --git a/devel/SDL/patches/patch-bd b/devel/SDL/patches/patch-bd new file mode 100644 index 00000000000..b219e6c94fe --- /dev/null +++ b/devel/SDL/patches/patch-bd @@ -0,0 +1,22 @@ +$NetBSD: patch-bd,v 1.1 2003/07/26 23:05:34 jmmv Exp $ + +--- src/audio/nas/Makefile.in.orig 2002-10-06 22:34:56.000000000 +0200 ++++ src/audio/nas/Makefile.in +@@ -135,7 +135,7 @@ X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ +-libaudio_nas_la_LDFLAGS = ++libaudio_nas_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(SHARED_SYSTEM_LIBS) + libaudio_nas_la_LIBADD = + libaudio_nas_la_OBJECTS = SDL_nasaudio.lo + CFLAGS = @CFLAGS@ +@@ -212,7 +212,7 @@ distclean-libtool: + maintainer-clean-libtool: + + libaudio_nas.la: $(libaudio_nas_la_OBJECTS) $(libaudio_nas_la_DEPENDENCIES) +- $(LINK) $(libaudio_nas_la_LDFLAGS) $(libaudio_nas_la_OBJECTS) $(libaudio_nas_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(libdir) $(libaudio_nas_la_LDFLAGS) $(libaudio_nas_la_OBJECTS) $(libaudio_nas_la_LIBADD) $(LIBS) + + tags: TAGS + |