cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix Ogg Vorbis encoding for RC3.

Browse Source 
* Radically prune DESCR.
* Update to 12.17.3.  GSM support is now integrated.
This commit is contained in:
naddy 2002-01-17 00:25:51 +00:00
parent 9b091cc84b
commit 05bc8f147a
10 changed files with 119 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
audio/sox/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.19 2001/12/31 09:45:55 espie Exp $ # $OpenBSD: Makefile,v 1.20 2002/01/17 00:25:51 naddy Exp $
COMMENT= "SOund eXchange - universal sound sample translator" COMMENT= "SOund eXchange - universal sound sample translator"
DISTNAME= sox-12.17.2 DISTNAME= sox-12.17.3
CATEGORIES= audio CATEGORIES= audio
NEED_VERSION= 1.504 NEED_VERSION= 1.504
HOMEPAGE= http://sox.sourceforge.net/ HOMEPAGE= http://sox.sourceforge.net/
@ -19,23 +19,14 @@ MASTER_SITE_SUBDIR= sox
SEPARATE_BUILD= concurrent SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= autoconf CONFIGURE_STYLE= autoconf
AUTOCONF_NEW=Yes AUTOCONF_NEW= Yes
CONFIGURE_ARGS= --enable-fast-alaw --enable-fast-ulaw \ CONFIGURE_ARGS= --without-sun_audio
--without-sun_audio
FLAVORS= gsm vorbis FLAVORS= vorbis
FLAVOR?= FLAVOR?=
.if ${FLAVOR:L:Mgsm}
LIB_DEPENDS+= gsm.1::audio/gsm
CONFIGURE_ARGS+= --with-gsminc="${LOCALBASE}/include" \
--with-gsmlib="${LOCALBASE}/lib"
.else
CONFIGURE_ARGS+= --with-gsminc=no
.endif
.if ${FLAVOR:L:Mvorbis} .if ${FLAVOR:L:Mvorbis}
LIB_DEPENDS+= vorbis.0,vorbisenc.0,vorbisfile.1::audio/libvorbis LIB_DEPENDS+= vorbis.1,vorbisenc.1,vorbisfile.2::audio/libvorbis
CONFIGURE_ARGS+= --with-ogg-vorbisinc="${LOCALBASE}/include" \ CONFIGURE_ARGS+= --with-ogg-vorbisinc="${LOCALBASE}/include" \
--with-ogg-vorbislib="${LOCALBASE}/lib" --with-ogg-vorbislib="${LOCALBASE}/lib"
.else .else

6
audio/sox/distinfo
View File

@ -1,3 +1,3 @@
MD5 (sox-12.17.2.tar.gz) = 9a21c9161cc2238426fc153917b0d2c8 MD5 (sox-12.17.3.tar.gz) = 1b9998387616ce0638c8edd1145f9932
RMD160 (sox-12.17.2.tar.gz) = 519eb9a2d71b16b7320bf011bef18c985a9ccb03 RMD160 (sox-12.17.3.tar.gz) = 295597e4d02f46897fa6d4a54d4066b459ac5535
SHA1 (sox-12.17.2.tar.gz) = da350a90576aa9db1d942ca3e1184dfdbf4731e6 SHA1 (sox-12.17.3.tar.gz) = 2598f5b64305430a644d74f061843ed993cfe316

114
audio/sox/patches/patch-Makefile.in
View File

