From 07e7add5a7ca4f9a7b4d670273a58afc14a196d8 Mon Sep 17 00:00:00 2001 From: Mario Sergio Fujikawa Ferreira Date: Wed, 9 Jan 2002 15:09:25 +0000 Subject: o xsidplay tries to access /dev/sound/dsp (linuxism) when it cannot have exclusive access to /dev/dsp. This may cause lockups and all sort of problems. Fix it. o It is an X application, USE_X_PREFIX o Assign maintainership to submitter PR: 33722 Submitted by: John Merryweather Cooper --- audio/xsidplay/Makefile | 15 ++++++---- .../xsidplay/files/patch-src:audio:AudioDriver.cpp | 33 ++++++++++++++++++++++ .../files/patch-src:audio:linux:AudioDriver.cpp | 33 ++++++++++++++++++++++ audio/xsidplay/pkg-plist | 23 +++++++++++++++ 4 files changed, 99 insertions(+), 5 deletions(-) create mode 100644 audio/xsidplay/files/patch-src:audio:AudioDriver.cpp create mode 100644 audio/xsidplay/files/patch-src:audio:linux:AudioDriver.cpp (limited to 'audio/xsidplay') diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile index 03dbe1742ec7..9e94b08604da 100644 --- a/audio/xsidplay/Makefile +++ b/audio/xsidplay/Makefile @@ -7,15 +7,17 @@ PORTNAME= xsidplay PORTVERSION= 1.6.4.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= audio emulators MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/ EXTRACT_SUFX= .tgz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jmcoopr@webmail.bmi.net LIB_DEPENDS= sidplay.1:${PORTSDIR}/audio/libsidplay +USE_X_PREFIX= yes USE_QT_VER= 2 USE_GMAKE= yes GNU_CONFIGURE= yes @@ -39,12 +41,15 @@ pre-patch: @${PERL} -pi -e 's|/usr/share|${PREFIX}|g' ${WRKSRC}/xsidplay.1 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/xsidplay.1 ${MANPREFIX}/man/man1 + @${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin + @${INSTALL_DATA} ${WRKSRC}/xsidplay.xpm ${PREFIX}/share/pixmaps + @${INSTALL_MAN} ${WRKSRC}/xsidplay.1 ${MANPREFIX}/man/man1 .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/*.faq ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/*.faq ${DOCSDIR} + @${MKDIR} ${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/example-sidtunes/*.sid ${EXAMPLESDIR} .endif .include diff --git a/audio/xsidplay/files/patch-src:audio:AudioDriver.cpp b/audio/xsidplay/files/patch-src:audio:AudioDriver.cpp new file mode 100644 index 000000000000..c967dc6857b4 --- /dev/null +++ b/audio/xsidplay/files/patch-src:audio:AudioDriver.cpp @@ -0,0 +1,33 @@ +--- src/audio/AudioDriver.cpp Thu Nov 29 19:15:31 2001 ++++ src/audio/AudioDriver.cpp.new Tue Jan 8 21:52:35 2002 +@@ -43,11 +43,28 @@ + #include "AudioDriver.h" + + #if defined(HAVE_NETBSD) +-const char *AudioDriver::AUDIODEVICE[] = { "/dev/audio" }; +-#else ++const char *AudioDriver::AUDIODEVICE[] = { "/dev/audio", "" }; ++#elif defined(HAVE_FREEBSD) ++const char *AudioDriver::AUDIODEVICE[] = { ++ "/dev/dsp", ++ "/dev/audio", ++ "/dev/dsp0", ++ "/dev/audio0", ++ "/dev/dsp0.0", ++ "/dev/dsp0.1", ++ "/dev/dsp0.2", ++ "/dev/dsp0.3", ++ "/dev/audio0.0", ++ "/dev/audio0.1", ++ "/dev/audio0.2", ++ "/dev/audio0.3", ++ "" ++}; ++#elif defined(HAVE_LINUX) + const char *AudioDriver::AUDIODEVICE[] = { + "/dev/dsp", + "/dev/sound/dsp", ++ "" + }; + #endif + diff --git a/audio/xsidplay/files/patch-src:audio:linux:AudioDriver.cpp b/audio/xsidplay/files/patch-src:audio:linux:AudioDriver.cpp new file mode 100644 index 000000000000..1f196dbfd3d3 --- /dev/null +++ b/audio/xsidplay/files/patch-src:audio:linux:AudioDriver.cpp @@ -0,0 +1,33 @@ +--- src/audio/linux/AudioDriver.cpp Thu Nov 29 19:15:31 2001 ++++ src/audio/linux/AudioDriver.cpp.new Tue Jan 8 21:52:35 2002 +@@ -43,11 +43,28 @@ + #include "AudioDriver.h" + + #if defined(HAVE_NETBSD) +-const char *AudioDriver::AUDIODEVICE[] = { "/dev/audio" }; +-#else ++const char *AudioDriver::AUDIODEVICE[] = { "/dev/audio", "" }; ++#elif defined(HAVE_FREEBSD) ++const char *AudioDriver::AUDIODEVICE[] = { ++ "/dev/dsp", ++ "/dev/audio", ++ "/dev/dsp0", ++ "/dev/audio0", ++ "/dev/dsp0.0", ++ "/dev/dsp0.1", ++ "/dev/dsp0.2", ++ "/dev/dsp0.3", ++ "/dev/audio0.0", ++ "/dev/audio0.1", ++ "/dev/audio0.2", ++ "/dev/audio0.3", ++ "" ++}; ++#elif defined(HAVE_LINUX) + const char *AudioDriver::AUDIODEVICE[] = { + "/dev/dsp", + "/dev/sound/dsp", ++ "" + }; + #endif + diff --git a/audio/xsidplay/pkg-plist b/audio/xsidplay/pkg-plist index 123caa539f94..706c6c138c93 100644 --- a/audio/xsidplay/pkg-plist +++ b/audio/xsidplay/pkg-plist @@ -1,5 +1,28 @@ bin/xsidplay +share/pixmaps/xsidplay.xpm %%PORTDOCS%%share/doc/xsidplay/README %%PORTDOCS%%share/doc/xsidplay/STIL.faq %%PORTDOCS%%share/doc/xsidplay/hv_sids.faq +%%PORTDOCS%%share/examples/xsidplay/Baby_Of_Can_Guru.sid +%%PORTDOCS%%share/examples/xsidplay/C-demo_tune.sid +%%PORTDOCS%%share/examples/xsidplay/Compleeto.sid +%%PORTDOCS%%share/examples/xsidplay/Connect_4.sid +%%PORTDOCS%%share/examples/xsidplay/Dignified.sid +%%PORTDOCS%%share/examples/xsidplay/G_I_Hero.sid +%%PORTDOCS%%share/examples/xsidplay/Galway-tune.sid +%%PORTDOCS%%share/examples/xsidplay/Game_On_Issue_11_89.sid +%%PORTDOCS%%share/examples/xsidplay/Lightforce.sid +%%PORTDOCS%%share/examples/xsidplay/Martinism.sid +%%PORTDOCS%%share/examples/xsidplay/Metropolis.sid +%%PORTDOCS%%share/examples/xsidplay/Microwave.sid +%%PORTDOCS%%share/examples/xsidplay/PayDay-Ingame_tune.sid +%%PORTDOCS%%share/examples/xsidplay/Platou.sid +%%PORTDOCS%%share/examples/xsidplay/Rage_03.sid +%%PORTDOCS%%share/examples/xsidplay/Rambo_First_Blood_Part_II.sid +%%PORTDOCS%%share/examples/xsidplay/SYS4096.sid +%%PORTDOCS%%share/examples/xsidplay/Startrash.sid +%%PORTDOCS%%share/examples/xsidplay/Sweet.sid +%%PORTDOCS%%share/examples/xsidplay/Think_Now.sid +%%PORTDOCS%%share/examples/xsidplay/Zybernix.sid +%%PORTDOCS%%@dirrm share/examples/xsidplay %%PORTDOCS%%@dirrm share/doc/xsidplay -- cgit v1.2.3