[nyquist] 3.08

Tue May 28 14:00:18 UTC 2013

commit aadce8f78943875716115f93071b894103a2b3e9
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Tue May 28 10:00:00 2013 -0400

    3.08

 .gitignore   |    1 +
 Makefile     |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 nyquist.spec |   10 ++++++--
 sources      |    2 +-
 4 files changed, 68 insertions(+), 12 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 5deb3e5..6349888 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 nyqsrc303.zip
 /nyqsrc304b.zip
+/nyqsrc308.zip
diff --git a/Makefile b/Makefile
index fd15e13..e51fbd9 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ INCL = -Inyqsrc -Itran -Ixlisp -Isys/unix -Icmt -Iffts/src \
 
 # system dependent stuff for alsa:
 
-AUDIOLIBS = -lasound
+AUDIOLIBS = -lasound -logg -lvorbis -lvorbisenc -lFLAC -lsndfile
 
 CC = gcc
 
@@ -141,20 +141,26 @@ OBJECTS = xlisp/extern.o xlisp/xldmem.o  \
 	cmt/tempomap.o cmt/timebase.o  \
 	cmt/userio.o nylsf/aiff.o  \
 	nylsf/alaw.o nylsf/au.o  \
+	nylsf/audio_detect.o  \
 	nylsf/avr.o nylsf/broadcast.o  \
-	nylsf/caf.o nylsf/command.o  \
+	nylsf/caf.o nylsf/chanmap.o  \
+	nylsf/chunk.o nylsf/command.o  \
 	nylsf/common.o nylsf/dither.o  \
 	nylsf/double64.o nylsf/dwd.o  \
 	nylsf/dwvw.o nylsf/file_io.o  \
 	nylsf/flac.o nylsf/float32.o  \
 	nylsf/gsm610.o nylsf/htk.o  \
 	nylsf/ima_adpcm.o nylsf/interleave.o  \
+	nylsf/ima_oki_adpcm.o nylsf/id3.o \
 	nylsf/ircam.o nylsf/macbinary3.o  \
 	nylsf/macos.o nylsf/mat4.o  \
 	nylsf/mat5.o nylsf/ms_adpcm.o  \
+	nylsf/mpc2k.o  \
 	nylsf/nist.o nylsf/ogg.o  \
+	nylsf/ogg_vorbis.o  \
 	nylsf/paf.o nylsf/pcm.o  \
 	nylsf/pvf.o nylsf/raw.o  \
+	nylsf/rf64.o  \
 	nylsf/rx2.o nylsf/sd2.o  \
 	nylsf/sds.o nylsf/sndfile.o  \
 	nylsf/strings.o nylsf/svx.o  \
@@ -177,11 +183,14 @@ OBJECTS = xlisp/extern.o xlisp/xldmem.o  \
 	nyqsrc/handlers.o nyqsrc/multiread.o  \
 	nyqsrc/seqext.o nyqsrc/seqinterf.o  \
 	nyqsrc/stats.o nyqsrc/ffilterkit.o  \
-	nyqsrc/sliders.o nyqsrc/sound.o  \
+	nyqsrc/sound.o  \
 	nyqsrc/add.o nyqsrc/avg.o  \
 	nyqsrc/compose.o nyqsrc/convolve.o  \
 	nyqsrc/downsample.o nyqsrc/fft.o  \
+	nyqsrc/f0.o  \
 	nyqsrc/inverse.o nyqsrc/multiseq.o  \
+	nyqsrc/probe.o nyqsrc/sndsliders.o  \
+	nyqsrc/sliderdata.o  \
 	nyqsrc/resamp.o nyqsrc/resampv.o  \
 	nyqsrc/samples.o nyqsrc/sndmax.o  \
 	nyqsrc/sndread.o nyqsrc/sndseq.o  \
@@ -219,9 +228,12 @@ NYQHDRS = nyqsrc/sndfmt.h nylsf/sndfile.h  \
 	nyqsrc/sound.h nyqsrc/add.h  \
 	nyqsrc/avg.h nyqsrc/compose.h  \
 	nyqsrc/convolve.h nyqsrc/downsample.h  \
+	nyqsrc/f0.h  \
 	nyqsrc/fft.h nyqsrc/inverse.h  \
-	nyqsrc/multiseq.h nyqsrc/resamp.h  \
+	nyqsrc/multiseq.h nyqsrc/probe.h  \
+	nyqsrc/resamp.h  \
 	nyqsrc/resampv.h nyqsrc/samples.h  \
