diff options
Diffstat (limited to 'audio/splay')
-rw-r--r-- | audio/splay/Makefile | 17 | ||||
-rw-r--r-- | audio/splay/files/md5 | 4 | ||||
-rw-r--r-- | audio/splay/patches/patch-aa | 47 | ||||
-rw-r--r-- | audio/splay/patches/patch-ab | 13 | ||||
-rw-r--r-- | audio/splay/patches/patch-ac | 86 | ||||
-rw-r--r-- | audio/splay/patches/patch-ad | 68 | ||||
-rw-r--r-- | audio/splay/patches/patch-ae | 12 | ||||
-rw-r--r-- | audio/splay/patches/patch-af | 12 | ||||
-rw-r--r-- | audio/splay/patches/patch-ag | 12 | ||||
-rw-r--r-- | audio/splay/patches/patch-ah | 26 | ||||
-rw-r--r-- | audio/splay/patches/patch-ai | 12 | ||||
-rw-r--r-- | audio/splay/pkg/PLIST | 4 |
12 files changed, 106 insertions, 207 deletions
diff --git a/audio/splay/Makefile b/audio/splay/Makefile index ee369643d47..44075238a31 100644 --- a/audio/splay/Makefile +++ b/audio/splay/Makefile @@ -1,15 +1,22 @@ -# $NetBSD: Makefile,v 1.6 1998/08/23 10:45:43 frueauf Exp $ +# $NetBSD: Makefile,v 1.7 1999/03/28 20:08:08 rh Exp $ # FreeBSD Id: Makefile,v 1.4 1997/08/09 23:37:33 fenner Exp # -DISTNAME= splay-0.5 +DISTNAME= splay-0.8.2 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= apps/sound/players/ +MASTER_SITES= http://my.netian.com/~polarb/ \ + http://synergy.kaist.ac.kr/~jwj95/ \ + ftp://ftp.univie.ac.at/systems/linux/linuxberg/files/x11/media/ \ + ftp://ftp.tu-clausthal.de/pub/unix.new/audio/ \ + ftp://ftp.online.be/raid/linuxberg/files/x11/media/ \ + ftp://crydee.sai.msu.ru/zeus/unix/sound/players/ \ + ftp://ftp.cit.nepean.uws.edu.au/unix/misc/audio/ MAINTAINER= packages@netbsd.org -HOMEPAGE= http://adam.kaist.ac.kr/~jwj95/ +HOMEPAGE= http://synergy.kaist.ac.kr/~jwj/ GNU_CONFIGURE= yes +CONFIGURE_ARGS= --without-xsplay +CONFIGURE_ENV= LIBS="${LIBS} -lossaudio" .include "../../mk/bsd.pkg.mk" diff --git a/audio/splay/files/md5 b/audio/splay/files/md5 index c1fff70730e..50c82fa760c 100644 --- a/audio/splay/files/md5 +++ b/audio/splay/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 1998/08/07 13:16:56 agc Exp $ +$NetBSD: md5,v 1.3 1999/03/28 20:08:08 rh Exp $ -MD5 (splay-0.5.tar.gz) = 6c98edfb97961c4f89c6a4b8e9aac405 +MD5 (splay-0.8.2.tar.gz) = 4031830584fddf315881798e074f7207 diff --git a/audio/splay/patches/patch-aa b/audio/splay/patches/patch-aa index eb89ab6ffaf..ccbd3218f88 100644 --- a/audio/splay/patches/patch-aa +++ b/audio/splay/patches/patch-aa @@ -1,21 +1,28 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 10:36:13 agc Exp $ +$NetBSD: patch-aa,v 1.3 1999/03/28 20:08:08 rh Exp $ -*** mpegsound/rawplayer.cc Thu Mar 27 22:18:47 1997 ---- mpegsound/rawplayer.cc Tue Apr 1 19:33:46 1997 -*************** -*** 8,14 **** - - #include <fcntl.h> - #include <sys/ioctl.h> -! #include <sys/soundcard.h> - - #include "mpegsound.h" - ---- 8,14 ---- - - #include <fcntl.h> - #include <sys/ioctl.h> -! #include <machine/soundcard.h> - - #include "mpegsound.h" - +--- mpegsound/rawplayer.cc.orig Fri Mar 6 18:43:55 1998 ++++ mpegsound/rawplayer.cc Sun Mar 28 19:44:54 1999 +@@ -13,7 +13,11 @@ + #include <fcntl.h> + #include <unistd.h> + #include <sys/ioctl.h> ++#ifdef __NetBSD__ ++#include <soundcard.h> ++#else + #include <sys/soundcard.h> ++#endif + + #include "mpegsound.h" + +@@ -24,7 +28,11 @@ + #define IOCTL(a,b,c) (c = ioctl(a,b,c) ) + #endif + ++#ifdef __NetBSD__ ++char *Rawplayer::defaultdevice="/dev/audio"; ++#else + char *Rawplayer::defaultdevice="/dev/dsp"; ++#endif + + /* Volume */ + int Rawplayer::setvolume(int volume) diff --git a/audio/splay/patches/patch-ab b/audio/splay/patches/patch-ab deleted file mode 100644 index 6afaa981745..00000000000 --- a/audio/splay/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 1998/08/07 10:36:13 agc Exp $ - ---- src/cmd/cmd.cc.orig Sat Aug 9 16:31:03 1997 -+++ src/cmd/cmd.cc Sat Aug 9 16:31:15 1997 -@@ -15,7 +15,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/ioctl.h> --#include <sys/soundcard.h> -+#include <machine/soundcard.h> - - #include <mpegsound.h> - diff --git a/audio/splay/patches/patch-ac b/audio/splay/patches/patch-ac deleted file mode 100644 index 021cf4319b8..00000000000 --- a/audio/splay/patches/patch-ac +++ /dev/null @@ -1,86 +0,0 @@ -$NetBSD: patch-ac,v 1.3 1998/08/07 10:36:13 agc Exp $ - -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,9 @@ - - LIBS = @LIBS@ - -+LIBS += -lossaudio -+NORMAL_INSTALL=: -+ - 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 diff --git a/audio/splay/patches/patch-ad b/audio/splay/patches/patch-ad index f7bf503aa00..17105aba136 100644 --- a/audio/splay/patches/patch-ad +++ b/audio/splay/patches/patch-ad @@ -1,38 +1,32 @@ -$NetBSD: patch-ad,v 1.2 1998/08/07 10:36:13 agc Exp $ +$NetBSD: patch-ad,v 1.3 1999/03/28 20:08:09 rh Exp $ -*** mpegsound/mpegsound.h.orig Tue Jan 6 23:46:00 1998 ---- mpegsound/mpegsound.h Tue Jan 6 23:45:01 1998 -*************** -*** 247,253 **** - a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]); - } - #else -! a=((unsigned short *)(buffer+((bixindex>>3)))); - #endif - - a<<=(bitindex&7); ---- 247,253 ---- - a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]); - } - #else -! a=((unsigned short *)(buffer+((bitindex>>3)))); - #endif - - a<<=(bitindex&7); -*************** -*** 266,272 **** - a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]); - } - #else -! a=((unsigned short *)(buffer+((bixindex>>3)))); - #endif - - a<<=(bitindex&7); ---- 266,272 ---- - a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]); - } - #else -! a=((unsigned short *)(buffer+((bitindex>>3)))); - #endif - - a<<=(bitindex&7); +--- mpegsound/mpegsound_locals.h.orig Fri Mar 6 18:43:55 1998 ++++ mpegsound/mpegsound_locals.h Sun Mar 28 19:32:46 1999 +@@ -27,7 +27,7 @@ + a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]); + } + #else +- a=((unsigned short *)(buffer+((bixindex>>3)))); ++ a=((unsigned short *)(buffer+offset)); + #endif + + a<<=(bitindex&7); +@@ -39,15 +39,15 @@ + { + register unsigned short a; + +-#ifndef WORDS_BIGENDIAN + { ++#ifndef WORDS_BIGENDIAN + int offset=bitindex>>3; + + a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]); +- } + #else +- a=((unsigned short *)(buffer+((bixindex>>3)))); ++ a=((unsigned short *)(buffer+offset)); + #endif ++ } + + a<<=(bitindex&7); + bitindex+=8; diff --git a/audio/splay/patches/patch-ae b/audio/splay/patches/patch-ae deleted file mode 100644 index 27f8e5390bb..00000000000 --- a/audio/splay/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.2 1998/08/07 10:36:14 agc Exp $ - ---- xlibs/Makefile.in.BAK Mon Feb 23 17:31:58 1998 -+++ xlibs/Makefile.in Mon Feb 23 17:32:38 1998 -@@ -37,6 +37,7 @@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - -+NORMAL_INSTALL=: - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ diff --git a/audio/splay/patches/patch-af b/audio/splay/patches/patch-af deleted file mode 100644 index 114f18c096f..00000000000 --- a/audio/splay/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-af,v 1.2 1998/08/07 10:36:14 agc Exp $ - ---- mpegsound/Makefile.in.BAK Mon Feb 23 17:34:18 1998 -+++ mpegsound/Makefile.in Mon Feb 23 17:34:39 1998 -@@ -37,6 +37,7 @@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - -+NORMAL_INSTALL=: - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ diff --git a/audio/splay/patches/patch-ag b/audio/splay/patches/patch-ag deleted file mode 100644 index badd0caf709..00000000000 --- a/audio/splay/patches/patch-ag +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ag,v 1.2 1998/08/07 10:36:14 agc Exp $ - ---- src/cmd/Makefile.in.BAK Mon Feb 23 17:44:56 1998 -+++ src/cmd/Makefile.in Mon Feb 23 17:44:04 1998 -@@ -37,6 +37,7 @@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - -+NORMAL_INSTALL=: - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ diff --git a/audio/splay/patches/patch-ah b/audio/splay/patches/patch-ah index 911dced4d59..c7676173695 100644 --- a/audio/splay/patches/patch-ah +++ b/audio/splay/patches/patch-ah @@ -1,13 +1,25 @@ -$NetBSD: patch-ah,v 1.2 1998/08/07 10:36:14 agc Exp $ +$NetBSD: patch-ah,v 1.3 1999/03/28 20:08:09 rh Exp $ ---- mpegsound/mpeglayer3.cc-orig Sat May 24 11:34:12 1997 -+++ mpegsound/mpeglayer3.cc Tue May 12 13:10:28 1998 -@@ -40,7 +40,7 @@ +--- mpegsound/mpeglayer3.cc.orig Fri Mar 6 18:43:55 1998 ++++ mpegsound/mpeglayer3.cc Sun Mar 28 19:41:06 1999 +@@ -46,17 +46,16 @@ + { + register unsigned short a; + +-#ifndef WORDS_BIGENDIAN + { + // int offset=(bitindex>>3)&(WINDOWSIZE-1); + int offset=bitindex>>3; + ++#ifndef WORDS_BIGENDIAN a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]); - } +- } #else -- a=((unsigned short *)(buffer+((bixindex>>3)&(WINDOWSIZE-1)))); -+ a=((unsigned short *)(buffer+((bitindex>>3)&(WINDOWSIZE-1)))); +- // a=((unsigned short *)(buffer+((bixindex>>3)&(WINDOWSIZE-1)))); +- a=((unsigned short *)(buffer+((bixindex>>3)))); ++ a=((unsigned short *)(buffer+offset)); #endif ++ } a<<=(bitindex&7); + bitindex+=bits; diff --git a/audio/splay/patches/patch-ai b/audio/splay/patches/patch-ai new file mode 100644 index 00000000000..710eb34af43 --- /dev/null +++ b/audio/splay/patches/patch-ai @@ -0,0 +1,12 @@ +$NetBSD: patch-ai,v 1.1 1999/03/28 20:08:09 rh Exp $ + +--- mpegsound/httpinput.cc.orig Fri Mar 6 18:43:55 1998 ++++ mpegsound/httpinput.cc Sun Mar 28 19:53:12 1999 +@@ -24,6 +24,7 @@ + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> ++#include <errno.h> + + #ifndef INADDR_NONE + #define INADDR_NONE 0xffffffff diff --git a/audio/splay/pkg/PLIST b/audio/splay/pkg/PLIST index a33688fee44..e8985c0b446 100644 --- a/audio/splay/pkg/PLIST +++ b/audio/splay/pkg/PLIST @@ -1,2 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 1997/11/06 09:58:23 agc Exp $ +@comment $NetBSD: PLIST,v 1.3 1999/03/28 20:08:09 rh Exp $ bin/splay +man/man1/splay.1 +man/man1/xsplay.1 |