add patch from SDL cvs to fix a case where the audio device would get

opened twice
This commit is contained in:
jolan 2005-07-06 05:04:58 +00:00
parent ed6a959ad9
commit a5d7452293
2 changed files with 20 additions and 4 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.22 2005/07/03 21:36:35 jolan Exp $
# $OpenBSD: Makefile,v 1.23 2005/07/06 05:04:58 jolan Exp $
COMMENT= "SDL multi-channel audio mixer library"
DISTNAME= SDL_mixer-1.2.6
PKGNAME= ${DISTNAME:L:S/_/-/}
PKGNAME= ${DISTNAME:L:S/_/-/}p0
CATEGORIES= devel audio
MASTER_SITES= ${HOMEPAGE}release/
@ -26,10 +26,10 @@ WANTLIB= X11 Xext c ogg pthread usbhid
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=${CONFIGURE_SHARED}
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -Dunix=1" \
LDFLAGS="${LDFLAGS} -L${X11BASE}/lib"
post-install:
${INSTALL_PROGRAM} ${WRKBUILD}/play{mus,wave} ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKBUILD}/.libs/play{mus,wave} ${PREFIX}/bin
.include <bsd.port.mk>

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-music_c,v 1.1 2005/07/06 05:04:58 jolan Exp $
--- music.c.orig Tue Jul 5 23:57:06 2005
+++ music.c Tue Jul 5 23:57:16 2005
@@ -391,8 +391,11 @@ int open_music(SDL_AudioSpec *mixer)
#endif
#ifdef LIBMIKMOD_MUSIC
if(!MikMod_InfoDriver())
-#endif
+ MikMod_RegisterDriver(&drv_nos);
+#else
MikMod_RegisterAllDrivers();
+#endif
+
#ifdef LIBMIKMOD_MUSIC
if(!MikMod_InfoLoader())
#endif