@ -1,72 +1,80 @@
$OpenBSD: patch-Makefile.in,v 1.2 2001/10/27 14:02:22 naddy Exp $ $OpenBSD: patch-Makefile.in,v 1.3 2002/01/17 00:25:52 naddy Exp $
--- Makefile.in.orig Wed Sep 5 18:06:01 2001 --- Makefile.in.orig Wed Jan 16 23:18:44 2002
+++ Makefile.in Sun Oct 21 01:34:07 2001 +++ Makefile.in Wed Jan 16 23:24:55 2002
@@ -11,6 +11,8 @@ srcdir = @srcdir@ @@ -17,6 +17,8 @@ libdir = @libdir@
VPATH = @srcdir@ mandir = @mandir@
prefix = @prefix@ includedir = @includedir@
+DESTDIR = +DESTDIR =
+ +
# Shell commands. # Shell commands.
CC = @CC@ CC = @CC@
@@ -74,7 +76,7 @@ sox: libst.a sox.o @@ -78,7 +80,7 @@ sox: libst.a $(GSM_$(GSM_SUPPORT)) sox.o
$(CC) $(LDFLAGS) -o sox sox.o $(LIBS) $(CC) $(LDFLAGS) -o sox sox.o $(LIBS)
soxmix.o: sox.c soxmix.o: sox.c
- $(CC) $(CFLAGS) -DSOXMIX -c -o soxmix.o $< - $(CC) $(CFLAGS) -DSOXMIX -c -o soxmix.o $<
+ $(CC) $(CFLAGS) -DSOXMIX -c -o soxmix.o $? + $(CC) $(CFLAGS) -DSOXMIX -c -o soxmix.o $?
soxmix: libst.a soxmix.o soxmix: libst.a $(GSM_$(GSM_SUPPORT)) soxmix.o
$(CC) $(LDFLAGS) -o soxmix soxmix.o $(LIBS) $(CC) $(LDFLAGS) -o soxmix soxmix.o $(LIBS)
@@ -95,30 +97,30 @@ PLAY_INSTALL_0 = @@ -102,34 +104,34 @@ PLAY_INSTALL_0 =
PLAY_INSTALL_1 = install-play PLAY_INSTALL_1 = install-play
install: sox $(PLAY_INSTALL_$(PLAY_SUPPORT)) install: sox soxmix $(PLAY_INSTALL_$(PLAY_SUPPORT))
- $(srcdir)/mkinstalldirs $(BINDIR) - $(srcdir)/mkinstalldirs $(bindir)
- $(srcdir)/mkinstalldirs $(MANDIR)/man1 - $(srcdir)/mkinstalldirs $(mandir)/man1
- $(INSTALL) -c -m 755 sox $(BINDIR) - $(INSTALL) -c -m 755 sox $(bindir)
- $(INSTALL) -c -m 644 $(srcdir)/sox.1 $(MANDIR)/man1 - $(INSTALL) -c -m 755 soxmix $(bindir)
- $(INSTALL) -c -m 644 $(srcdir)/soxexam.1 $(MANDIR)/man1 - $(INSTALL) -c -m 644 $(srcdir)/sox.1 $(mandir)/man1
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(BINDIR) - if [ -f $(mandir)/man1/soxmix.1 ] ; then $(RM) $(mandir)/man1/soxmix.1; fi
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(MANDIR)/man1 - $(LN_S) $(mandir)/man1/sox.1 $(mandir)/man1/soxmix.1
+ $(INSTALL) -c -m 755 sox $(DESTDIR)$(BINDIR) - $(INSTALL) -c -m 644 $(srcdir)/soxexam.1 $(mandir)/man1
+ $(INSTALL) -c -m 644 $(srcdir)/sox.1 $(DESTDIR)$(MANDIR)/man1 + $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ $(INSTALL) -c -m 644 $(srcdir)/soxexam.1 $(DESTDIR)$(MANDIR)/man1 + $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
+ $(INSTALL) -c -m 755 sox $(DESTDIR)$(bindir)
+ $(INSTALL) -c -m 755 soxmix $(DESTDIR)$(bindir)
+ $(INSTALL) -c -m 644 $(srcdir)/sox.1 $(DESTDIR)$(mandir)/man1
+ if [ -f $(DESTDIR)$(mandir)/man1/soxmix.1 ] ; then $(RM) $(DESTDIR)$(mandir)/man1/soxmix.1; fi
+ cd $(DESTDIR)$(mandir)/man1 && $(LN_S) sox.1 soxmix.1
+ $(INSTALL) -c -m 644 $(srcdir)/soxexam.1 $(DESTDIR)$(mandir)/man1
install-play: install-play: play
- if [ -f $(BINDIR)/rec ] ; then $(RM) $(BINDIR)/rec; fi - if [ -f $(bindir)/rec ] ; then $(RM) $(bindir)/rec; fi
- if [ -f $(MANDIR)/man1/rec.1 ]; then $(RM) $(MANDIR)/man1/rec.1; fi - if [ -f $(mandir)/man1/rec.1 ]; then $(RM) $(mandir)/man1/rec.1; fi
- $(srcdir)/mkinstalldirs $(MANDIR)/man1 - $(srcdir)/mkinstalldirs $(mandir)/man1
- $(srcdir)/mkinstalldirs $(BINDIR) - $(srcdir)/mkinstalldirs $(bindir)
- $(INSTALL) -c -m 755 $(srcdir)/play $(BINDIR) - $(INSTALL) -c -m 755 play $(bindir)
- $(INSTALL) -c -m 644 $(srcdir)/play.1 $(MANDIR)/man1 - $(INSTALL) -c -m 644 $(srcdir)/play.1 $(mandir)/man1
- ln -s $(BINDIR)/play $(BINDIR)/rec - $(LN_S) $(bindir)/play $(bindir)/rec
- ln -s $(MANDIR)/man1/play.1 $(MANDIR)/man1/rec.1 - $(LN_S) $(mandir)/man1/play.1 $(mandir)/man1/rec.1
+ if [ -f $(DESTDIR)$(BINDIR)/rec ] ; then $(RM) $(DESTDIR)$(BINDIR)/rec; fi + 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 + if [ -f $(DESTDIR)$(mandir)/man1/rec.1 ]; then $(RM) $(DESTDIR)$(mandir)/man1/rec.1; fi
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(MANDIR)/man1 + $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(BINDIR) + $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ $(INSTALL) -c -m 755 play $(DESTDIR)$(BINDIR) + $(INSTALL) -c -m 755 play $(DESTDIR)$(bindir)
+ $(INSTALL) -c -m 644 $(srcdir)/play.1 $(DESTDIR)$(MANDIR)/man1 + $(INSTALL) -c -m 644 $(srcdir)/play.1 $(DESTDIR)$(mandir)/man1
+ cd $(DESTDIR)$(BINDIR) && ln -s play rec + cd $(DESTDIR)$(bindir) && $(LN_S) play rec
+ cd $(DESTDIR)$(MANDIR)/man1 && ln -s play.1 rec.1 + cd $(DESTDIR)$(mandir)/man1 && $(LN_S) play.1 rec.1
install-lib: libst.a install-lib: libst.a
- $(srcdir)/mkinstalldirs $(LIBDIR)/man1 - $(srcdir)/mkinstalldirs $(libdir)
- $(srcdir)/mkinstalldirs $(MANDIR)/man3 - $(srcdir)/mkinstalldirs $(mandir)/man3
- $(srcdir)/mkinstalldirs $(INCDIR) - $(srcdir)/mkinstalldirs $(includedir)
- $(INSTALL) -c -m 644 libst.a $(LIBDIR) - $(INSTALL) -c -m 644 libst.a $(libdir)
- $(RANLIB) $(LIBDIR)/libst.a - $(RANLIB) $(libdir)/libst.a
- $(INSTALL) -c -m 644 libst.3 $(MANDIR)/man3 - $(INSTALL) -c -m 644 $(srcdir)/libst.3 $(mandir)/man3
- $(INSTALL) -c -m 644 st.h $(INCDIR) - $(INSTALL) -c -m 644 $(srcdir)/st.h $(includedir)
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(LIBDIR)/man1 - $(INSTALL) -c -m 644 ststdint.h $(includedir)
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(MANDIR)/man3 + $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(INCDIR) + $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man3
+ $(INSTALL) -c -m 644 libst.a $(DESTDIR)$(LIBDIR) + $(srcdir)/mkinstalldirs $(DESTDIR)$(includedir)
+ $(RANLIB) $(DESTDIR)$(LIBDIR)/libst.a + $(INSTALL) -c -m 644 libst.a $(DESTDIR)$(libdir)
+ $(INSTALL) -c -m 644 libst.3 $(DESTDIR)$(MANDIR)/man3 + $(RANLIB) $(DESTDIR)$(libdir)/libst.a
+ $(INSTALL) -c -m 644 st.h $(DESTDIR)$(INCDIR) + $(INSTALL) -c -m 644 $(srcdir)/libst.3 $(DESTDIR)$(mandir)/man3
+ $(INSTALL) -c -m 644 $(srcdir)/st.h $(DESTDIR)$(includedir)
+ $(INSTALL) -c -m 644 ststdint.h $(DESTDIR)$(includedir)
clean: PLAY_UNINSTALL_0 =
$(RM) *.o PLAY_UNINSTALL_1 = uninstall-play