+	nyqsrc/sliderdata.h  \
 	nyqsrc/sndmax.h nyqsrc/sndread.h  \
 	nyqsrc/sndseq.h nyqsrc/sndsliders.h  \
 	nyqsrc/sndwrite.h nyqsrc/yin.h  \
@@ -405,9 +417,6 @@ nyqsrc/stats.o: nyqsrc/stats.c nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
 nyqsrc/ffilterkit.o: nyqsrc/ffilterkit.c nyqsrc/ffilterkit.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
 	$(CC) -c nyqsrc/ffilterkit.c -o nyqsrc/ffilterkit.o $(CFLAGS)
 
-nyqsrc/sliders.o: nyqsrc/sliders.c nyqsrc/sliders.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
-	$(CC) -c nyqsrc/sliders.c -o nyqsrc/sliders.o $(CFLAGS)
-
 ffts/src/fftext.o: ffts/src/fftext.c ffts/src/fftext.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
 	$(CC) -c ffts/src/fftext.c -o ffts/src/fftext.o $(CFLAGS)
 
@@ -654,6 +663,24 @@ tran/fmfb.o: tran/fmfb.c tran/fmfb.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.
 tran/fmfbv.o: tran/fmfbv.c tran/fmfbv.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
 	$(CC) -c tran/fmfbv.c -o tran/fmfbv.o $(CFLAGS)
 
+nyqsrc/f0.o: nyqsrc/f0.cpp nyqsrc/f0.h
+	g++ -c nyqsrc/f0.cpp -o nyqsrc/f0.o $(CFLAGS)
+
+nyqsrc/fft-rbd.o: nyqsrc/fft-rbd.c
+	$(CC) -c nyqsrc/fft-rbd.c -o nyqsrc/fft-rbd.o $(CFLAGS)
+
+nyqsrc/nyx.o: nyqsrc/nyx.c nyqsrc/nyx.h
+	$(CC) -c nyqsrc/nyx.c -o nyqsrc/nyx.o $(CFLAGS)
+
+nyqsrc/probe.o: nyqsrc/probe.c nyqsrc/probe.h
+	$(CC) -c nyqsrc/probe.c -o nyqsrc/probe.o $(CFLAGS)
+
+nyqsrc/sliderdata.o: nyqsrc/sliderdata.c nyqsrc/sliderdata.h
+	$(CC) -c nyqsrc/sliderdata.c -o nyqsrc/sliderdata.o $(CFLAGS)
+
+nyqsrc/sndfail.o: nyqsrc/sndfail.c
+	$(CC) -c nyqsrc/sndfail.c -o nyqsrc/sndfail.o $(CFLAGS)
+
 nyqsrc/sndfnint.o: nyqsrc/sndfnint.c 
 	$(CC) -c nyqsrc/sndfnint.c -o nyqsrc/sndfnint.o $(CFLAGS)
 
@@ -921,6 +948,9 @@ nylsf/alaw.o: nylsf/alaw.c
 nylsf/au.o: nylsf/au.c
 	$(CC) -c nylsf/au.c -o nylsf/au.o $(CFLAGS)
 
+nylsf/audio_detect.o: nylsf/audio_detect.c
+	$(CC) -c nylsf/audio_detect.c -o nylsf/audio_detect.o $(CFLAGS)
+
 nylsf/avr.o: nylsf/avr.c
 	$(CC) -c nylsf/avr.c -o nylsf/avr.o $(CFLAGS)
 
@@ -930,6 +960,12 @@ nylsf/broadcast.o: nylsf/broadcast.c
 nylsf/caf.o: nylsf/caf.c
 	$(CC) -c nylsf/caf.c -o nylsf/caf.o $(CFLAGS)
 
+nylsf/chanmap.o: nylsf/chanmap.c
+	$(CC) -c nylsf/chanmap.c -o nylsf/chanmap.o $(CFLAGS)
+
+nylsf/chunk.o: nylsf/chunk.c
+	$(CC) -c nylsf/chunk.c -o nylsf/chunk.o $(CFLAGS)
+
 nylsf/command.o: nylsf/command.c
 	$(CC) -c nylsf/command.c -o nylsf/command.o $(CFLAGS)
 
@@ -963,9 +999,15 @@ nylsf/gsm610.o: nylsf/gsm610.c
 nylsf/htk.o: nylsf/htk.c
 	$(CC) -c nylsf/htk.c -o nylsf/htk.o $(CFLAGS)
 
