rpms/nyquist/devel nyqsrc303-make.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 nyquist.spec, 1.11, 1.12 sources, 1.8, 1.9 nyqsrc301-inc.patch, 1.2, NONE nyqsrc301-javafix.patch, 1.3, NONE

Sat Aug 8 20:50:32 UTC 2009

Author: gemi

Update of /cvs/pkgs/rpms/nyquist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19538

Modified Files:
	.cvsignore nyquist.spec sources 
Added Files:
	nyqsrc303-make.patch 
Removed Files:
	nyqsrc301-inc.patch nyqsrc301-javafix.patch 
Log Message:
new release 3.03

nyqsrc303-make.patch:
 Makefile |   44 ++++++++++----------------------------------
 1 file changed, 10 insertions(+), 34 deletions(-)

--- NEW FILE nyqsrc303-make.patch ---
diff -up nyquist/sys/unix/linux/Makefile.make nyquist/sys/unix/linux/Makefile
--- nyquist/sys/unix/linux/Makefile.make	2009-03-03 23:00:41.000000000 +0100
+++ nyquist/sys/unix/linux/Makefile	2009-08-08 22:38:23.000000000 +0200
@@ -14,8 +14,7 @@ NY = ny
 OPT = -O2
 # OPT = -g
 
-EVERYTHING = $(NY) runtime/system.lsp jnyqide/jNyqIDE.jar \
-           bin/ser-to-osc bin/test-client
+EVERYTHING = $(NY) runtime/system.lsp jnyqide/jNyqIDE.jar
 
 CURRENT = $(EVERYTHING)
 
