From 212589e0568f525d44c3206e4249e9ba39b5c847 Mon Sep 17 00:00:00 2001 From: "Steve M. Robbins" Date: Wed, 18 Jul 2012 03:57:02 +0200 Subject: Import nyquist_3.05-2.debian.tar.gz [dgit import tarball nyquist 3.05-2 nyquist_3.05-2.debian.tar.gz] --- Notes | 52 ++++++++ README.Debian | 7 ++ TODO | 1 + changelog | 244 ++++++++++++++++++++++++++++++++++++ check32.c | 18 +++ compat | 1 + control | 27 ++++ copyright | 131 +++++++++++++++++++ doc-base | 9 ++ docs | 5 + install | 7 ++ jlibs | 1 + jny | 9 ++ jny.1 | 13 ++ links | 1 + manpages | 2 + menu | 5 + ny | 9 ++ ny.1 | 149 ++++++++++++++++++++++ patches/fix-term-includes.patch | 14 +++ patches/makefile.patch | 38 ++++++ patches/remove-corba-reference.diff | 20 +++ patches/series | 6 + patches/use-system-liblo.patch | 48 +++++++ patches/use-system-portadio.patch | 39 ++++++ patches/use-system-sndfile.patch | 69 ++++++++++ rules | 31 +++++ source/format | 1 + source/lintian-overrides | 2 + watch | 3 + 30 files changed, 962 insertions(+) create mode 100644 Notes create mode 100644 README.Debian create mode 100644 TODO create mode 100644 changelog create mode 100644 check32.c create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 doc-base create mode 100644 docs create mode 100644 install create mode 100644 jlibs create mode 100755 jny create mode 100644 jny.1 create mode 100644 links create mode 100644 manpages create mode 100644 menu create mode 100644 ny create mode 100644 ny.1 create mode 100644 patches/fix-term-includes.patch create mode 100644 patches/makefile.patch create mode 100644 patches/remove-corba-reference.diff create mode 100644 patches/series create mode 100644 patches/use-system-liblo.patch create mode 100644 patches/use-system-portadio.patch create mode 100644 patches/use-system-sndfile.patch create mode 100755 rules create mode 100644 source/format create mode 100644 source/lintian-overrides create mode 100644 watch diff --git a/Notes b/Notes new file mode 100644 index 0000000..2ef2ddd --- /dev/null +++ b/Notes @@ -0,0 +1,52 @@ + Creating the upstream tarball + ----------------------------- + +Upstream distributes sources in a zip file, which needs to be +converted to a tarball. In addition, upstream fiddled with +configure.ac, but did not refresh "configure" itself. + + + +1. unzip nyqsrc304b.zip + +2. cd nyquist/liblo + edit configure.ac to remove the following line + # lo/lo_endian.h + +3. libtoolize + autoreconf + +4. cd ../.. + tar czf nyquist_3.04b.orig.tar.gz nyquist + + + + + Removing use of embedded sources + -------------------------------- + +libsndfile (in directory nylsf) +------------------------------- + +version: 1.0.17 +Debian devel package: libsndfile1-dev (currently version 1.0.23) +patch: use-system-sndfile.patch + + +liblo +----- + +version: 0.26 +Debian devel package: liblo-dev (currently version 0.26) +patch: use-system-liblo.patch + + +portaudio +--------- + +version: V19 +Debian devel package: portaudio19-dev (currently version 19+svn20071022) +patch: use-system-portaudio.patch + + + diff --git a/README.Debian b/README.Debian new file mode 100644 index 0000000..020bdba --- /dev/null +++ b/README.Debian @@ -0,0 +1,7 @@ +nyquist for Debian +----------------- + +/usr/bin/ny is a wrapper script that calls /usr/bin/ny.bin with the appropriate +XLISPPATH. + + -- Hans Fugal , Tue, 10 Feb 2004 21:17:29 -0700 diff --git a/TODO b/TODO new file mode 100644 index 0000000..5b22a4f --- /dev/null +++ b/TODO @@ -0,0 +1 @@ +* Remove use of embedded sources diff --git a/changelog b/changelog new file mode 100644 index 0000000..2533847 --- /dev/null +++ b/changelog @@ -0,0 +1,244 @@ +nyquist (3.05-2) unstable; urgency=low + + * patches/remove-corba-reference.diff: remove unnecessary import. + Closes: #622197. + + * lintian fixes: + - source/lintian-overrides: new. + - control: Add build-dep for autotools-dev. Update standards-version, + description. + + -- Steve M. Robbins Tue, 17 Jul 2012 20:57:02 -0500 + +nyquist (3.05-1) unstable; urgency=low + + * New upstream. Closes:#642828. + + * copyright: Add statement concerning relicencing of xlisp, to address + concerns in #631646. + + -- Steve M. Robbins Fri, 21 Oct 2011 21:54:51 -0500 + +nyquist (3.04b-5) unstable; urgency=low + + * control: Add armhf, avr32, m68k, powerpcspe, and sh4 to list of + architectures. Closes: #614735. + + -- Steve M. Robbins Sun, 13 Mar 2011 10:14:15 -0500 + +nyquist (3.04b-4) unstable; urgency=low + + * Target upload to unstable. + + -- Steven M. Robbins Mon, 21 Feb 2011 11:35:27 -0600 + +nyquist (3.04b-3) experimental; urgency=low + + * control: Change architecture from "any" to list of 32-bit platforms. + + * patches/fix-term-includes.patch: New. Remove include of + , which doesn't exist on all architectures. + + * patches/use-system-sndfile.patch: New. Use system libsndfile. + * control: Build-depend on libsndfile1-dev. + + * patches/use-system-liblo.patch: New. Use system liblo. + * control: Build-depend on liblo-dev. + + * patches/use-system-portaudio.patch: New. Use system portaudio. + * control: Build-depend on portaudio19-dev. + + -- Steven M. Robbins Sun, 30 Jan 2011 13:55:53 -0600 + +nyquist (3.04b-2) experimental; urgency=low + + * patches/makefile.patch: remove "-m32" flag; it's not understood on + non-x86 architectures. + + * check32.c: New. + * rules: Fail build if pointer is not 32 bits. + + * control: No longer need gcc-multilib, g++-multilib. + + -- Steve M. Robbins Sat, 22 Jan 2011 22:42:41 -0600 + +nyquist (3.04b-1) experimental; urgency=low + + * New upstream. Source tarball constructed from zip file as + detailed in debian/Notes. + - Remove patches applied upstream: + - patches/correct_typo.patch + - patches/endianness.patch + - patches/fileread.patch + - patches/kfreebsd.patch + - patches/jnyqide.patch: Remove. Equivalent functionality implemented. + + * patches/makefile.patch: Rework. We now build included liblo and + portaudio libraries because nyquist is built in 32-bit mode and thus + needs to be linked against 32-bit versions of these supporting + libraries. + * control: Remove build-deps liblo-dev, portaudio19-dev. Add build + deps (for 64-bit arches) on gcc-multilib and g++-multilib for + required 32-bit libraries. + + * control: + * rules: + * patches/makefile.patch: Refresh config.sub, config.guess. Set + build-deps and invoke configure according to autotools-dev. + + -- Steve M. Robbins Sun, 16 Jan 2011 17:37:45 -0600 + +nyquist (3.03-2) experimental; urgency=low + + * patches/kfreebsd.patch: New. Fixes for kFreeBSD. Adapted from Cyril + Brulebois's kfreebsd patch. Closes: #415103. + + * patches/endianness.patch: New. Fixes detection and error reporting of + endianness. Adapted from Cyril Brulebois's kfreebsd patch. + + * jny: + * links: + * install: Install jNyqIDE.jar, NyquistWords.txt into + /usr/share/nyquist/jnyqide. Symlink the doc files. + + * patches/jnyqide.patch: Exec("ny") to use PATH search mechanism rather + than hardcoding exec("./ny"). + + * jny.1: New. Basic manpage for jny. + + -- Steve M. Robbins Sun, 19 Dec 2010 22:34:37 -0600 + +nyquist (3.03-1) experimental; urgency=low + + * New upstream. Closes: #442807. + - patches/xlisp.patch: + - patches/netinet-conflicting-sendmsg.patch: + - patches/errno.patch: Remove. Applied upstream. + + * Package maintenance (Nick Andrik ) + - Added debian/watch file + - Support for jNyqIDE + + debian/control: Added java dependencies + + debian/rules: Added javahelper usage + + debian/jny: Script wrapper installed into /usr/bin + + debian/jlibs: Added file specifying jnyqide/jNyqIDE.jar + - Saner directory hierarchy + + debian/ny_wrapper: Renamed to debian/ny, installed into usr/bin + + ny: The default executable is installed into /usr/lib/nyquist/ny + + There is only one manpage, referring to ny + - debian/doc-base + + Added file to point in the doc/home.html manual page + - Use external packages for the supporting libraries and ignore the + included versions + + Added liblo-dev, libsndfile1-dev, portaudio19-dev build dependencies + in debian/control + + Removed support for building them from the Makefile + - debian/patches + + fileread.patch: Include in nyqstk/src/FileRead.cpp + + makefile.patch: Avoid building supporting libraries in the Makefile + + correct_typo.patch: A small typo fix in nylsf/sndfile.c + + -- Steve M. Robbins Sat, 18 Dec 2010 21:57:47 -0600 + +nyquist (2.29-8) experimental; urgency=low + + * rules: Re-write using "dh". + + * compat: Set to level 8. + + * menu:: Correct syntax errors. + + * patches/netinet-conflicting-sendmsg.patch: New. Replaces modified + sndwrite.c in svn. + * patches/errno.patch: New. Replaces modified osstuff.c in svn. + * patches/xlisp.patch: New. Replaces modified xlisp.h in svn. + + * control: Move homepage to header. Set Standards-Version to 3.9.1. + Remove libreadline5-dev build-dep. Closes: #553818. + + * ny_wrapper: Pass command line options. Closes: #377838. + + -- Steve M. Robbins Sat, 18 Dec 2010 07:19:42 -0600 + +nyquist (2.29-7) experimental; urgency=low + + * New maintainer. Closes: #483581, 595528. + + -- Steve M. Robbins Sat, 18 Dec 2010 05:47:20 -0600 + +nyquist (2.29-6) unstable; urgency=low + + * Rebuild with libreadline5 (closes: #326312) + + -- Guenter Geiger (Debian/GNU) Wed, 28 Sep 2005 19:10:46 +0200 + +nyquist (2.29-5) unstable; urgency=low + + * amd64/gcc-3.4 patch from Andreas Jochens (closes: #280269) + + -- Hans Fugal Tue, 30 Nov 2004 09:33:31 -0700 + +nyquist (2.29-4) unstable; urgency=low + + * Upgraded to policy 3.6.1 (no changes) + * MIPS getenv patch applied (closes: #241540) + + -- Hans Fugal Thu, 01 Apr 2004 19:27:54 -0700 + +nyquist (2.29-3) unstable; urgency=low + + * Added changelog entry for last upload. + + -- Hans Fugal Mon, 08 Mar 2004 22:24:12 -0700 + +nyquist (2.29-2) unstable; urgency=low + + * Fixed i386ism in xlisp.h + + -- guenter geiger Thu, 04 Mar 2004 08:34:08 -0700 + +nyquist (2.29-1) unstable; urgency=low + + * Repackaged + * Created wrapper script to handle XLISPPATH + * More detailed description + * Included more docs + * runtime/ in /usr/share/nyquist instead of /usr/lib/nyquist + * Included lib/ in /usr/share/nyquist, too + * More perfect clean target + * Linked ny.1 to ny.bin.1 + + -- Hans Fugal Tue, 10 Feb 2004 20:08:40 -0700 + +nyquist (2.29-0test3) unstable; urgency=low + + * Small update to the man page (patch by ) + + -- Andrea Glorioso Fri, 21 Nov 2003 10:47:51 +0100 + +nyquist (2.29-0test2) unstable; urgency=low + + * Added Dave Phillip's man page (debian/nyquist.1). + * Linked ny.1 to nyquist.1 (lintian wants each binary to have a man page) + + -- Andrea Glorioso Thu, 20 Nov 2003 09:01:14 +0100 + +nyquist (2.29-0test1) unstable; urgency=low + + * New upstream version - first pre-release of the debian package. + + -- Andrea Glorioso Wed, 19 Nov 2003 18:08:17 +0100 + +nyquist (2.15-1.agnula-1) unstable; urgency=low + + * Repackaged for AGNULA + + -- Free Ekanayaka Wed, 30 Jul 2003 10:53:59 +0200 + +nyquist (2.15-1) unstable; urgency=low + + * Initial Release. + + -- Guenter Geiger (Debian/GNU) Thu, 16 Aug 2001 16:07:53 +0200 + + diff --git a/check32.c b/check32.c new file mode 100644 index 0000000..11a7640 --- /dev/null +++ b/check32.c @@ -0,0 +1,18 @@ +/* Program that exits with status 0 iff pointer is 32 bits. */ + +#include + +int main(int ac, char* av[]) +{ + int pointerSize = sizeof(void*); + + if (pointerSize == 4) + { + return 0; + } + else + { + printf("Cannot build: not 32 bits (pointer size is %d bits).\n", 8*pointerSize); + return 1; + } +} diff --git a/compat b/compat new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +8 diff --git a/control b/control new file mode 100644 index 0000000..242b18b --- /dev/null +++ b/control @@ -0,0 +1,27 @@ +Source: nyquist +Homepage: http://www.cs.cmu.edu/~music/nyquist/ +Section: sound +Priority: optional +Maintainer: Steve M. Robbins +Build-Depends: debhelper (>= 8), javahelper, autoconf, automake1.11, libtool (>= 2.2.6), + autotools-dev, default-jdk, libsndfile1-dev, liblo-dev, portaudio19-dev +Build-Conflicts: autoconf2.13, automake1.4 +Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/nyquist/trunk/?op=log +Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/nyquist/trunk +Standards-Version: 3.9.3 + +Package: nyquist +Architecture: arm armel armhf any-i386 avr32 m68k mips mipsel powerpc powerpcspe sh4 sparc +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: language for music composition and sound synthesis + 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 + (XLISP). + . + With Nyquist, you can design instruments by combining functions (much as you + would using the orchestra languages of Music V, cmusic, or Csound). You can + call upon these instruments and generate a sound just by typing a simple + expression. You can combine simple expressions into complex ones to create a + whole composition. diff --git a/copyright b/copyright new file mode 100644 index 0000000..9a070f4 --- /dev/null +++ b/copyright @@ -0,0 +1,131 @@ +This package was debianized by Hans Fugal on +Tue, 10 Feb 2004 + +It was downloaded from http://www.cs.cmu.edu/~music + +Upstream Author: Roger Dannenberg + + +LICENSE INFORMATION + +Nyquist is built upon and derived from XLISP. Both are copyrighted software. +Two copyright notices and licenses appear below. + +There are also versions of the portaudio, libsound and liblo libraries +distributed in this source packages but they are not actually built, +since they are used from other packages. These libraries are +distributed under the GPL-2. On Debian systems, the complete text of +the GNU General +Public License 2 can be found in +`/usr/share/common-licenses/GPL-2'. + + +-------------------------------------------------------------------------------- +COPYRIGHT AND LICENSE INFORMATION FOR NYQUIST + +Copyright (c) 2000-2002, by Roger B. Dannenberg +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. + +Redistributions of source code must retain the copyright notice, the +list of conditions, and the disclaimer, all three of which appear below under +"COPYRIGHT AND LICENSE INFORMATION FOR XLISP." + +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +Redistributions in binary form must reproduce the copyright notice, the +list of conditions, and the disclaimer, all three of which appear below under +"COPYRIGHT AND LICENSE INFORMATION FOR XLISP," in the documentation and/or +other materials provided with the distribution. + +Neither the name of Roger B. Dannenberg, Carnegie Mellon University, nor the +names of any contributors may be used to endorse or promote products derived +from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +What follows is not a part of the license: + +Please send bug fixes and improvements to me at the address below. + +Please do not distribute modified versions of Nyquist without permission. + +Any redistribution of Nyquist should include a notice that Nyquist can be +obtained free from http://www.cs.cmu.edu/~music. + +In addition, as a courtesy, I ask that you send me a copy of any product that +makes substantial use of Nyquist. Please contact me at the address below for my +current mailing address. I am asking this because I enjoy learning about +applications of my software. + +When Nyquist is used to generate music and conduct research, please mention +and acknowledge the use of Nyquist in program notes, acknowledgement sections +of papers, and whereever thanks or credits would normally be given. + +Roger B. Dannenberg + +roger.dannenberg@cs.cmu.edu + +-------------------------------------------------------------------------------- +COPYRIGHT AND LICENSE INFORMATION FOR XLISP + +Note that the xlisp license was changed at the request of Roger +B. Dannenberg specifically for nyquist and thus what follows overrides +the license in the xlisp files. + + +Copyright (c) 1984-2002, by David Michael Betz +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. + +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +Neither the name of David Michael Betz nor the names of any contributors may be +used to endorse or promote products derived from this software without specific +prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +What follows is not a part of the license: + +Please send bug fixes and improvements to me at the address below. + +In addition, as a courtesy, I ask that you send me a copy of any product that +makes substantial use of XLISP. Please contact me at the address below for my +current mailing address. I am asking this because I enjoy learning about +applications of my software. + +David Betz + +dbetz@xlisper.mv.com diff --git a/doc-base b/doc-base new file mode 100644 index 0000000..2e242e5 --- /dev/null +++ b/doc-base @@ -0,0 +1,9 @@ +Document: nyquist +Title: Nyquist Reference Manual +Author: Roger B. Dannenberg +Abstract: This manual is a guide for users of Nyquist, a language for composition and sound synthesis. +Section: Sound + +Format: HTML +Index: /usr/share/doc/nyquist/doc/home.html +Files: /usr/share/doc/nyquist/doc/* diff --git a/docs b/docs new file mode 100644 index 0000000..2ecd879 --- /dev/null +++ b/docs @@ -0,0 +1,5 @@ +advantages.txt +Readme.txt +todo.txt +doc/ +demos/ diff --git a/install b/install new file mode 100644 index 0000000..4441a65 --- /dev/null +++ b/install @@ -0,0 +1,7 @@ +ny usr/lib/nyquist +debian/ny usr/bin +debian/jny usr/bin +lib/ usr/share/nyquist +runtime/ usr/share/nyquist +jnyqide/jNyqIDE.jar usr/share/nyquist/jnyqide +jnyqide/NyquistWords.txt usr/share/nyquist/jnyqide diff --git a/jlibs b/jlibs new file mode 100644 index 0000000..2761a84 --- /dev/null +++ b/jlibs @@ -0,0 +1 @@ +jnyqide/jNyqIDE.jar diff --git a/jny b/jny new file mode 100755 index 0000000..1a84706 --- /dev/null +++ b/jny @@ -0,0 +1,9 @@ +#!/bin/sh + +XLISPPATH=/usr/share/nyquist/runtime:/usr/share/nyquist/lib +export XLISPPATH + +cd /usr/share/nyquist + +java -jar jnyqide/jNyqIDE.jar ${1+"$@"} + diff --git a/jny.1 b/jny.1 new file mode 100644 index 0000000..2262d29 --- /dev/null +++ b/jny.1 @@ -0,0 +1,13 @@ +.TH jny 1 "November 2003" +.SH NAME +jny - an IDE for Nyquist +.SH SYNOPSIS +.BI "jny" +.SH DESCRIPTION +.B jny +is an Integrated Development Environment (IDE) for +.B Nyquist, +a language designed for digital sound synthesis and computer-assisted music composition. +.SH "SEE ALSO" +.B ny +is the command-line interface to Nyquist. diff --git a/links b/links new file mode 100644 index 0000000..fb812e3 --- /dev/null +++ b/links @@ -0,0 +1 @@ +usr/share/doc/nyquist/doc usr/share/nyquist/doc diff --git a/manpages b/manpages new file mode 100644 index 0000000..83bbdb6 --- /dev/null +++ b/manpages @@ -0,0 +1,2 @@ +debian/ny.1 +debian/jny.1 diff --git a/menu b/menu new file mode 100644 index 0000000..0c8fe83 --- /dev/null +++ b/menu @@ -0,0 +1,5 @@ +?package(nyquist): \ + title="nyquist" \ + needs="text" \ + section="Applications/Sound" \ + command="/usr/bin/ny" diff --git a/ny b/ny new file mode 100644 index 0000000..fd494e5 --- /dev/null +++ b/ny @@ -0,0 +1,9 @@ +#! /bin/sh +# nyquist wrapper script. We just need to set XLISPPATH. +# +# Hans Fugal + +XLISPPATH=/usr/share/nyquist/runtime:/usr/share/nyquist/lib +export XLISPPATH + +/usr/lib/nyquist/ny ${1+"$@"} diff --git a/ny.1 b/ny.1 new file mode 100644 index 0000000..86e3d16 --- /dev/null +++ b/ny.1 @@ -0,0 +1,149 @@ +.\" Copyright (c) 2003 Dave Phillips +.\" +.\" This is free documentation; you can redistribute it and/or +.\" modify it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2 of +.\" the License, or (at your option) any later version. +.\" +.\" The GNU General Public License's references to "object code" +.\" and "executables" are to be interpreted as the output of any +.\" document formatting or typesetting system, including +.\" intermediate and printed output. +.\" +.\" This manual is distributed in the hope that it will be useful, +.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public +.\" License along with this manual; if not, write to the Free +.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, +.\" USA. +.\" +.TH Nyquist 1 "November 2003" +.SH NAME +Nyquist - A computer programming language for software sound synthesis and music composition +.SH SYNOPSIS +.BI "ny [" OPTIONS "]" +.SH DESCRIPTION +.B Nyquist +is a language designed for digital sound synthesis and computer-assisted music composition. +It is based upon the +.B XLISP +implementation of the +.B LISP +programming language. +.B Nyquist +is similar to other software synthesis languages such as +.B Csound +and +.B cmusic. +Like programs written in those languages +.B Nyquist +programs invoke and arrange various audio synthesis functions which are employed +by musically useful algorithms and control structures, but instrument design and +scoring syntax are completely integrated in +.B Nyquist. + +.TP +.B Example: +.I ;; Make and play a sound + +(play (osc 60)) + +This one-line program will call a +.B Nyquist +oscillator function to create a default sine wave with a default amplitude of 1.0 (normalized) and a pitch value of 60 (MIDI note number for middle C). +The output from the oscillator is then sent to the system sound hardware for realtime play starting at the default delta-time of 0 +and lasting for a default duration of 1 second. + +.TP +.B Example: +.I ;; Create an instrument, play a scale with it + +(defun note (pitch dur) + (osc pitch dur *table*)) + +(play (seq (note c4 i) + (note d4 i) + (note e4 i) + (note f4 i) + (note g4 i) + (note a4 i) + (note b4 i) + (note c5 q))) + +This program first defines a +.I note +function that receives two parameters, +.I pitch +and +.I dur +(duration), and sends them to an oscillator. +The oscillator applies the given pitch and duration to the waveform defined in the +.I *table* +global variable. The default waveform is a sine with an amplitude of 1. + +The +.I seq +function then sends a sequence of +.I note +statements to the +.I play +function for realtime audio output. +In this example the pitch is indicated in a note-name/octave pair. +Duration is expressed in symbols for conventional musical rhythmic units, i.e., +.I i +stands for an eighth note (quaver) and +.I q +stands for a quarter note (crotchet). + +.B Nyquist +programs may be entered line by line at the program prompt +or they can be saved and loaded as files. + +.SH OPTIONS +.TP 10 +.BI "-l " "filename.lsp" +Load a +.B Nyquist +program file, typically (but not necessarily) with an extension of +.I .lsp. + +.SH FILES +Examples and tutorial files are located in the +.I $NYQUIST_HOME/demos +directory. + +HTML documentation is located in the +.I $NYQUIST_HOME/doc +directory. + +.SH BUGS +Possibly, maybe, perhaps. If you find any please report them to the authors. + +.SH TODO +See the todo.txt file in the +.B Nyquist +top-level directory for the current TODO list. + +.SH AUTHOR +.B Nyquist +is written by Roger B. Dannenberg . +.B XLISP +is written by David Betz . + +.SH COPYRIGHT +Copyright and license information for +.B Nyquist: + +Copyright 2000-2002, by Roger B. Dannenberg. All rights reserved. + +Copyright and license information for +.B XLISP: + +Copyright 1984-2002, by David Michael Betz. All rights reserved. + +See the license.txt file in the +.B Nyquist +top-level directory for complete licensing details. diff --git a/patches/fix-term-includes.patch b/patches/fix-term-includes.patch new file mode 100644 index 0000000..29f72d2 --- /dev/null +++ b/patches/fix-term-includes.patch @@ -0,0 +1,14 @@ +Index: nyquist-3.04b/sys/unix/term.c +=================================================================== +--- nyquist-3.04b.orig/sys/unix/term.c 2011-01-30 13:51:22.000000000 -0600 ++++ nyquist-3.04b/sys/unix/term.c 2011-01-30 13:52:05.000000000 -0600 +@@ -10,9 +10,6 @@ + + + #include +-#ifndef __APPLE__ +-#include +-#endif + #include + #include + #include diff --git a/patches/makefile.patch b/patches/makefile.patch new file mode 100644 index 0000000..fd9350c --- /dev/null +++ b/patches/makefile.patch @@ -0,0 +1,38 @@ +--- nyquist-3.04b.orig/sys/unix/nonalsa/Makefile ++++ nyquist-3.04b/sys/unix/nonalsa/Makefile +@@ -11,7 +11,7 @@ + # This is the resulting executable (normally "ny"): + NY = ny + +-OPT = -O2 -m32 ++OPT = -O2 + # OPT = -g -m32 + + EVERYTHING = $(NY) runtime/system.lsp jnyqide/jNyqIDE.jar \ +@@ -72,7 +72,7 @@ + -DHAVE_LIBPTHREAD=1 -D_FILE_OFFSET_BITS=64 \ + -DSTK_NYQUIST -DUSE_VSPRINTF \ + -DHAVE_CONFIG_H +-LN = g++ -m32 ++LN = g++ + AR = ar + # to enable command line editing, insert -lreadline -lcurses + LFLAGS = $(LIBPA_PATH)/libportaudio.a $(LIBLO_PATH)/liblo.a $(AUDIOLIBS) -lm -lpthread -lrt +@@ -283,7 +283,7 @@ + mkdir bin + + liblo/Makefile: +- cd liblo; ./configure CFLAGS=-m32 LDFLAGS=-m32 CXXFLAGS=-m32 --enable-static --disable-shared ++ cd liblo; ./configure $(DEB_CONFFLAGS) --enable-static --disable-shared + # sometimes, residual files cause problems + cd liblo; make clean + +@@ -302,7 +302,7 @@ + + portaudio/Makefile: + # note: without-jack avoids 32/64-bit link error on Debian +- cd portaudio; ./configure CFLAGS=-m32 LDFLAGS=-m32 CXXFLAGS=-m32 --enable-static --disable-shared --without-jack ++ cd portaudio; ./configure $(DEB_CONFFLAGS) --enable-static --disable-shared --without-jack + # sometimes, residual files cause problems + cd portaudio; make clean + diff --git a/patches/remove-corba-reference.diff b/patches/remove-corba-reference.diff new file mode 100644 index 0000000..150bff6 --- /dev/null +++ b/patches/remove-corba-reference.diff @@ -0,0 +1,20 @@ +Description: Remove unused import + Fixes the build on kfreebsd and hurd. +Author: Cyril Roelandt +Bug: 622197 +Forwarded: no + + + + +--- nyquist-3.05.orig/jnyqide/PreferencesDialog.java ++++ nyquist-3.05/jnyqide/PreferencesDialog.java +@@ -17,8 +17,6 @@ + import javax.swing.event.*; + import java.io.File; + +-import com.sun.corba.se.spi.servicecontext.SendingContextServiceContext; +- + import jnyqide.*; + + class PreferencesDialog extends JInternalFrame implements ActionListener { diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..924a4ee --- /dev/null +++ b/patches/series @@ -0,0 +1,6 @@ +remove-corba-reference.diff +makefile.patch +use-system-sndfile.patch +use-system-liblo.patch +use-system-portadio.patch +fix-term-includes.patch diff --git a/patches/use-system-liblo.patch b/patches/use-system-liblo.patch new file mode 100644 index 0000000..e2ffffa --- /dev/null +++ b/patches/use-system-liblo.patch @@ -0,0 +1,48 @@ +Index: nyquist-3.04b/sys/unix/nonalsa/Makefile +=================================================================== +--- nyquist-3.04b.orig/sys/unix/nonalsa/Makefile 2011-01-30 12:23:06.000000000 -0600 ++++ nyquist-3.04b/sys/unix/nonalsa/Makefile 2011-01-30 12:35:45.000000000 -0600 +@@ -14,8 +14,7 @@ + OPT = -O2 + # OPT = -g -m32 + +-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) + +@@ -52,12 +51,12 @@ + # Keeping portaudio and libsndfile sources local to nyquist + INCL = -Inyqsrc -Itran -Ixlisp -Isys/unix -Icmt -Iffts/src \ + -Inyqstk/include -Inyqstk -Iportaudio/include -Iportaudio/src/common \ +- -Iportaudio/src/os/unix \ +- -Iliblo ++ -Iportaudio/src/os/unix ++ + + # system dependent stuff for nonalsa: + +-AUDIOLIBS = -lsndfile ++AUDIOLIBS = -lsndfile -llo + + CC = gcc + +@@ -75,7 +74,7 @@ + LN = g++ + AR = ar + # to enable command line editing, insert -lreadline -lcurses +-LFLAGS = $(LIBPA_PATH)/libportaudio.a $(LIBLO_PATH)/liblo.a $(AUDIOLIBS) -lm -lpthread -lrt ++LFLAGS = $(LIBPA_PATH)/libportaudio.a $(AUDIOLIBS) -lm -lpthread -lrt + + TAGS: + find . ( -name +@@ -276,7 +275,7 @@ + $(LIBPA_PATH)/libportaudio.a: portaudio/Makefile + cd portaudio; make + +-$(NY): $(OBJECTS) $(LIBPA_PATH)/libportaudio.a $(LIBLO_PATH)/liblo.a ++$(NY): $(OBJECTS) $(LIBPA_PATH)/libportaudio.a + $(LN) $(OBJECTS) $(LFLAGS) -o $(NY) + + # copy appropriate system.lsp and make it read-only; diff --git a/patches/use-system-portadio.patch b/patches/use-system-portadio.patch new file mode 100644 index 0000000..73f8cfc --- /dev/null +++ b/patches/use-system-portadio.patch @@ -0,0 +1,39 @@ +Index: nyquist-3.04b/sys/unix/nonalsa/Makefile +=================================================================== +--- nyquist-3.04b.orig/sys/unix/nonalsa/Makefile 2011-01-30 13:39:10.000000000 -0600 ++++ nyquist-3.04b/sys/unix/nonalsa/Makefile 2011-01-30 13:44:16.000000000 -0600 +@@ -50,13 +50,13 @@ + # 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/include -Iportaudio/src/common \ +- -Iportaudio/src/os/unix ++ -Inyqstk/include -Inyqstk ++ + + + # system dependent stuff for nonalsa: + +-AUDIOLIBS = -lsndfile -llo ++AUDIOLIBS = -lsndfile -llo -lportaudio + + CC = gcc + +@@ -74,7 +74,7 @@ + LN = g++ + AR = ar + # to enable command line editing, insert -lreadline -lcurses +-LFLAGS = $(LIBPA_PATH)/libportaudio.a $(AUDIOLIBS) -lm -lpthread -lrt ++LFLAGS = $(AUDIOLIBS) -lm -lpthread -lrt + + TAGS: + find . ( -name +@@ -275,7 +275,7 @@ + $(LIBPA_PATH)/libportaudio.a: portaudio/Makefile + cd portaudio; make + +-$(NY): $(OBJECTS) $(LIBPA_PATH)/libportaudio.a ++$(NY): $(OBJECTS) + $(LN) $(OBJECTS) $(LFLAGS) -o $(NY) + + # copy appropriate system.lsp and make it read-only; diff --git a/patches/use-system-sndfile.patch b/patches/use-system-sndfile.patch new file mode 100644 index 0000000..a04e1a2 --- /dev/null +++ b/patches/use-system-sndfile.patch @@ -0,0 +1,69 @@ +Index: nyquist-3.04b/sys/unix/nonalsa/Makefile +=================================================================== +--- nyquist-3.04b.orig/sys/unix/nonalsa/Makefile 2011-01-30 11:47:31.000000000 -0600 ++++ nyquist-3.04b/sys/unix/nonalsa/Makefile 2011-01-30 11:49:57.000000000 -0600 +@@ -53,11 +53,11 @@ + INCL = -Inyqsrc -Itran -Ixlisp -Isys/unix -Icmt -Iffts/src \ + -Inyqstk/include -Inyqstk -Iportaudio/include -Iportaudio/src/common \ + -Iportaudio/src/os/unix \ +- -Iliblo -Inylsf ++ -Iliblo + + # system dependent stuff for nonalsa: + +-AUDIOLIBS = ++AUDIOLIBS = -lsndfile + + CC = gcc + +@@ -143,40 +143,7 @@ + cmt/seqmread.o cmt/seqmwrite.o \ + cmt/seqread.o cmt/seqwrite.o \ + cmt/tempomap.o cmt/timebase.o \ +- cmt/userio.o nylsf/aiff.o \ +- nylsf/alaw.o nylsf/au.o \ +- nylsf/avr.o nylsf/broadcast.o \ +- nylsf/caf.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/ircam.o nylsf/macbinary3.o \ +- nylsf/macos.o nylsf/mat4.o \ +- nylsf/mat5.o nylsf/ms_adpcm.o \ +- nylsf/nist.o nylsf/ogg.o \ +- nylsf/paf.o nylsf/pcm.o \ +- nylsf/pvf.o nylsf/raw.o \ +- nylsf/rx2.o nylsf/sd2.o \ +- nylsf/sds.o nylsf/sndfile.o \ +- nylsf/strings.o nylsf/svx.o \ +- nylsf/txw.o nylsf/ulaw.o \ +- nylsf/voc.o nylsf/vox_adpcm.o \ +- nylsf/w64.o nylsf/wav.o \ +- nylsf/wav_w64.o nylsf/wve.o \ +- nylsf/xi.o nylsf/g72x.o \ +- nylsf/GSM610/add.o nylsf/GSM610/code.o \ +- nylsf/GSM610/decode.o nylsf/GSM610/gsm_create.o \ +- nylsf/GSM610/gsm_decode.o nylsf/GSM610/gsm_destroy.o \ +- nylsf/GSM610/gsm_encode.o nylsf/GSM610/gsm_option.o \ +- nylsf/GSM610/long_term.o nylsf/GSM610/lpc.o \ +- nylsf/GSM610/preprocess.o nylsf/GSM610/rpe.o \ +- nylsf/GSM610/short_term.o nylsf/GSM610/table.o \ +- nylsf/G72x/g721.o nylsf/G72x/g723_16.o \ +- nylsf/G72x/g723_24.o nylsf/G72x/g723_40.o \ +- nylsf/G72x/g72x.o nyqsrc/debug.o \ ++ cmt/userio.o nyqsrc/debug.o \ + nyqsrc/falloc.o nyqsrc/local.o \ + nyqsrc/handlers.o nyqsrc/multiread.o \ + nyqsrc/seqext.o nyqsrc/seqinterf.o \ +@@ -219,7 +186,7 @@ + sys/unix/osstuff.o sys/unix/term.o + + # Sound functions to add to xlisp +-NYQHDRS = nyqsrc/sndfmt.h nylsf/sndfile.h \ ++NYQHDRS = nyqsrc/sndfmt.h /usr/include/sndfile.h \ + nyqsrc/sound.h nyqsrc/add.h \ + nyqsrc/avg.h nyqsrc/compose.h \ + nyqsrc/convolve.h nyqsrc/downsample.h \ diff --git a/rules b/rules new file mode 100755 index 0000000..a1e6c75 --- /dev/null +++ b/rules @@ -0,0 +1,31 @@ +#!/usr/bin/make -f + +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + export DEB_CONFFLAGS = --build $(DEB_HOST_GNU_TYPE) +else + export DEB_CONFFLAGS = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +%: + dh $@ --with autotools_dev + +override_dh_auto_configure: + cc debian/check32.c && ./a.out + ln -s sys/unix/nonalsa/Makefile + +override_dh_clean: + dh_clean + [ -e Makefile ] && $(MAKE) cleaner || true + rm -f nyqsrc/sndfnintptrs.h nyqsrc/sndfnint.c nyqsrc/sndfnintdefs.h + rm -f nyqsrc/seqfnintptrs.h nyqsrc/seqfnint.c nyqsrc/seqfnintdefs.h + rm -f jnyqide/*.class jnyqide/*.jar + rm -f runtime/system.lsp + rm -f */config.status */config.log */config.cache + rm -f Makefile + +override_dh_install: + dh_install + chmod -x debian/nyquist/usr/share/nyquist/lib/*.lsp diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/source/lintian-overrides b/source/lintian-overrides new file mode 100644 index 0000000..d1ea719 --- /dev/null +++ b/source/lintian-overrides @@ -0,0 +1,2 @@ +# The clean rule will remove all config.cache files +nyquist source: configure-generated-file-in-source diff --git a/watch b/watch new file mode 100644 index 0000000..50314db --- /dev/null +++ b/watch @@ -0,0 +1,3 @@ +version=3 +opts="uversionmangle=s/..$/.$0/" \ +http://qa.debian.org/watch/sf.php/nyquist/ nyqsrc(.+).zip -- cgit v1.2.3