8
audio/sox/patches/patch-configure.in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure.in,v 1.2 2001/10/27 14:02:22 naddy Exp $ $OpenBSD: patch-configure.in,v 1.3 2002/01/17 00:25:52 naddy Exp $
--- configure.in.orig Sun Oct 21 00:49:21 2001 --- configure.in.orig Mon Dec 10 02:49:23 2001
+++ configure.in Sun Oct 21 00:51:22 2001 +++ configure.in Wed Jan 16 23:25:12 2002
@@ -194,11 +194,12 @@ fi @@ -162,11 +162,12 @@ fi
if test "$oss_dsp" = auto if test "$oss_dsp" = auto
then then

13
audio/sox/patches/patch-ima_rw_c
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-ima_rw_c,v 1.1 2001/10/27 14:02:22 naddy Exp $
--- ima_rw.c.orig Sun Oct 21 01:17:00 2001
+++ ima_rw.c Sun Oct 21 01:17:10 2001
@@ -23,8 +23,8 @@
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
-#include "ima_rw.h"
#include "st.h"
+#include "ima_rw.h"
/*
*

8
audio/sox/patches/patch-oss.c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-oss.c,v 1.2 2001/10/27 14:02:22 naddy Exp $ $OpenBSD: patch-oss.c,v 1.3 2002/01/17 00:25:52 naddy Exp $
--- oss.c.orig Wed Feb 21 21:57:01 2001 --- oss.c.orig Sat Dec 1 03:17:18 2001
+++ oss.c Sun Oct 21 00:56:31 2001 +++ oss.c Wed Jan 16 23:25:12 2002
@@ -30,6 +30,9 @@ @@ -33,6 +33,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <fcntl.h> #include <fcntl.h>

19
audio/sox/patches/patch-stconfig_h_in Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-stconfig_h_in,v 1.1 2002/01/17 00:25:52 naddy Exp $
--- stconfig.h.in.orig Wed Jan 16 23:37:11 2002
+++ stconfig.h.in Wed Jan 16 23:37:28 2002
@@ -1,4 +1,4 @@
-/* stconfig.h.in. Generated from configure.in by autoheader. */
+/* stconfig.h.in. Generated automatically from configure.in by autoheader. */
/* Define if you have the <byteswap.h> header file. */
#undef HAVE_BYTESWAP_H
@@ -44,6 +44,9 @@
/* Define if you have the `rand' function. */
#undef HAVE_RAND
+
+/* Define if you have the <soundcard.h> header file. */
+#undef HAVE_SOUNDCARD_H
/* Define if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H

15
audio/sox/patches/patch-vorbis_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-vorbis_c,v 1.1 2002/01/17 00:25:52 naddy Exp $
--- vorbis.c.orig Sat Dec 1 03:10:35 2001
+++ vorbis.c Thu Jan 17 00:34:08 2002
@@ -337,9 +337,8 @@ int st_vorbisstartwrite(ft_t ft)
fprintf(stdout, "Channels: %d Rate: %ld\n", ft->info.channels,
rate);
- /* Set encoding to average bit rate of 128kbps with no min or max */
- vorbis_encode_init(&ve->vi, ft->info.channels, ft->info.rate,
- -1, 128000, -1);
+ /* Set encoding to average bit rate of 112kbps VBR */
+ vorbis_encode_init_vbr(&ve->vi, ft->info.channels, ft->info.rate, 0.3f);
vorbis_analysis_init(&ve->vd, &ve->vi);
vorbis_block_init(&ve->vd, &ve->vb);

