diff options
| author | augustss <augustss> | 1997-11-01 00:56:20 +0000 |
|---|---|---|
| committer | augustss <augustss> | 1997-11-01 00:56:20 +0000 |
| commit | 64917333946811bb2e2c85c6a470fb8bd7dc9fac (patch) | |
| tree | 9965c2547396c44ab89e871306d1e4fc86ab2028 /audio/splay | |
| parent | 1a5d9042e3c8ab916fb413dc13c15c58d4b55c59 (diff) | |
| download | pkgsrc-64917333946811bb2e2c85c6a470fb8bd7dc9fac.tar.gz | |
Another NetBSD port.
(I'm getting sick of porting MPEG players, this must be the fifth.)
Diffstat (limited to 'audio/splay')
| -rw-r--r-- | audio/splay/Makefile | 4 | ||||
| -rw-r--r-- | audio/splay/patches/patch-ac | 83 |
2 files changed, 86 insertions, 1 deletions
diff --git a/audio/splay/Makefile b/audio/splay/Makefile index 53d0c4a2594..fb73d5150eb 100644 --- a/audio/splay/Makefile +++ b/audio/splay/Makefile @@ -3,7 +3,8 @@ # Date created: 1 Apr 1997 # Whom: junker@jazz.snu.ac.kr # -# $Id: Makefile,v 1.1.1.1 1997/10/28 23:19:05 augustss Exp $ +# $NetBSD: Makefile,v 1.2 1997/11/01 00:56:26 augustss Exp $ +# FreeBSD Id: Makefile,v 1.4 1997/08/09 23:37:33 fenner Exp # DISTNAME= splay-0.5 @@ -11,6 +12,7 @@ CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/sound/players/ +# FreeBSD maintainer MAINTAINER= junker@jazz.snu.ac.kr GNU_CONFIGURE= yes diff --git a/audio/splay/patches/patch-ac b/audio/splay/patches/patch-ac new file mode 100644 index 00000000000..1c21f8fbc17 --- /dev/null +++ b/audio/splay/patches/patch-ac @@ -0,0 +1,83 @@ +diff -r -u ../../work/splay-0.5/mpegsound/fileplayer.cc ./mpegsound/fileplayer.cc +--- ../../work/splay-0.5/mpegsound/fileplayer.cc Fri May 23 19:16:36 1997 ++++ ./mpegsound/fileplayer.cc Sat Nov 1 01:38:51 1997 +@@ -8,7 +8,11 @@ + #include <fcntl.h> + #include "mpegsound.h" + ++#ifdef __NetBSD__ ++static char *defaultdevice="/dev/audio"; ++#else + static char *defaultdevice="/dev/dsp"; ++#endif + + // Wave file player + bool Wavefileplayer::openfile(char *filename,char *device) +diff -r -u ../../work/splay-0.5/mpegsound/rawplayer.cc ./mpegsound/rawplayer.cc +--- ../../work/splay-0.5/mpegsound/rawplayer.cc Sat Nov 1 01:39:50 1997 ++++ ./mpegsound/rawplayer.cc Sat Nov 1 01:27:58 1997 +@@ -8,7 +8,11 @@ + + #include <fcntl.h> + #include <sys/ioctl.h> ++#ifdef __NetBSD__ ++#include <soundcard.h> ++#else + #include <machine/soundcard.h> ++#endif + + #include "mpegsound.h" + +diff -r -u ../../work/splay-0.5/src/Makefile.in ./src/Makefile.in +--- ../../work/splay-0.5/src/Makefile.in Wed May 28 13:18:08 1997 ++++ ./src/Makefile.in Sat Nov 1 01:31:25 1997 +@@ -69,6 +69,8 @@ + + LIBS = @LIBS@ + ++LIBS += -lossaudio ++ + SUBDIRS = cmd @XQTDIR@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_CLEAN_FILES = +diff -r -u ../../work/splay-0.5/src/cmd/cmd.cc ./src/cmd/cmd.cc +--- ../../work/splay-0.5/src/cmd/cmd.cc Sat Nov 1 01:39:50 1997 ++++ ./src/cmd/cmd.cc Sat Nov 1 01:34:20 1997 +@@ -15,7 +15,11 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/ioctl.h> ++#ifdef __NetBSD__ ++#include <soundcard.h> ++#else + #include <machine/soundcard.h> ++#endif + + #include <mpegsound.h> + +@@ -357,7 +361,7 @@ + " -W : playing wave as standard input\n" + " -V : show version\n" + " -d device : play raw data(Not wave format) to device\n" +- " default : /dev/dsp\n" ++ " default : /dev/audio\n" + "\t\tIf first character of devicename \'/\',\n" + "\t\t\tregard device,\n" + "\t\tIf first character of devicename \'-\',\n" +diff -r -u ../../work/splay-0.5/src/xqt/xsplay.cc ./src/xqt/xsplay.cc +--- ../../work/splay-0.5/src/xqt/xsplay.cc Wed May 28 09:38:59 1997 ++++ ./src/xqt/xsplay.cc Sat Nov 1 01:36:57 1997 +@@ -232,7 +232,12 @@ + + + // Player +- if(device==NULL)device="/dev/dsp"; ++ if(device==NULL) ++#ifdef __NetBSD__ ++ device="/dev/audio"; ++#else ++ device="/dev/dsp"; ++#endif + + if(device[0]=='/')player=new Rawplayer; + else |