--- bristol-0.60.0.orig/debian/bristol-data.install +++ bristol-0.60.0/debian/bristol-data.install @@ -0,0 +1 @@ +usr/share/bristol --- bristol-0.60.0.orig/debian/rules +++ bristol-0.60.0/debian/rules @@ -0,0 +1,28 @@ +#!/usr/bin/make -f + +EXTRA_CONFIGURE_ARGS = --enable-jack-default-audio --enable-jack-default-midi + +ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) +EXTRA_CONFIGURE_ARGS += --disable-alsa +endif + +ifeq ($(DEB_HOST_ARCH_OS),hurd) +EXTRA_CONFIGURE_ARGS += --disable-alsa +endif + +%: + dh --with quilt $@ + +override_dh_auto_configure: + ln -f -s /usr/share/misc/config.guess + ln -f -s /usr/share/misc/config.sub + dh_auto_configure -- --prefix=/usr --libdir=\$${prefix}/lib/bristol \ + $(EXTRA_CONFIGURE_ARGS) + +override_dh_auto_install: + dh_auto_install -- DESTDIR=$(CURDIR)/debian/tmp install + find $(CURDIR)/debian/tmp/usr/share/bristol/ -type d -empty -delete + find $(CURDIR)/debian/tmp/usr/share/ -type f | xargs chmod -x + +override_dh_makeshlibs: + dh_makeshlibs -n --- bristol-0.60.0.orig/debian/menu +++ bristol-0.60.0/debian/menu @@ -0,0 +1,4 @@ +?package(bristol):needs="X11" section="Applications/Sound" \ + title="bristol" \ + command="/usr/bin/startBristol" \ + icon="/usr/share/pixmaps/bristol.xpm" --- bristol-0.60.0.orig/debian/watch +++ bristol-0.60.0/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://sf.net/bristol/bristol-([\d.]+)\.tar\.gz --- bristol-0.60.0.orig/debian/README.Debian +++ bristol-0.60.0/debian/README.Debian @@ -0,0 +1,10 @@ +bristol for Debian +------------------ + +The bristol command allows you to adapt the synthesizer either to the +ALSA or the OSS sound systems. In order to run the synthesizer you +need a MIDI device though. If you do not have a MIDI card you might +also use the virtual MIDI card supplied by the ALSA sound drivers. +The module is called snd-virmidi. + + -- Guenter Geiger (Debian/GNU) , Fri, 6 Jun 2003 15:06:59 +0200 --- bristol-0.60.0.orig/debian/bristol.install +++ bristol-0.60.0/debian/bristol.install @@ -0,0 +1,3 @@ +debian/bristol.xpm usr/share/pixmaps +usr/lib/bristol +usr/bin --- bristol-0.60.0.orig/debian/compat +++ bristol-0.60.0/debian/compat @@ -0,0 +1 @@ +7 --- bristol-0.60.0.orig/debian/control +++ bristol-0.60.0/debian/control @@ -0,0 +1,51 @@ +Source: bristol +Section: sound +Priority: optional +Maintainer: Debian Multimedia Maintainers +Uploaders: Alessio Treglia , + Free Ekanayaka +DM-Upload-Allowed: yes +Build-Depends: debhelper (>= 7.0.50~), + quilt (>= 0.46-7~), + autotools-dev, + libx11-dev, + x11proto-core-dev, + libasound2-dev, + libjack-dev +Standards-Version: 3.8.4 +Homepage: http://bristol.sourceforge.net/ +Vcs-Git: git://git.debian.org/pkg-multimedia/bristol.git +Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/bristol.git;a=summary + +Package: bristol +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + bristol-data (= ${source:Version}) +Description: vintage synthesizer emulator + Bristol is a synthesizer emulator application. Bristol uses the sound card + PCM generator and can be MIDI driven, furthermore it can be set to use the + low latency scheduling feature of the kernel, reducing audio under runs. + It can handle any number of simultaneous synthesizers (they all connect to + the same engine). It supports splitting and layering the keyboard with + multiple synthesizers on a single midi channel. Currently Bristol emulates + the following keyboards: Moog Mini, Moog Voyager (Bristol "Explorer"), + Sequential Circuits Prophet-5, Roland Juno-6, Yamaha DX-7, + Hammond (single manual), Hammond B3 (dual manual). + +Package: bristol-data +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: bristol (<< 0.40.6-1) +Description: vintage synthesizer emulator (data files) + Bristol is a synthesizer emulator application. Bristol uses the sound card + PCM generator and can be MIDI driven, furthermore it can be set to use the + low latency scheduling feature of the kernel, reducing audio under runs. + It can handle any number of simultaneous synthesizers (they all connect to + the same engine). It supports splitting and layering the keyboard with + multiple synthesizers on a single midi channel. Currently Bristol emulates + the following keyboards: Moog Mini, Moog Voyager (Bristol "Explorer"), + Sequential Circuits Prophet-5, Roland Juno-6, Yamaha DX-7, + Hammond (single manual), Hammond B3 (dual manual). + . + This package contains the application data files. --- bristol-0.60.0.orig/debian/copyright +++ bristol-0.60.0/debian/copyright @@ -0,0 +1,31 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59 +Name: Bristol +Maintainer: Nick Copeland +Source: http://sourceforge.net/projects/bristol/files/ + +Files: * +Copyright: 1996-2009, Nick Copeland +License: GPL-2 + +Files: debian/* +Copyright: 2009, Alessio Treglia + 2003-2006, Guenter Geiger +License: GPL-2 + +License: GPL-2 + This package is free software; 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. + . + This package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +X-Comment: On Debian systems, the complete text of the GNU General Public + License can be found in `/usr/share/common-licenses/GPL-2'. --- bristol-0.60.0.orig/debian/changelog +++ bristol-0.60.0/debian/changelog @@ -0,0 +1,215 @@ +bristol (0.60.0-4) unstable; urgency=low + + * Switch back to deb format 1.0, bug#578693 has been fixed. + * Refresh and improvements, another attempt to fix FTBFS on + hppa,sparc,s390. + * Drop debian/patches/02-implicit_pointer_conversion.patch patch, + applied upstream. + * Patch to fix FTBFS on hurd-i386. + + -- Alessio Treglia Fri, 23 Apr 2010 09:49:32 +0200 + +bristol (0.60.0-3) unstable; urgency=low + + * debian/patches/04-fix_alsa_presence_check.patch: + - Attempt to fix FTBFS on hppa, sparc and s390 architectures. + + -- Alessio Treglia Thu, 22 Apr 2010 17:11:56 +0200 + +bristol (0.60.0-2) unstable; urgency=low + + * Add patch to fix FTBFS on kfreebsd architectures (Closes: #578443). + * Temporary switch to debian 3.0 (quilt) format to workaround bug#578693. + + -- Alessio Treglia Thu, 22 Apr 2010 00:52:06 +0200 + +bristol (0.60.0-1) unstable; urgency=low + + * New upstream release uploaded to unstable. + * Add autotools support. + * Refresh debian/patches/01-spelling_errors.patch patch. + * debian/rules: Set JACK as default AUDIO and MIDI driver. + * debian/patches/02-implicit_pointer_conversion.patch: + - Forwarded to upstream. + + -- Alessio Treglia Tue, 20 Apr 2010 20:53:20 +0200 + +bristol (0.50.6-1) experimental; urgency=low + + * New upstream release. + * Refresh patches. + * Bump Standards. + * Remove ALSA support for non-linux archs, should fix FTBFS. + + -- Alessio Treglia Thu, 15 Apr 2010 17:04:08 +0200 + +bristol (0.50.2-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Alessio Treglia Mon, 01 Mar 2010 01:08:40 +0100 + +bristol (0.50.1-1) UNRELEASED; urgency=low + + * New upstream development release. + + -- Alessio Treglia Tue, 26 Jan 2010 09:27:32 +0100 + +bristol (0.40.8-2) unstable; urgency=low + + * Disable alsa on hurd,kfreebsd architectures. + * Adjust debhelper,quilt build-dependencies to ease backporters' life. + * Bump Standards. + + -- Alessio Treglia Mon, 19 Apr 2010 07:56:44 +0200 + +bristol (0.40.8-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Alessio Treglia Sun, 24 Jan 2010 19:58:06 +0100 + +bristol (0.40.7-2) unstable; urgency=low + + * debian/patches/02-implicit_pointer_conversion.patch: Function + 'bristolmalloc' implicitly converted to pointer, this was due to + a missing function prototype (Closes: #563435). + + -- Alessio Treglia Mon, 04 Jan 2010 00:48:16 +0100 + +bristol (0.40.7-1) unstable; urgency=low + + * New upstream release. + * Fix a little spelling error in the packages' description + (Closes: #528546); thanks to Junichi Uekawa for reporting this. + * Add Vcs-* tags. + * Set DM-Upload-Allowed to yes. + * Add Free Ekanayaka to Uploaders field. + + -- Alessio Treglia Sun, 27 Dec 2009 15:53:55 +0100 + +bristol (0.40.6-1) unstable; urgency=low + + * Adopting this (Closes: #546954). + * Create new bristol-data runtime package, it will contain application's + architecture-indipendent data files. + * Drop all patches, now useless. + * Switch to debhelper 7. + * debian/copyright: Update according to DEP-5 spec. + * debian/bristol.1: Fix little spelling mistake. + * Replace patch system, from dpatch to quilt. + * Add 01-spelling_errors.patch patch to fix spelling-error-in-binary. + * debian/rules: dh_makeshlibs doesn't touch shlibs/symbols file, libraries + under /usr/lib/bristol/ are private. + + -- Alessio Treglia Tue, 10 Nov 2009 12:21:04 +0100 + +bristol (0.40.1-0.1) unstable; urgency=low + + * Non-maintainer upload. + + With permission from maintainer. + * New upstream release. (Closes: #470336, #366833). + + Builds with newer alsa libs. (Closes: #506768). + + Builds on amd64. (Closes: #527716). + * Replace x-dev build-dep with x11proto-core-dev. (Closes: #515358). + * Install menu file. (Closes: #299414). + * Update watch file. + * Add Homepage. + + Remove old bad URL from package description. + * Add appropriate Copyright holder to debian/copyright. + * Bump debhelper build-dep and compat to 5. + * Bump Standards Version to 3.8.1. + + Menu policy transition. + + -- Barry deFreese Tue, 05 May 2009 21:42:17 -0400 + +bristol (0.9.1-13) unstable; urgency=low + + * Fixed X11 library dependencies (closes: #346627) + + -- Guenter Geiger (Debian/GNU) Mon, 9 Jan 2006 14:28:36 +0100 + +bristol (0.9.1-12) unstable; urgency=low + + * Fixed compile problems with gcc4 (closes: #285546), thanks go to Andreas + Jochens + * Updated policy version + + -- Guenter Geiger (Debian/GNU) Tue, 16 Aug 2005 10:10:08 +0200 + +bristol (0.9.1-11) unstable; urgency=medium + + * Fixed gcc-3.4 compilation + * removed dynamic libraries, bristolenine and bristol are linked + dynamically now (closes: #265621) (closes: #265052) + + -- Guenter Geiger (Debian/GNU) Mon, 16 Aug 2004 17:25:51 +0200 + +bristol (0.9.1-10) unstable; urgency=low + + * added set -e to build script + * copy built libraries to lib directory + + -- Guenter Geiger (Debian/GNU) Wed, 11 Aug 2004 21:03:23 +0200 + +bristol (0.9.1-9) unstable; urgency=low + + * Moved to patch system + * Added watch file + * Added homepage to description and fixed spelling mistakes + * Updated the README.Debian file + + -- Guenter Geiger (Debian/GNU) Mon, 26 Jul 2004 15:15:19 +0200 + +bristol (0.9.1-8) unstable; urgency=low + + * startBristol (bristol) tries to connect to the ALSA MIDI sequencer + by default + * Fixed wrong upstream URL (closes: 248077) + + -- Guenter Geiger (Debian/GNU) Mon, 26 Jul 2004 13:50:44 +0200 + +bristol (0.9.1-7) unstable; urgency=low + + * fixed setting saving in homedir + + -- Guenter Geiger (Debian/GNU) Sun, 29 Feb 2004 18:29:56 +0100 + +bristol (0.9.1-6) unstable; urgency=low + + * added check for SND_LIB_MAJOR == 1 for new ALSA version (closes: #235024) + + -- Guenter Geiger (Debian/GNU) Fri, 27 Feb 2004 11:16:07 +0100 + +bristol (0.9.1-5) unstable; urgency=low + + * enable start of bristol with bristol command (closes: #203174) + * added upstream info (closes: #199966) + + -- Guenter Geiger (Debian/GNU) Wed, 13 Aug 2003 11:46:12 +0200 + +bristol (0.9.1-4) unstable; urgency=low + + * fixed exit() without parameter in brightonMini.c + + -- Guenter Geiger (Debian/GNU) Wed, 09 Jul 2003 16:22:21 +0200 + +bristol (0.9.1-3) unstable; urgency=low + + * changed format of help text to make it compile with all compilers + + -- Guenter Geiger (Debian/GNU) Mon, 7 Jul 2003 19:31:01 +0200 + +bristol (0.9.1-2) unstable; urgency=low + + * added libmidibristol.so (closes: #199391) + * fixed path to bristolengine + + -- Guenter Geiger (Debian/GNU) Tue, 1 Jul 2003 01:07:33 +0200 + +bristol (0.9.1-1) unstable; urgency=low + + * Initial Release. + + -- Guenter Geiger (Debian/GNU) Fri, 6 Jun 2003 15:06:59 +0200 + --- bristol-0.60.0.orig/debian/bristol.manpages +++ bristol-0.60.0/debian/bristol.manpages @@ -0,0 +1 @@ +debian/bristol.1 --- bristol-0.60.0.orig/debian/bristol.links +++ bristol-0.60.0/debian/bristol.links @@ -0,0 +1,3 @@ +usr/share/man/man1/bristol.1 usr/share/man/man1/bristolengine.1 +usr/share/man/man1/bristol.1 usr/share/man/man1/startBristol.1 +usr/share/man/man1/bristol.1 usr/share/man/man1/brighton.1 --- bristol-0.60.0.orig/debian/docs +++ bristol-0.60.0/debian/docs @@ -0,0 +1,2 @@ +NEWS +README --- bristol-0.60.0.orig/debian/README.source +++ bristol-0.60.0/debian/README.source @@ -0,0 +1,57 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. --- bristol-0.60.0.orig/debian/bristol.xpm +++ bristol-0.60.0/debian/bristol.xpm @@ -0,0 +1,59 @@ +/* XPM */ +static char * bristol_xpm[] = { +"32 32 24 1", +" c None", +". c #4A4A48", +"+ c #3E3E3D", +"@ c #565655", +"# c #BFBFBF", +"$ c #262624", +"% c #424244", +"& c #62625C", +"* c #4A4E4C", +"= c #333334", +"- c #7E827C", +"; c #7F7F7F", +"> c #FFFFFF", +", c #AAAAA4", +"' c #BEBEBC", +") c #A2A6A4", +"! c #CACECC", +"~ c #929694", +"{ c #B2B2B4", +"] c #252524", +"^ c #323231", +"/ c #1F1F1E", +"( c #191918", +"_ c #5F5F5F", +".....+++++++..++.+++++..++++.+++", +"...@@@@@@.@@..................#.", +".......###............++..+++.##", +"++.++++#.#..++++++++++..++..+.#+", +"..+....#+#++..++.....$++..++.+#.", +"..+..++#.#++++#++%&**%%=%%+++.#+", +".......#.######%$**-&---&-;%..#.", +"..+.........++%$**&&&&*--;>>;%..", +"++++++++++++%%&&*%*&%%$$&;>>;$%+", +"..+.........*&&&*-,''')-%$$;$$%%", +"++...++..++$%**%-'!!!!'''&$$$$$%", +"..........$$%$%&,'!!!!!!!'&$$$%%", +"..+..++...$$$$&))'!!!'''!'~%$$$$", +"..+++++++%$$$&,))),'!''',~-~$$$$", +"+++++++++%$$$~,',),,''!,~~~~$$$$", +"#####++++%%$*,'{',),'''~~~~~*$$$", +"#.+##..#+%$$%),,,,,)',)~)~~~*$$$", +"#+.##..#$$$$$~~~~)~~,,),))~)-$$$", +"#++##++#+$$$$-~~-~~)',,,,',,&$$$", +"#.+#####]$$$$&---~,'!'')~,,,*$%$", +"+++++++++$$$$$--~'!!!'',)))~$$$$", +"+++++++++%$$$$%~'!'!'!!,))~&$$$$", +"+++++++..+%%$$$&''!'!!!',)&$$$$$", +"+++++^^+++%%%$$$&'''!!!')&$$%$$$", +"++.++++++++%$$$$$*~,!''-%%$$%$$$", +"+++++++++++%%$$$$$$$$$$%%$$$$$$%", +"^^+++^^^^+++%$$$$=$$$$=%%$$$$==/", +"++++++++#++++%$$$%$$$%%%%$$%%%//", +"+++++++#+#+++++%%%$$%$$$$$$$%///", +"++++++#+++#+++++^%%%%==$$$%(__(_", +"++++++#^^+#+++#++++/////////_/_/", +"..++++++++#+++#.++++////////_(_/"}; --- bristol-0.60.0.orig/debian/bristol.1 +++ bristol-0.60.0/debian/bristol.1 @@ -0,0 +1,166 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH BRISTOL 1 "June 6, 2003" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +bristol \- a synthesiser emulation package. +.SH SYNOPSIS +.B startBristol +.RI [ options ] +.SH DESCRIPTION + +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBbristol\fP is the name of vintage software syntesiser suite. It +currently emulates the following software synthesizers: +.PP +Moog Mini +.br +Moog Voyager (Bristol "Explorer") +.br +Sequential Circuits Prophet-5 +.br +Roland Juno-6 +.br +Yamaha DX-7 (Well, perhaps an FM-7) +.br +Hammond (single manual) +.br +Hammond B3 (dual manual - see below) +.br +Vox Continental +.br +Fender Rhodes +.br + +You should start this package with the startBristol script. This script +will start up the bristol synthesiser binaries, evaluating the correct +library paths and executable paths. There are emulation, synthesiser and +operational parameters: + +.SH OPTIONS +.TP +.B Emulation: +\-mini mini moog +.br +\-explorer moog voyager +.br +\-hammond hammond module +.br +\-b3 dual manual hammond B3 +.br +\-pro5|\-prophet sequential circuits prophet\-5 +.br +\-pro10 sequential circuits prophet\-10 +.br +\-juno roland juno\-6 +.br +\-dx yamaha DX\-7 +.br +\-vox vox continental +.br +\-rhodes fender rhodes stage 73 +.br +\-mixer 16 track mixer (\-libtest only) +.PP +.TP +.B Synthesiser: + +\-voices operate with a total of 'n' voices, default 16 +.br +\-channel initial midi channel selected to 'c', default 1 +.TP +.B Operational: +.TP +General: +\-engine don't start engine (connect to current invocation) +.br +\-port