65
audio/sox/pkg/DESCR
View File

@ -1,66 +1,7 @@
SoX (also known as Sound eXchange) translates sound samples between SoX (also known as Sound eXchange) translates sound samples between
different file formats, and optionally applies various sound effects. different file formats, and optionally applies various sound effects.
SoX is intended as the Swiss Army knife of sound processing tools.
This release understands: It doesn't do anything very well, but sooner or later it comes in
very handy.
o Raw files in various binary formats
o Raw textual data
o Amiga 8svx files
o Apple/SGI AIFF files
o SUN .au style files
o AVR files
o CD-R (music CD format)
o CVS and VMS files (continous variable slope)
o Macintosh HCOM files
o Amiga MAUD files
o IRCAM SoundFile files
o NIST SPHERE files
o Turtle beach SampleVision files.
o Soundtool (DOS) files
o Yamaha TX-16W sampler files.
o Sound Blaster .VOC files
o Microsoft .WAV files
o Psion (palmtop) A-law WVE files
o Pseudo-file fomats that allow direct playing/recording from audio devices
o Pseudo-nul file that reads and writes from/to nowhere
The sound effects include:
o Channel Averaging
o Band-pass filters
o Band-reject filter
o Chorus effect
o DCShift audio
o Move sound stage of CD audio to in front of you (for headphone use)
o Add an echo
o Add a sequence of echos
o Fade in and out
o Apply a flanger effect
o Apply a high-pass filter
o Apply a low-pass filter
o Pan sound between channels
o Change the pitch of a sound file
o Display a list of loops in a file
o Add masking noise to a signal
o Apply a phaser effect
o Convert from stereo to mono
o Change sampling rates using several different algorithms.
o Apply a reverb effect
o Reverse the sound samples
o Trim off silence from the beginning of end of a file.
o Change the speed of samples being played
o Convert from mono to stereo
o Display general stats on a sound sample
o Stretch/shorten the duration of a sound file.
o Swap stereo channels
o Create sounds with a simple synthesizer.
o Trim audio data from beginning and end of file.
o Add the world-famous Fender Vibro-Champ effect
o Adjust volume of samples
Available flavors that add support for additional file formats:
o gsm GSM lossy speech compression
o vorbis Ogg Vorbis compressed audio
WWW: ${HOMEPAGE} WWW: ${HOMEPAGE}

4
audio/sox/pkg/PLIST
View File

@ -1,8 +1,10 @@
@comment $OpenBSD: PLIST,v 1.3 2000/09/10 16:05:02 brad Exp $ @comment $OpenBSD: PLIST,v 1.4 2002/01/17 00:25:52 naddy Exp $
bin/play bin/play
bin/rec bin/rec
bin/sox bin/sox
bin/soxmix
man/man1/play.1 man/man1/play.1
man/man1/rec.1 man/man1/rec.1
man/man1/sox.1 man/man1/sox.1
man/man1/soxexam.1 man/man1/soxexam.1
man/man1/soxmix.1