From 49bcdfe3b5df9d58cb8db35bf6edf39b355c06a5 Mon Sep 17 00:00:00 2001 From: brad Date: Sun, 10 Sep 2000 16:05:01 +0000 Subject: [PATCH] upgrade to sox 12.17 --- audio/sox/Makefile | 25 +++++++---- audio/sox/files/md5 | 6 +-- audio/sox/patches/patch-Makefile.in | 62 ++++++++++++++++++++++++++++ audio/sox/patches/patch-aa | 10 ----- audio/sox/patches/patch-ab | 29 ------------- audio/sox/patches/patch-ac | 11 ----- audio/sox/patches/patch-ad | 16 ------- audio/sox/patches/patch-configure.in | 22 ++++++++++ audio/sox/patches/patch-oss.c | 12 ++++++ audio/sox/patches/patch-play | 15 +++++++ audio/sox/patches/patch-rec | 27 ++++++++++++ audio/sox/pkg/DESCR | 2 + audio/sox/pkg/PLIST | 7 +++- 13 files changed, 166 insertions(+), 78 deletions(-) create mode 100644 audio/sox/patches/patch-Makefile.in delete mode 100644 audio/sox/patches/patch-aa delete mode 100644 audio/sox/patches/patch-ab delete mode 100644 audio/sox/patches/patch-ac delete mode 100644 audio/sox/patches/patch-ad create mode 100644 audio/sox/patches/patch-configure.in create mode 100644 audio/sox/patches/patch-oss.c create mode 100644 audio/sox/patches/patch-play create mode 100644 audio/sox/patches/patch-rec diff --git a/audio/sox/Makefile b/audio/sox/Makefile index 6fbd9520bf8..342b5bd27da 100644 --- a/audio/sox/Makefile +++ b/audio/sox/Makefile @@ -1,10 +1,12 @@ -# $OpenBSD: Makefile,v 1.14 2000/06/10 17:39:22 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2000/09/10 16:05:01 brad Exp $ -DISTNAME= sox-12.15 +DISTNAME= sox-12.17 CATEGORIES= audio -NEED_VERSION= 1.210 +NEED_VERSION= 1.320 MASTER_SITES= http://home.sprynet.com/~cbagwell/ +HOMEPAGE= http://home.sprynet.com/~cbagwell/sox.html + MAINTAINER= angelos@openbsd.org PERMIT_PACKAGE_CDROM= Yes @@ -12,11 +14,18 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MAKE_FILE= Makefile.unx -MAKE_ENV= MISC_DEFINES='-Dunix ${CFLAGS}' +SEPARATE_BUILD= concurrent +CONFIGURE_STYLE= autoconf +CONFIGURE_ARGS= --enable-fast-alaw --enable-fast-ulaw \ + --with-oss-dsp --without-sun_audio -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sox ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/sox.1 ${PREFIX}/man/man1/sox.1 +FLAVORS= gsm +FLAVOR?= + +.if ${FLAVOR:L} == "gsm" +LIB_DEPENDS= gsm.1::audio/gsm +CONFIGURE_ARGS+= --with-gsminc="${LOCALBASE}/include" \ + --with-gsmlib="${LOCALBASE}/lib" +.endif .include diff --git a/audio/sox/files/md5 b/audio/sox/files/md5 index cb58699062c..f46a0b4d146 100644 --- a/audio/sox/files/md5 +++ b/audio/sox/files/md5 @@ -1,3 +1,3 @@ -MD5 (sox-12.15.tar.gz) = da913f0eedd73c8eccdb8a2d85649ccd -RMD160 (sox-12.15.tar.gz) = e29b30a837425319e09af7a76876afc93e47a31b -SHA1 (sox-12.15.tar.gz) = aa2dbc7ea7127058c884b338c745e4e56d4b93d9 +MD5 (sox-12.17.tar.gz) = 4d3b2b60578a25b351c2385f40df742a +RMD160 (sox-12.17.tar.gz) = 5768dde4e725a773ba70066837328b72bf94a5f8 +SHA1 (sox-12.17.tar.gz) = 93fadc737150092d05046a8ff683d4a68d03457c diff --git a/audio/sox/patches/patch-Makefile.in b/audio/sox/patches/patch-Makefile.in new file mode 100644 index 00000000000..06909ef3ad6 --- /dev/null +++ b/audio/sox/patches/patch-Makefile.in @@ -0,0 +1,62 @@ +--- Makefile.in.orig Sun Sep 10 09:55:19 2000 ++++ Makefile.in Sun Sep 10 09:59:15 2000 +@@ -10,6 +10,8 @@ + srcdir = @srcdir@ + prefix = @prefix@ + ++DESTDIR = ++ + # Shell commands. + + CC = @CC@ +@@ -82,30 +84,30 @@ + PLAY_INSTALL_1 = install-play + + install: sox $(PLAY_INSTALL_$(PLAY_SUPPORT)) +- $(srcdir)/mkinstalldirs $(BINDIR) +- $(srcdir)/mkinstalldirs $(MANDIR)/man1 +- $(INSTALL) -c -m 755 sox $(BINDIR) +- $(INSTALL) -c -m 644 $(srcdir)/sox.1 $(MANDIR)/man1 +- $(INSTALL) -c -m 644 $(srcdir)/soxexam.1 $(MANDIR)/man1 ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(BINDIR) ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(MANDIR)/man1 ++ $(INSTALL) -c -m 755 sox $(DESTDIR)$(BINDIR) ++ $(INSTALL) -c -m 644 $(srcdir)/sox.1 $(DESTDIR)$(MANDIR)/man1 ++ $(INSTALL) -c -m 644 $(srcdir)/soxexam.1 $(DESTDIR)$(MANDIR)/man1 + + install-play: +- if [ -f $(BINDIR)/rec ] ; then $(RM) $(BINDIR)/rec; fi +- if [ -f $(MANDIR)/man1/rec.1 ]; then $(RM) $(MANDIR)/man1/rec.1; fi +- $(srcdir)/mkinstalldirs $(MANDIR)/man1 +- $(srcdir)/mkinstalldirs $(BINDIR) +- $(INSTALL) -c -m 755 $(srcdir)/play $(BINDIR) +- $(INSTALL) -c -m 644 $(srcdir)/play.1 $(MANDIR)/man1 +- ln -s $(BINDIR)/play $(BINDIR)/rec +- ln -s $(MANDIR)/man1/play.1 $(MANDIR)/man1/rec.1 ++ if [ -f $(DESTDIR)$(BINDIR)/rec ] ; then $(RM) $(DESTDIR)$(BINDIR)/rec; fi ++ if [ -f $(DESTDIR)$(MANDIR)/man1/rec.1 ]; then $(RM) $(DESTDIR)$(MANDIR)/man1/rec.1; fi ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(MANDIR)/man1 ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(BINDIR) ++ $(INSTALL) -c -m 755 $(srcdir)/play $(DESTDIR)$(BINDIR) ++ $(INSTALL) -c -m 644 $(srcdir)/play.1 $(DESTDIR)$(MANDIR)/man1 ++ cd $(DESTDIR)$(BINDIR) && ln -s play rec ++ cd $(DESTDIR)$(MANDIR)/man1 && ln -s play.1 rec.1 + + install-lib: libst.a +- $(srcdir)/mkinstalldirs $(LIBDIR)/man1 +- $(srcdir)/mkinstalldirs $(MANDIR)/man3 +- $(srcdir)/mkinstalldirs $(INCDIR) +- $(INSTALL) -c -m 644 libst.a $(LIBDIR) +- $(RANLIB) $(LIBDIR)/libst.a +- $(INSTALL) -c -m 644 libst.3 $(MANDIR)/man3 +- $(INSTALL) -c -m 644 st.h $(INCDIR) ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(LIBDIR)/man1 ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(MANDIR)/man3 ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(INCDIR) ++ $(INSTALL) -c -m 644 libst.a $(DESTDIR)$(LIBDIR) ++ $(RANLIB) $(DESTDIR)$(LIBDIR)/libst.a ++ $(INSTALL) -c -m 644 libst.3 $(DESTDIR)$(MANDIR)/man3 ++ $(INSTALL) -c -m 644 st.h $(DESTDIR)$(INCDIR) + + clean: + $(RM) *.o diff --git a/audio/sox/patches/patch-aa b/audio/sox/patches/patch-aa deleted file mode 100644 index b27e0783eb7..00000000000 --- a/audio/sox/patches/patch-aa +++ /dev/null @@ -1,10 +0,0 @@ ---- sbdsp.c.orig Sun Mar 21 19:32:05 1999 -+++ sbdsp.c Sun Mar 21 19:32:48 1999 -@@ -17,6 +17,7 @@ - */ - - #include -+#include - #ifdef SBLAST - #include - #else diff --git a/audio/sox/patches/patch-ab b/audio/sox/patches/patch-ab deleted file mode 100644 index 9c96f72bd1f..00000000000 --- a/audio/sox/patches/patch-ab +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile.unx.orig Thu Oct 1 05:06:13 1998 -+++ Makefile.unx Thu Jun 3 23:48:07 1999 -@@ -95,7 +95,7 @@ - # Chose the best compiler you got from the following: - # - # GCC with all warnings and debug info --CC = gcc -g -Wall -+# CC = gcc -g -Wall - # - # GCC with no special options - # CC = gcc -@@ -124,7 +124,7 @@ - # If your system has the more advanced version of getopt() that - # also has its own getopt.h file (Such as the case with GNU libc 2.0) - # then uncomment the following line: --GETOPT_DEFINES = -DHAS_GETOPT_H -+#GETOPT_DEFINES = -DHAS_GETOPT_H - - # Uncomment the following if your system does not have a built in - # strerror(). This includes SunOS. -@@ -217,7 +217,7 @@ - ############################################################################## - - SOX_PRE_LIBS = $(GSM_PRE_LIBS) --SOX_POST_LIBS = $(GSM_POST_LIBS) -lm -+SOX_POST_LIBS = $(GSM_POST_LIBS) -lm -lossaudio - SOX_INCLUDES = $(GSM_INCLUDES) - SOX_DEFINES = $(GSM_DEFINES) $(OSS_DEFINES) $(SUNAUDIO_DEFINES) \ - $(BLASTER) $(GETOPT_DEFINES) $(STRERR_DEFINES) $(MEMMOVE_DEFINES) \ diff --git a/audio/sox/patches/patch-ac b/audio/sox/patches/patch-ac deleted file mode 100644 index db22b737493..00000000000 --- a/audio/sox/patches/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- au.c.orig Sun Mar 21 19:40:43 1999 -+++ au.c Sun Mar 21 19:41:56 1999 -@@ -302,6 +302,8 @@ - wblong(ft, magic); - - /* hdr_size = SUN_HDRSIZE; + strlen(ft->comment); */ -+ if (ft->comment == NULL) -+ ft->comment = ""; - hdr_size = SUN_HDRSIZE + strlen(ft->comment); - wblong(ft, hdr_size); - diff --git a/audio/sox/patches/patch-ad b/audio/sox/patches/patch-ad deleted file mode 100644 index 89277c00616..00000000000 --- a/audio/sox/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ ---- oss.c.orig Sun Mar 21 20:11:24 1999 -+++ oss.c Sun Mar 21 20:11:37 1999 -@@ -20,12 +20,11 @@ - * SBLAST patches by John T. Kohl. - */ - --#include - #include - #include - #include - #include --#include -+#include - #include - #include - #include "st.h" diff --git a/audio/sox/patches/patch-configure.in b/audio/sox/patches/patch-configure.in new file mode 100644 index 00000000000..d7754af26a3 --- /dev/null +++ b/audio/sox/patches/patch-configure.in @@ -0,0 +1,22 @@ +--- configure.in.orig Sun Sep 10 09:37:10 2000 ++++ configure.in Sun Sep 10 09:52:43 2000 +@@ -206,7 +206,7 @@ + ) + if test "$ac_cv_dev_oss_dsp" = yes + then +- AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h, oss_dsp=yes) ++ AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, oss_dsp=yes) + if test "$oss_dsp" = auto + then + AC_WARN([No soundcard.h to compile with OSS /dev/dsp]) +@@ -217,8 +217,9 @@ + then + if test "$ac_cv_dev_oss_dsp" = "" + then +- AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h) ++ AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h) + fi ++ AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBS="$LIBS -lossaudio") + CFLAGS="$CFLAGS -DOSS_PLAYER" + NEED_OSS=1 + PLAY_SUPPORT=1 diff --git a/audio/sox/patches/patch-oss.c b/audio/sox/patches/patch-oss.c new file mode 100644 index 00000000000..aa6158034f8 --- /dev/null +++ b/audio/sox/patches/patch-oss.c @@ -0,0 +1,12 @@ +--- oss.c.orig Sun Sep 10 09:39:12 2000 ++++ oss.c Sun Sep 10 09:39:38 2000 +@@ -31,6 +31,9 @@ + #include + #include + #include ++#ifdef HAVE_SOUNDCARD_H ++#include ++#endif + #ifdef HAVE_SYS_SOUNDCARD_H + #include + #endif diff --git a/audio/sox/patches/patch-play b/audio/sox/patches/patch-play new file mode 100644 index 00000000000..8c8c4b6bc4e --- /dev/null +++ b/audio/sox/patches/patch-play @@ -0,0 +1,15 @@ +--- play.orig Thu Aug 3 20:58:37 2000 ++++ play Sun Sep 10 10:57:01 2000 +@@ -180,6 +180,12 @@ + device="/dev/dsp" + fi + ;; ++ OpenBSD) ++ arch_defines="-t ossdsp" ++ if [ -z "$device" ]; then ++ device="/dev/sound" ++ fi ++ ;; + esac + + # If name is "rec" then record else assume user is wanting to play diff --git a/audio/sox/patches/patch-rec b/audio/sox/patches/patch-rec new file mode 100644 index 00000000000..23ae0e61541 --- /dev/null +++ b/audio/sox/patches/patch-rec @@ -0,0 +1,27 @@ +--- rec.orig Sun Sep 10 10:36:20 2000 ++++ rec Sun Sep 10 10:39:55 2000 +@@ -121,8 +121,7 @@ + + esac + +-else +- if [ "$arch" = "Linux" ]; then ++elif [ "$arch" = "Linux" ]; then + + if [ "$device" = "" ]; then + device="/dev/dsp" +@@ -132,6 +131,14 @@ + # if [ "$volume" != "" ] ; then + # mixer $volume + # fi ++ ++ sox $volume -t ossdsp $device $fopts "$filename" $effects ++ ++elif [ "$arch" = "OpenBSD" ]; then ++ ++ if [ "$device" = "" ]; then ++ device="/dev/sound" ++ fi + + sox $volume -t ossdsp $device $fopts "$filename" $effects + fi diff --git a/audio/sox/pkg/DESCR b/audio/sox/pkg/DESCR index 01c81932b85..5e0fee47845 100644 --- a/audio/sox/pkg/DESCR +++ b/audio/sox/pkg/DESCR @@ -13,3 +13,5 @@ The sound effects include changing the sample rate, adding echo delay lines, applying low-, high, and band-pass filtering, reversing a sample in order to search for Satanic messages, and the infamous Fender Vibro effect. + +WWW: ${HOMEPAGE} diff --git a/audio/sox/pkg/PLIST b/audio/sox/pkg/PLIST index bf9119bb997..3ec28207b57 100644 --- a/audio/sox/pkg/PLIST +++ b/audio/sox/pkg/PLIST @@ -1,3 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.2 2000/06/10 17:39:22 espie Exp $ +@comment $OpenBSD: PLIST,v 1.3 2000/09/10 16:05:02 brad Exp $ +bin/play +bin/rec bin/sox +man/man1/play.1 +man/man1/rec.1 man/man1/sox.1 +man/man1/soxexam.1