connect to engine on TCP port 'p' (default 5028) +.br +\-libtest just display a GUI +.br +\-quiet redirect output to /dev/null +.br +\-oss use OSS defaults for audio and MIDI (default) +.br +\-alsa use ALSA defaults for audio and MIDI +.TP + +Audio driver: +\-audio [oss|alsa] audio driver selection +.br +\-audiodev audio device selection +.br +\-bufsize buffer size, default 1024 bytes (256 samples) +.br +\-preload configure preload buffer count (default 4) +.br +\-rate sample rate + +.TP +Midi driver: +\-midi [oss|alsa] midi driver selection +.br +\-mididev midi device selection +.br +\-seq use the ALSA SEQ interface + +.PP +Audio drivers are PCM or PCM plug only. Future releases may add Jack +support. Midi drivers are either OSS/ALSA rawmidi interface, or ALSA SEQ. +Multple GUIs can connect to the single audio engine, which then operates +multitimbrally. +.PP +.SH EXAMPLES + +.PP +.TP +startBristol +Run a minimoog using OSS interface for audio and midi. This is equivalent to all the following options: \-mini \-audio oss \-audiodev /dev/audio \-midi oss \-mididev /dev/midi \-bufsize 1024 \-preload 4 \-port 5028 \-voices 16 \-channel 1 \-rate 44100 +.TP +startBristol \-alsa +Run a minimoog using ALSA interface for audio and midi. This is equivalent to all the following options: \-mini \-audio alsa \-audiodev plughw:0,0 \-midi alsa \-mididev hw:0 \-bufsize 1024 \-preload 4 \-port 5028 \-voices 16 \-channel 1 \-rate 44100 +.TP +startBristol \-explorer \-voices 1 +Run a moog explorer as a monophonic instrument, using OSS interface for audio and midi. +.TP +startBristol \-prophet \-alsa \-channel 3 +Run a prophet\-5 using ALSA for audio and midi (on channel 3). +.TP +startBristol \-b3 \-bufsize 2048 \-preload 2 +Run a hammond b3 with a buffer size of 2048 bytes (512 samples), and preload two such buffers before going active. Some Live! cards need this larger buffer size with ALSA drivers. +.TP +startBristol \-oss \-audiodev /dev/dsp1 \-vox \-voices 8 +Run a vox continental using OSS device 1, and default midi device /dev/midi0. Operate with just 8 voices. +.TP +startBristol \-b3 \-audio alsa \-audiodev plughw:0,0 \-seq \-mididev 128.0 +Run a B3 emulation over the ALSA PCM plug interface, using the ALSA sequencer over client 128, port 0. +.TP +startBristol \-juno & +.TP +startBristol \-prophet \-channel 2 \-engine + +Start two synthesisers, a juno and a prophet. Both synthesisers will will be executed on one engine (multitimbral) with 16 voices between them. The juno will be on default midi channel (1), and the prophet on channel 2. Output over the same default OSS audio device (/dev/audio). +.TP +startBristol \-juno & +.TP +startBristol \-prophet \-port 5029 \-audiodev /dev/dsp1 \-mididev /dev/midi1 +Start two synthesisers, a juno on the first OSS soundcard, and a prophet on the second OSS soundcard. Each synth is totally independent and runs with 16 voice polyphony (looks nice, but not been tested). + +.SH AUTHOR + nick.copeland@ntlworld.com --- bristol-0.60.0.orig/debian/source/format +++ bristol-0.60.0/debian/source/format @@ -0,0 +1 @@ +1.0 --- bristol-0.60.0.orig/debian/patches/series +++ bristol-0.60.0/debian/patches/series @@ -0,0 +1,4 @@ +01-spelling_errors.patch +03-kfreebsd_ftbfs.patch +04-fix_alsa_presence_check.patch +05-hurd_ftbfs.patch --- bristol-0.60.0.orig/debian/patches/03-kfreebsd_ftbfs.patch +++ bristol-0.60.0/debian/patches/03-kfreebsd_ftbfs.patch @@ -0,0 +1,26 @@ +Origin: backport +Description: Prevent FTBFS on kfreebsd architectures. +Bug: http://bugs.debian.org/578443 +From: https://sourceforge.net/tracker/index.php?func=detail&aid=2989865&group_id=157415&atid=803734 +--- + include/slab/slabmixer.h | 2 -- + 1 file changed, 2 deletions(-) + +--- bristol.orig/include/slab/slabmixer.h ++++ bristol/include/slab/slabmixer.h +@@ -24,7 +24,6 @@ + /* + * This should be set up according to system type. + */ +-#if (MACHINE == FreeBSD || MACHINE == linux) + #ifndef INC_SOURCE + #define SLAB_NULL -1 + #define SLAB_TREBLE SOUND_MIXER_TREBLE +@@ -93,7 +92,6 @@ + #define SLAB_VOL_PCM_MASK 1< + #include + #include ++ ++#ifdef BRISTOL_SEMAPHORE + #include ++#endif ++ + #include + #include + +@@ -622,8 +626,13 @@ typedef struct AudioMain { + bristolVoice *newlast; + bristolOP **palette; /* operator templates */ + bristolOP **effects; /* operator templates */ ++#ifdef BRISTOL_SEMAPHORE + sem_t *sem_long; + sem_t *sem_short; ++#else ++ void *unused1; ++ void *unused2; ++#endif + struct timespec abstime; + int voiceCount; + int opCount; --- bristol-0.60.0.orig/debian/patches/01-spelling_errors.patch +++ bristol-0.60.0/debian/patches/01-spelling_errors.patch @@ -0,0 +1,88 @@ +Author: Alessio Treglia +Description: Fix spelling errors: + * s/independant/independent/ +Forwarded: https://sourceforge.net/tracker/?func=detail&aid=2989866&group_id=157415&atid=803734 +--- + brighton/brightonhelp.h | 2 +- + brighton/brightonreadme.h | 8 ++++---- + bristol/blo.c | 6 +++--- + 3 files changed, 8 insertions(+), 8 deletions(-) + +--- bristol.orig/brighton/brightonhelp.h ++++ bristol/brighton/brightonhelp.h +@@ -287,7 +287,7 @@ char *helptext = "\nA synthesiser emulat + startBristol -port 5029 -audio oss -audiodev /dev/dsp1 -mididev /dev/midi1\n\ + \n\ + Start two synthesisers, a juno on the first ALSA soundcard, and a\n\ +- mini on the second OSS soundcard. Each synth is totally independant\n\ ++ mini on the second OSS soundcard. Each synth is totally independent\n\ + and runs with 32 voice polyphony (looks nice, not been tested).\n\ + \n\ + The location of the bristol binaries can be specified in the BRISTOL\n\ +--- bristol.orig/brighton/brightonreadme.h ++++ bristol/brighton/brightonreadme.h +@@ -1132,7 +1132,7 @@ NULL, /* Pro-52 - stuff later */ + " Oberheim OB-X\n\ + -------------\n\ + \n\ +-Oberheim was the biggest competitor of Sequencial Circuits, having their OB\n\ ++Oberheim was the biggest competitor of Sequential Circuits, having their OB\n\ + range neck and neck with each SC Prophet. The sound is as fat, the OB-X \n\ + similar to the Prophet-5 as the OB-Xa to the Prophet-10. The synths were widely\n\ + used in rock music in the late seventies and early 80s. Their early polyphonic\n\ +@@ -2553,7 +2553,7 @@ Unison button. You can configure stereo + hard left and right panning. Similarly the -99 emulations do not have a Unison\n\ + button, the capability is available from DE 80.\n\ + \n\ +-The memories for the bit-1 and bit-99 should be interchangable however the\n\ ++The memories for the bit-1 and bit-99 should be interchangeable however the\n\ + code maintains separate directories.\n\ + \n\ + There are three slightly different Bit GUI's. The first is the bit-1 with a \n\ +@@ -3385,7 +3385,7 @@ The filter keyboard tracking is configur + of the Trilogy however it was implemented here to correct the keyboard tracking\n\ + of the filter for all the emulations and the filter should now be playable.\n\ + The envelope touch will affect this depending on J2 since velocity affects the\n\ +-cut off frequency and that is noticable when playing the filter. This jumper\n\ ++cut off frequency and that is noticeable when playing the filter. This jumper\n\ + is there so that the envelope does not adversely affect tuning but can still be\n\ + used to have the filter open up with velocity if desired.\n\ + \n\ +@@ -3637,7 +3637,7 @@ The filter keyboard tracking is configur + of the Stratus however it was implemented here to correct the keyboard tracking\n\ + of the filter for all the emulations and the filter should now be playable.\n\ + The envelope touch will affect this depending on J2 since velocity affects the\n\ +-cut off frequency and that is noticable when playing the filter. This jumper\n\ ++cut off frequency and that is noticeable when playing the filter. This jumper\n\ + is there so that the envelope does not adversely affect tuning but can still be\n\ + used to have the filter open up with velocity if desired.\n\ + \n\ +--- bristol.orig/bristol/blo.c ++++ bristol/bristol/blo.c +@@ -133,7 +133,7 @@ harmonics, gn, cutin, cutoff, fraction, + } + + /* +- * Ramp and saw, they will be inverted but will only be noticable when ++ * Ramp and saw, they will be inverted but will only be noticeable when + * used as LFO. This gives audible crackle at low harmonic counts: + * + * sum all odd and subtract all even harmonics, gain is reciprocal of h +@@ -267,7 +267,7 @@ generateBLOwaveformF(float step, float * + return; + case BLO_RAMP: + /* +- * Ramp and saw, they will be inverted but will only be noticable ++ * Ramp and saw, they will be inverted but will only be noticeable + * when LFO. This gives audible crackle at low harmonic counts: + * + * sum all odd and subtract all even harmonics, +@@ -412,7 +412,7 @@ generateBLOwaveformZ(int key, float *dst + return; + case BLO_RAMP: + /* +- * Ramp and saw, they will be inverted but will only be noticable ++ * Ramp and saw, they will be inverted but will only be noticeable + * when LFO. This gives audible crackle at low harmonic counts: + * + * sum all odd and subtract all even harmonics, --- bristol-0.60.0.orig/debian/patches/04-fix_alsa_presence_check.patch +++ bristol-0.60.0/debian/patches/04-fix_alsa_presence_check.patch @@ -0,0 +1,53 @@ +Description: Use IATOMIC_DEFINED to check whether ALSA support is available. +Origin: https://sourceforge.net/tracker/?func=detail&atid=803734&aid=2989865&group_id=157415 +Last-Update: 2010-04-23 +--- + libbristolaudio/audioEngineJack.c | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +--- bristol.orig/libbristolaudio/audioEngineJack.c ++++ bristol/libbristolaudio/audioEngineJack.c +@@ -36,9 +36,12 @@ + #include + #include + #include +-#include + + #ifdef _BRISTOL_JACK ++#if (BRISTOL_HAS_ALSA == 1) ++#include ++#endif ++ + #include "bristol.h" + #include "bristoljack.h" + +@@ -302,11 +305,7 @@ audioShim(jack_nframes_t nframes, void * + return(0); + } + +-#ifdef __ALSA_IATOMIC_H +-atomic_t closedown = ATOMIC_INIT(1); +-#else + int closedown = 1; +-#endif + + static void + bristolIntJackClose() +@@ -346,11 +345,7 @@ bristolJackClose(jackDev *jackdev) + * this bit of code is far from critical but collisions cause some gory + * shutdown sequences. + */ +-#ifdef __ALSA_IATOMIC_H +- if (atomic_dec_and_test(&closedown)) +-#else + if (--closedown == 0) +-#endif + printf("unregistering jack interface: %x->%x\n", + (size_t) jackdev, (size_t) jackdev->handle); + else { +@@ -866,3 +861,5 @@ bristolJackInterface(audioMain *audiomai + } + #endif /* _BRISTOL_JACK */ + ++ ++