+nylsf/id3.o: nylsf/id3.c
+	$(CC) -c nylsf/id3.c -o nylsf/id3.o $(CFLAGS)
+
 nylsf/ima_adpcm.o: nylsf/ima_adpcm.c
 	$(CC) -c nylsf/ima_adpcm.c -o nylsf/ima_adpcm.o $(CFLAGS)
 
+nylsf/ima_oki_adpcm.o: nylsf/ima_oki_adpcm.c
+	$(CC) -c nylsf/ima_oki_adpcm.c -o nylsf/ima_oki_adpcm.o $(CFLAGS)
+
 nylsf/interleave.o: nylsf/interleave.c
 	$(CC) -c nylsf/interleave.c -o nylsf/interleave.o $(CFLAGS)
 
@@ -984,6 +1026,9 @@ nylsf/mat4.o: nylsf/mat4.c
 nylsf/mat5.o: nylsf/mat5.c
 	$(CC) -c nylsf/mat5.c -o nylsf/mat5.o $(CFLAGS)
 
+nylsf/mpc2k.o: nylsf/mpc2k.c
+	$(CC) -c nylsf/mpc2k.c -o nylsf/mpc2k.o $(CFLAGS)
+
 nylsf/ms_adpcm.o: nylsf/ms_adpcm.c
 	$(CC) -c nylsf/ms_adpcm.c -o nylsf/ms_adpcm.o $(CFLAGS)
 
@@ -993,6 +1038,9 @@ nylsf/nist.o: nylsf/nist.c
 nylsf/ogg.o: nylsf/ogg.c
 	$(CC) -c nylsf/ogg.c -o nylsf/ogg.o $(CFLAGS)
 
+nylsf/ogg_vorbis.o: nylsf/ogg_vorbis.c
+	$(CC) -c nylsf/ogg_vorbis.c -o nylsf/ogg_vorbis.o $(CFLAGS)
+
 nylsf/paf.o: nylsf/paf.c
 	$(CC) -c nylsf/paf.c -o nylsf/paf.o $(CFLAGS)
 
@@ -1005,8 +1053,11 @@ nylsf/pvf.o: nylsf/pvf.c
 nylsf/raw.o: nylsf/raw.c
 	$(CC) -c nylsf/raw.c -o nylsf/raw.o $(CFLAGS)
 
+nylsf/rf64.o: nylsf/rf64.c
+	$(CC) -c nylsf/rf64.c -o nylsf/rf64.o $(CFLAGS)
+
 nylsf/rx2.o: nylsf/rx2.c
-	$(CC) -c nylsf/rx2.c -o nylsf/rx2.o $(CFLAGS)
+	$(CC) -c nylsf/rx2.c -o nylsf/rx2.o $(CFLAGS) 
 
 nylsf/sd2.o: nylsf/sd2.c
 	$(CC) -c nylsf/sd2.c -o nylsf/sd2.o $(CFLAGS)
diff --git a/nyquist.spec b/nyquist.spec
index 6f0c54d..14a8b0a 100644
--- a/nyquist.spec
+++ b/nyquist.spec
@@ -1,17 +1,18 @@
 Name:           nyquist
-Version:        3.04
-Release:        7b%{?dist}
+Version:        3.08
+Release:        1%{?dist}
 Summary:        Sound synthesis and composition language with a Lisp syntax
 
 Group:          Applications/Multimedia
 License:        BSD
 URL:            http://www-2.cs.cmu.edu/~music/music.software.html
-Source0:        http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc304b.zip
+Source0:        http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc308.zip
 Source1:        Makefile
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel
 BuildRequires:  liblo-devel
 BuildRequires:  portaudio-devel
+BuildRequires:	libsndfile-devel, libogg-devel, flac-devel, libvorbis-devel
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  dos2unix
 Requires:       java >= 1:1.6.0
@@ -94,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 28 2013 Tom Callaway <spot at fedoraproject.org> - 3.08-1
+- update to 3.08
+
 * Wed Mar 13 2013 Mat Booth <fedora at matbooth.co.uk> - 3.04-7b
 - Fix FTBFS rhbz #914223
 
diff --git a/sources b/sources
index 5e3336c..476959c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aed14f82aec2347cba45ba348974f96d  nyqsrc304b.zip
+365b4d04362a5178472e4ed319f09bb0  nyqsrc308.zip
