rpms/nyquist/F-9 nyqsrc301-inc.patch, NONE, 1.1 nyqsrc301-javafix.patch, NONE, 1.1 nyquist.spec, 1.6, 1.7 sources, 1.6, 1.7
Gérard Milmeister (gemi)
fedora-extras-commits at redhat.com
Tue Jul 8 06:35:01 UTC 2008
Author: gemi
Update of /cvs/pkgs/rpms/nyquist/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7099
Modified Files:
nyquist.spec sources
Added Files:
nyqsrc301-inc.patch nyqsrc301-javafix.patch
Log Message:
new release 3.01
nyqsrc301-inc.patch:
--- NEW FILE nyqsrc301-inc.patch ---
diff -up nyquist/nyqstk/src/FileRead.cpp.inc nyquist/nyqstk/src/FileRead.cpp
--- nyquist/nyqstk/src/FileRead.cpp.inc 2008-07-07 23:12:46.000000000 +0200
+++ nyquist/nyqstk/src/FileRead.cpp 2008-07-07 23:12:53.000000000 +0200
@@ -33,6 +33,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <cmath>
+#include <cstring>
FileRead :: FileRead()
: fd_(0)
diff -up nyquist/nyqstk/src/Modal.cpp.inc nyquist/nyqstk/src/Modal.cpp
--- nyquist/nyqstk/src/Modal.cpp.inc 2008-07-07 23:14:50.000000000 +0200
+++ nyquist/nyqstk/src/Modal.cpp 2008-07-07 23:15:03.000000000 +0200
@@ -12,6 +12,7 @@
/***************************************************/
#include "Modal.h"
+#include <cstdlib>
Modal :: Modal(unsigned int modes)
: nModes_(modes)
diff -up nyquist/nyqstk/src/Stk.cpp.inc nyquist/nyqstk/src/Stk.cpp
--- nyquist/nyqstk/src/Stk.cpp.inc 2008-07-07 23:13:50.000000000 +0200
+++ nyquist/nyqstk/src/Stk.cpp 2008-07-07 23:14:12.000000000 +0200
@@ -13,6 +13,7 @@
/***************************************************/
#include "Stk.h"
+#include <cstdlib>
StkFloat Stk :: srate_ = (StkFloat) SRATE;
std::string Stk :: rawwavepath_ = RAWWAVE_PATH;
nyqsrc301-javafix.patch:
--- NEW FILE nyqsrc301-javafix.patch ---
diff -up nyquist/jnyqide/NyquistThread.java.javafix nyquist/jnyqide/NyquistThread.java
--- nyquist/jnyqide/NyquistThread.java.javafix 2008-01-07 16:30:33.000000000 +0100
+++ nyquist/jnyqide/NyquistThread.java 2008-07-08 00:03:20.000000000 +0200
@@ -74,7 +74,7 @@ public class NyquistThread extends Threa
// find full path to instruments.txt
String cwd = System.getProperty("user.dir");
- soundBrowser = cwd.concat("/lib/instruments.txt");
+ soundBrowser = "/usr/share/nyquist/lib/instruments.txt";
System.out.println("soundBrowser file is " + soundBrowser);
// build XLISPPATH environment specification
@@ -104,10 +104,10 @@ public class NyquistThread extends Threa
System.out.println("envp has " + systemroot);
try {
- myProcess = Runtime.getRuntime().exec( "./ny", envp );
+ myProcess = Runtime.getRuntime().exec( "ny", envp );
} catch (Exception e3) {
- System.out.println("no ./ny found, trying ./nyquist");
- myProcess = Runtime.getRuntime().exec("./nyquist", envp);
+ System.out.println("no ny found, trying nyquist");
+ myProcess = Runtime.getRuntime().exec("nyquist", envp);
// if this one fails, we'll take the exception below
}
System.out.print("myProcess: " + myProcess);
diff -up nyquist/jnyqide/WordList.java.javafix nyquist/jnyqide/WordList.java
--- nyquist/jnyqide/WordList.java.javafix 2008-01-26 03:21:38.000000000 +0100
+++ nyquist/jnyqide/WordList.java 2008-07-07 23:52:16.000000000 +0200
@@ -2,7 +2,7 @@ package jnyqide;
import java.io.BufferedReader;
import java.io.FileReader;
-import java.io.IOException;
+import java.io.*;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -47,13 +47,8 @@ public class WordList {
//System.out.println("initializing WordList.java");
try {
BufferedReader inf;
- try {
- inf = new BufferedReader(new FileReader("NyquistWords.txt"));
- System.out.println("\n\n***********************Opened NyquistWords.txt*********\n\n");
- } catch (IOException e) {
- System.out.println("could not find NyquistWords.txt, trying jnyqide/NyquistWords.txt");
- inf = new BufferedReader(new FileReader("jnyqide/NyquistWords.txt"));
- }
+ inf = new BufferedReader(new InputStreamReader(WordList.class.getResourceAsStream("NyquistWords.txt")));
+ System.out.println("\n\n***********************Opened NyquistWords.txt*********\n\n");
String word, link;
while ((word = inf.readLine()) != null) {
//wordsTrie.addWord(word);
diff -up nyquist/sys/unix/linux/Makefile.javafix nyquist/sys/unix/linux/Makefile
--- nyquist/sys/unix/linux/Makefile.javafix 2008-01-17 23:27:37.000000000 +0100
+++ nyquist/sys/unix/linux/Makefile 2008-07-07 23:52:16.000000000 +0200
@@ -42,7 +42,7 @@ 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)
INCL = -Inyqsrc -Itran -Ixlisp -Isys/unix -Icmt -Isnd -Ifft \
Index: nyquist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/F-9/nyquist.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nyquist.spec 19 Feb 2008 03:41:37 -0000 1.6
+++ nyquist.spec 8 Jul 2008 06:34:12 -0000 1.7
@@ -1,16 +1,20 @@
Name: nyquist
-Version: 2.37
-Release: 2%{?dist}
+Version: 3.01
+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/nyqsrc237.zip
+Source0: http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc301.zip
Patch0: nyqsrc231-pafix.patch
+Patch1: nyqsrc301-inc.patch
+Patch2: nyqsrc301-javafix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
+BuildRequires: java-1.6.0-openjdk-devel
BuildRequires: dos2unix
+Requires: java-1.6.0-openjdk
%description
Nyquist is a language for sound synthesis and music
@@ -23,7 +27,10 @@
%prep
%setup -q -n nyquist
-%patch0 -p1
+%patch0 -p1 -b .pafix
+%patch1 -p1 -b .inc
+%patch2 -p1 -b .javafix
+
# remove cvs cruft
find -name CVS | xargs rm -fr
# add opt flags
@@ -36,6 +43,8 @@
sed -i "s|^ALSA_OBJECTS =|ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o|" 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
# change end-of-line
find -name "*.htm*" \
-or -name "*.lsp" \
@@ -44,20 +53,23 @@
-or -name "*.dat" | xargs dos2unix -q
%build
-(cd misc; make %{?_smp_mflags})
rm -f runtime/system.lsp
-make %{?_smp_mflags} -f sys/unix/linux/Makefile ny runtime/system.lsp
+make %{?_smp_mflags} -f sys/unix/linux/Makefile
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/nyquist
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/nyquist/java
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
cp -pr runtime $RPM_BUILD_ROOT%{_datadir}/nyquist
cp -pr lib $RPM_BUILD_ROOT%{_datadir}/nyquist
+cp -pr demos $RPM_BUILD_ROOT%{_datadir}/nyquist
cp -p ny $RPM_BUILD_ROOT%{_libexecdir}
+cp -p jnyqide/jNyqIDE.jar $RPM_BUILD_ROOT%{_datadir}/nyquist/java
+
cat > $RPM_BUILD_ROOT%{_bindir}/ny <<EOF
#!/bin/sh
@@ -66,6 +78,13 @@
EOF
chmod 0755 $RPM_BUILD_ROOT%{_bindir}/ny
+cat > $RPM_BUILD_ROOT%{_bindir}/jny <<EOF
+#!/bin/sh
+export XLISPPATH=%{_datadir}/nyquist/runtime:%{_datadir}/nyquist/lib
+exec java -jar %{_datadir}/nyquist/java/jNyqIDE.jar \$*
+EOF
+chmod 0755 $RPM_BUILD_ROOT%{_bindir}/jny
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -73,13 +92,17 @@
%files
%defattr(-,root,root,-)
%doc Readme.txt license.txt advantages.txt files.txt todo.txt
-%doc demos doc
+%doc doc
%{_bindir}/ny
+%{_bindir}/jny
%{_libexecdir}/ny
%{_datadir}/nyquist
%changelog
+* Mon Jul 7 2008 Gerard Milmeister <gemi at bluewin.ch> - 3.01-1
+- new release 3.01
+
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.37-2
- Autorebuild for GCC 4.3
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 16 Dec 2007 15:48:28 -0000 1.6
+++ sources 8 Jul 2008 06:34:12 -0000 1.7
@@ -1 +1 @@
-f14bc518db40e7cd7fc546cb10e5d5ab nyqsrc237.zip
+f2ad65bb2ed7e1dc2d7db2e052be9592 nyqsrc301.zip
More information about the fedora-extras-commits
mailing list