rpms/nyquist/devel nyqsrc231-pafix.patch, NONE, 1.1 nyquist.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/extras/rpms/nyquist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25841/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nyqsrc231-pafix.patch nyquist.spec 
Log Message:
auto-import nyquist-2.31-3 on branch devel from nyquist-2.31-3.src.rpm

nyqsrc231-pafix.patch:

--- NEW FILE nyqsrc231-pafix.patch ---
--- nyquist/portaudio/pa_linux_alsa/pa_linux_alsa.c.pafix	2006-11-02 22:17:31.000000000 +0100
+++ nyquist/portaudio/pa_linux_alsa/pa_linux_alsa.c	2006-11-02 22:18:56.000000000 +0100
@@ -2248,7 +2248,7 @@
         playbackAvail = playbackAvail == 0 ? INT_MAX : playbackAvail;   /* Disregard if zero */
     }
     
-    assert( !(captureAvail == playbackAvail == INT_MAX) );
+    assert( !(captureAvail == INT_MAX && playbackAvail == INT_MAX) );
 
     commonAvail = MIN( captureAvail, playbackAvail );
     commonAvail -= commonAvail % stream->frames_per_period;


--- NEW FILE nyquist.spec ---
Name:           nyquist
Version:        2.31
Release:        3%{?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/nyqsrc231.zip
Patch0:         nyqsrc231-pafix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  alsa-lib-devel
BuildRequires:  dos2unix

%description
Nyquist is a language for sound synthesis and music
composition. Unlike score languages that tend to deal only with
events, or signal processing languages that tend to deal only with
signals and synthesis, Nyquist handles both in a single integrated
system. Nyquist is also flexible and easy to use because it is based
on an interactive Lisp interpreter.


%prep
%setup -q -n nyquist
%patch0 -p1
# 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
sed -i "s|^ALSA_OBJECTS =|ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o|" sys/unix/linux/Makefile
# change end-of-line
find -name "*.htm*" \
    -or -name "*.lsp" \
    -or -name "*.txt" \
    -or -name "*.ny" \
    -or -name "*.dat" | xargs dos2unix -q

%build
(cd misc; make %{?_smp_mflags})
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%{_libexecdir}

cp -pr runtime $RPM_BUILD_ROOT%{_datadir}/nyquist
cp -pr lib $RPM_BUILD_ROOT%{_datadir}/nyquist
cp -p ny $RPM_BUILD_ROOT%{_libexecdir}

cat > $RPM_BUILD_ROOT%{_bindir}/ny <<EOF
#!/bin/sh
export XLISPPATH=%{_datadir}/nyquist/runtime:%{_datadir}/nyquist/lib
exec %{_libexecdir}/ny \$*
EOF
chmod 0755 $RPM_BUILD_ROOT%{_bindir}/ny

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Readme.txt license.txt advantages.txt files.txt todo.txt
%doc demos doc
%{_bindir}/ny
%{_libexecdir}/ny
%{_datadir}/nyquist


%changelog
* Thu Nov  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.31-3
- added patch for portaudio bug

* Thu Feb  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.31-2
- new version 2.31

* Sat Mar 26 2005 Gerard Milmeister <gemi at bluewin.ch> - 2.30-1
- First Fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nyquist/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Nov 2006 16:10:18 -0000	1.1
+++ .cvsignore	3 Nov 2006 16:20:57 -0000	1.2
@@ -0,0 +1 @@
+nyqsrc231.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nyquist/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Nov 2006 16:10:18 -0000	1.1
+++ sources	3 Nov 2006 16:20:57 -0000	1.2
@@ -0,0 +1 @@
+49ff7053ce76b11f61685f22fd068928  nyqsrc231.zip