@@ -46,12 +45,12 @@ jnyqide/jNyqIDE.jar: $(JAVASRC)
 	javac jnyqide/*.java
 	mv jnyqide/SpecialMacHandler.hidden jnyqide/SpecialMacHandler.java
 	rm -rf jnyqide/jNyqIDE.jar
-	jar -cfm jnyqide/jNyqIDE.jar jnyqide/manifest.txt jnyqide/*.class
+	jar -cfm jnyqide/jNyqIDE.jar jnyqide/manifest.txt jnyqide/*.class jnyqide/*.txt
 
 # Standard list of includes (common to all unix versions)
 # Keeping portaudio and libsndfile sources local to nyquist
 INCL = -Inyqsrc -Itran -Ixlisp -Isys/unix -Icmt -Iffts/src \
-   -Inyqstk/include -Inyqstk -Iportaudio/pa_common -Iliblo -Inylsf
+   -Inyqstk/include -Inyqstk -Inylsf
 
 # system dependent stuff for linux:
 
@@ -63,28 +62,26 @@ CC = gcc
 # unless the number of channels matched the hardware
 #
 # to use ALSA:
-USE_ALSA = -DPA_USE_ALSA=1
+USE_ALSA =
 USE_OSS = 
-ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o
+ALSA_OBJECTS = 
 #
 # to use OSS:
 # USE_OSS = -DPA_USE_OSS=1
 # USE_ALSA = 
 # ALSA_OBJECTS = 
 
-LIBLO_PATH = liblo/src/.libs
-
 # to enable command line editing, use -DREADLINE. WARNING: THIS WILL 
 # DISABLE THE ABILITY TO INTERRUPT LISP AND USE SOME OTHER HANDY 
 # CONTROL CHARACTERS (You will also need the readline and curses libraries)
-CFLAGS = -DOSC -DCMTSTUFF -DPA_LITTLE_ENDIAN $(OPT) $(INCL) \
+CFLAGS = -DOSC -DCMTSTUFF $(OPT) $(INCL) \
     -DHAVE_LIBPTHREAD=1 -D_FILE_OFFSET_BITS=64 \
     $(USE_OSS) $(USE_ALSA) -DSTK_NYQUIST -DUSE_VSPRINTF \
     -DHAVE_CONFIG_H
 LN = g++
 AR = ar
 # to enable command line editing, insert -lreadline -lcurses
-LFLAGS = -lm -lpthread -lasound -llo -L$(LIBLO_PATH)
+LFLAGS = -lm -lpthread -lasound -llo -lportaudio
 
 TAGS:
 	find . ( -name 
@@ -223,13 +220,8 @@ OBJECTS = xlisp/extern.o xlisp/xldmem.o 
 	nyqstk/stkinit.o nyqstk/instr.o  \
 	nyqstk/stkint.o ffts/src/fftext.o  \
 	ffts/src/fftlib.o ffts/src/matlib.o  \
-	nyqsrc/sndfnint.o nyqsrc/seqfnint.o  \
-	portaudio/pa_common/pa_front.o portaudio/pa_unix/pa_unix_hostapis.o  \
-	portaudio/pa_unix_oss/pa_unix_oss.o portaudio/pa_unix/pa_unix_util.o  \
-	portaudio/pa_common/pa_cpuload.o portaudio/pa_common/pa_allocation.o  \
-	portaudio/pa_common/pa_stream.o portaudio/pa_common/pa_converters.o  \
-	portaudio/pa_common/pa_process.o portaudio/pa_common/pa_dither.o  \
-	portaudio/pa_common/pa_trace.o sys/unix/osstuff.o  \
+	nyqsrc/sndfnint.o nyqsrc/seqfnint.o \
+	sys/unix/osstuff.o \
 	sys/unix/term.o $(ALSA_OBJECTS) 
 
 # Sound functions to add to xlisp
@@ -295,23 +287,7 @@ CMTHDRS = cmt/seqdecls.h nyqsrc/seqext.h
 bin:
 	mkdir bin
 
-liblo/config.h:
-	cd liblo; ./autogen.sh --enable-static --disable-shared
-
-$(LIBLO_PATH)/liblo.a: liblo/config.h
-	cd liblo; make
-
-bin/ser-to-osc: bin $(LIBLO_PATH)/liblo.a
-	$(CC) -c $(CFLAGS) liblo/ser-to-osc/ser-to-osc.cpp \
-	      -o liblo/ser-to-osc/ser-to-osc.o
-	$(LN)  liblo/ser-to-osc/ser-to-osc.o -o bin/ser-to-osc $(LFLAGS)
-
-bin/test-client: bin $(LIBLO_PATH)/liblo.a
-	$(CC) -c $(CFLAGS) liblo/test-client/test-client.c \
-	      -o liblo/test-client/test-client.o
-	$(LN) liblo/test-client/test-client.o -o bin/test-client  $(LFLAGS)
-
-$(NY): $(OBJECTS) $(LIBLO_PATH)/liblo.a
+$(NY): $(OBJECTS)
 	$(LN) $(OBJECTS) $(LFLAGS) -o $(NY)
 
 # copy appropriate system.lsp and make it read-only;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	26 Feb 2009 21:52:35 -0000	1.7
+++ .cvsignore	8 Aug 2009 20:50:31 -0000	1.8
@@ -1 +1 @@
-nyqsrc302.zip
+nyqsrc303.zip


Index: nyquist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/devel/nyquist.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- nyquist.spec	25 Jul 2009 19:45:37 -0000	1.11
+++ nyquist.spec	8 Aug 2009 20:50:32 -0000	1.12
@@ -1,17 +1,17 @@
 Name:           nyquist
-Version:        3.02
-Release:        2%{?dist}
+Version:        3.03
+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/nyqsrc302.zip
-Patch0:         nyqsrc231-pafix.patch
-Patch1:         nyqsrc301-inc.patch
-Patch2:         nyqsrc301-javafix.patch
+Source0:        http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc303.zip
+#Patch0:         nyqsrc231-pafix.patch
+Patch3:         nyqsrc303-make.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel
+BuildRequires:  liblo-devel
 BuildRequires:  java-1.6.0-openjdk-devel
 BuildRequires:  dos2unix
 Requires:       java-1.6.0-openjdk
@@ -27,23 +27,17 @@ on an interactive Lisp interpreter.
 
 %prep
 %setup -q -n nyquist
-%patch0 -p1 -b .pafix
-%patch1 -p1 -b .inc
-%patch2 -p1 -b .javafix
+%patch3 -p1 -b .make
 
 # remove cvs cruft
 find -name CVS | xargs rm -fr
 # add opt flags
-sed -i "s|^CFLAGS =|CFLAGS = $RPM_OPT_FLAGS |" sys/unix/linux/Makefile
 sed -i "s|^CFLAGS =|CFLAGS = $RPM_OPT_FLAGS |" misc/Makefile
-# do not build with buggy readline support
-sed -i "s|^LFLAGS =.*|LFLAGS = -lm -lpthread -lasound|" sys/unix/linux/Makefile
-# build with alsa
-sed -i "s|^USE_ALSA =|USE_ALSA = -DPA_USE_ALSA=1|" sys/unix/linux/Makefile
 # remove dos paths that cause warnings
 sed -i 's|(setdir ".:.*")||' runtime/fileio.lsp
 # fix some permission
 find -name "*.lsp" | xargs chmod 0644
+sed -i 's|"./ny"|"ny"|' jnyqide/NyquistThread.java
 # change end-of-line
 find -name "*.htm*" \
     -or -name "*.lsp" \
@@ -53,7 +47,7 @@ find -name "*.htm*" \
 
 %build
 rm -f runtime/system.lsp
-make %{?_smp_mflags} -f sys/unix/linux/Makefile
+make %{?_smp_mflags} OPT="$RPM_OPT_FLAGS" -f sys/unix/linux/Makefile
 
 
 %install
@@ -99,6 +93,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug  8 2009 Gerard Milmeister <gemi at bluewin.ch> - 3.03-1
+- new release 3.03
+- use system portaudio and liblo
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.02-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	26 Feb 2009 21:52:35 -0000	1.8
+++ sources	8 Aug 2009 20:50:32 -0000	1.9
@@ -1 +1 @@
-ce618803273aa2851e3c6c1bd4ad050e  nyqsrc302.zip
+ed3112fe58a97fba36ba186813e8506f  nyqsrc303.zip


--- nyqsrc301-inc.patch DELETED ---


--- nyqsrc301-javafix.patch DELETED ---


