--- zynaddsubfx-2.4.0.orig/src/main.cpp +++ zynaddsubfx-2.4.0/src/main.cpp @@ -210,11 +210,11 @@ string filename; switch (lash->checkevents(filename)) { case LASHClient::Save: - ui->do_save_master(filename); + ui->do_save_master(filename.c_str()); lash->confirmevent(LASHClient::Save); break; case LASHClient::Restore: - ui->do_load_master(filename); + ui->do_load_master(filename.c_str()); lash->confirmevent(LASHClient::Restore); break; case LASHClient::Quit: --- zynaddsubfx-2.4.0.orig/debian/compat +++ zynaddsubfx-2.4.0/debian/compat @@ -0,0 +1 @@ +5 --- zynaddsubfx-2.4.0.orig/debian/rules +++ zynaddsubfx-2.4.0/debian/rules @@ -0,0 +1,93 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp + +build-stamp: patch configure-stamp + dh_testdir + + # Add here commands to compile the package. + + $(MAKE) -C src + #/usr/bin/docbook-to-man debian/zynaddsubfx.sgml > zynaddsubfx.1 + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) -C src clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/zynaddsubfx. + cd src + $(MAKE) -C src install DESTDIR=$(CURDIR)/debian/zynaddsubfx + install -m 644 debian/zynaddsubfx.desktop $(CURDIR)/debian/zynaddsubfx/usr/share/applications + install -m 644 debian/zynaddsubfx.xpm $(CURDIR)/debian/zynaddsubfx/usr/share/pixmaps/ + cp -r $(CURDIR)/banks $(CURDIR)/debian/zynaddsubfx/usr/share/zynaddsubfx +# cp -r $(CURDIR)/presets $(CURDIR)/debian/zynaddsubfx/usr/share/zynaddsubfx + cd .. + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_installmenu + dh_installman debian/zynaddsubfx.1 + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- zynaddsubfx-2.4.0.orig/debian/docs +++ zynaddsubfx-2.4.0/debian/docs @@ -0,0 +1,3 @@ +FAQ.txt +HISTORY.txt +README.txt --- zynaddsubfx-2.4.0.orig/debian/control +++ zynaddsubfx-2.4.0/debian/control @@ -0,0 +1,17 @@ +Source: zynaddsubfx +Section: sound +Priority: extra +Maintainer: Eduardo Marcel Macan +Build-Depends: debhelper (>> 5.0.0), quilt, fluid (>= 1.1.3+1.1.4rc1), libjack-dev, libfltk1.1-dev (>= 1.1.3+1.1.4rc1), libasound2-dev (>= 0.9.4) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libmxml-dev (>= 2.0), zlib1g-dev, libfftw3-dev +Standards-Version: 3.7.3 +Homepage: http://zynaddsubfx.sourceforge.net + +Package: zynaddsubfx +Architecture: any +Depends: ${shlibs:Depends} +Description: Realtime software synthesizer for Linux + A real-time software synthesizer for Linux and Windows with many + features, including polyphony, multi-timbral and microtonal + capabilities. It includes randomness of some parameters, which + makes warm sounds, like analogue synthesizers. + It has system/insertion effects too, and much more. --- zynaddsubfx-2.4.0.orig/debian/zynaddsubfx.1 +++ zynaddsubfx-2.4.0/debian/zynaddsubfx.1 @@ -0,0 +1,69 @@ +.\" 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 ZYNADDSUBFX 1 "Dec 28, 2004" +.\" 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 +zynaddsubfx \- Multitimbral software synthesizer for Windows and Linux +.SH SYNOPSIS +.B zynaddsubfx +.RI [ options ] +.br +.B bar +.RI [ options ] +.SH DESCRIPTION +This manual page documents briefly the +.B zynaddsubfx +command. +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.PP +\fBzynaddsubfx\fP is a opensource software synthesizer capable of making a countless number of instruments, from some common heared from expensive hardware to interesting sounds that you'll boost to an amazing universe of sounds. +.SH OPTIONS +These programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +A summary of options is included below. +For a complete description, see the Info files. +.TP +.B \-h, \-\-help +display command-line help and exit +.TP +.B \-r SR, \-\-sample\-rate=SR +set the sample rate SR +.TP +.B \-b BS, \-\-buffer\-size=SR +set the buffer size (granularity) +.TP +.B \-o OS, \-\-oscil\-size=OS +set the ADsynth oscil. size +.TP +.B \-S , \-\-swap +swap Left <--> Right +.TP +.B \-D , \-\-dump +Dumps midi note ON/OFF commands +.B \-l file, \-\-load=FILE +loads a .xmz file +.TP +.B \-U , \-\-no\-gui +run ZynAddSubFX without user interface +.TP +.B \-A , \-\-not\-use\-jack +use OSS/ALSA instead of JACK +.TP +.br +.SH AUTHOR +This manual page was written by Eduardo Marcel Macan , +for the Debian project (but may be used by others). --- zynaddsubfx-2.4.0.orig/debian/changelog +++ zynaddsubfx-2.4.0/debian/changelog @@ -0,0 +1,154 @@ +zynaddsubfx (2.4.0-1.2) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/{05_partui,06_bankui,09_fluid_1.3}.patch: + - Fluid 1.3.x no longer produces empty implementations for totally + empty functions in .fl files, fix FTBFS (Closes: #633478) + + -- Alessio Treglia Sun, 21 Aug 2011 10:51:06 +0200 + +zynaddsubfx (2.4.0-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Drop LASH support (Closes: #627420): + - Remove liblash-dev from Build-Depends field. + - Disable 016_lash.patch patch. + + -- Alessio Treglia Thu, 02 Jun 2011 16:28:21 +0200 + +zynaddsubfx (2.4.0-1) unstable; urgency=low + + * Built with LASH support (Closes: #486243) + * Build-depends upon libjack-dev (Closes: #527443) + * Removed patches that were incorporated upstream + * New upstream release (Closes: #543557) + + -- Eduardo Marcel Maçan Thu, 20 Aug 2009 00:39:47 -0300 + +zynaddsubfx (2.2.1-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Change fftw3-dev build-dep to libfftw3-dev (Closes: #445792) + * Add quilt patching system + * Make clean not ignore errors in rules + * Remove unused debhelper commands in rules + * debian/menu - Change section Apps/Sound to Sound + * Add watch file + * Add Homepage field in control + * Remove deprecated encoding field from desktop file + * 01_kfreebsd_fix.patch (Closes: #415675) + + src/Makefile.inc - fall back to OSS on kfreebsd + * Move previous source changes to patches + + 015_oss_and_jack.patch - Use OSS_AND_JACK, not just OSS + + 02_makefile.patch - Add install target + + 03_main.patch - Add noui as a parameter to initprogram() + + 04_virkeyboard.patch - Warning and crash caused in virtual keyboard + + patch by Guus Sliepen + + 05_partui.patch - Add PartUI_() function + + 06_bankui.patch - Add BankProcess_() function + + 07_ossaudiooutput.patch - Big Endian Fix + + 08_jackaudiooutput.patch - Add jack ports + + 09_envelopeparams.patch - Set realtime priority accordingly + + 10_LFO.patch - Improve frequency randomizer + * Bump debhelper build-dep and compat to 5 + * Bump standards version to 3.7.3 + + -- Barry deFreese Sun, 16 Dec 2007 17:59:25 -0500 + +zynaddsubfx (2.2.1-4) unstable; urgency=low + + * Added zlib1g-dev to the build dependencies (closes: #352014) + + -- macan Fri, 10 Feb 2006 13:15:38 -0200 + +zynaddsubfx (2.2.1-3) unstable; urgency=low + + * Patched zynaddsubfx to connect to the default jack output + * Fixed some compilation warnings and crashing caused by a bug in virtual keyboard, patch by Guus Sliepen (closes: #350152) + * Updated .desktop file to be XDG compliant. Patch by Free Ekanayaka (closes: #313368) + * Set realtime priority acordingly. Patch by Ben Hutchings (closes: #314671) + + -- Eduardo Marcel Macan Wed, 8 Feb 2006 08:50:06 -0200 + +zynaddsubfx (2.2.1-2.1) unstable; urgency=low + + * Non-maintainer upload. + * build-depend on libjack0.100.0-dev. Closes: #317229. + + -- Andreas Barth Sun, 31 Jul 2005 13:56:28 +0200 + +zynaddsubfx (2.2.1-2) unstable; urgency=high + + * Added noui as a parameter to initprogram() (closes: #307522) + * Fixed issues introduced by Brossier's patch (#306824) on little endian architectures (closes: #309401) + + -- Eduardo Marcel Macan Tue, 17 May 2005 11:29:38 -0300 + +zynaddsubfx (2.2.1-1) unstable; urgency=low + + * Gave proper credit in this changelog to people who sent patches + * New upstream release + + -- Eduardo Marcel Macan Fri, 29 Apr 2005 09:29:12 -0300 + +zynaddsubfx (2.2.0-2) unstable; urgency=low + + * Fixed endianess problem thanks Paul Brossier (closes: #306824) + + -- Eduardo Marcel Macan Fri, 29 Apr 2005 09:17:20 -0300 + +zynaddsubfx (2.2.0-1) unstable; urgency=low + + * New upstream release + * Fixed XMLWrapper so that saved parameters are loaded properly + + -- Eduardo Marcel Macan Sat, 23 Apr 2005 08:18:08 -0300 + +zynaddsubfx (2.1.1-1.1) unstable; urgency=low + + * NMU + * Changes src/UI/PresetsUI.fl to include FL/fl_ask.H instead of + FL/fl_ask.h (closes: #304125) + * Disabled non portable float to int assembly conversion in + src/Makefile.inc (ASM_F2I=NO) + + -- Paul Brossier Wed, 13 Apr 2005 03:54:45 +0100 + +zynaddsubfx (2.1.1-1) unstable; urgency=low + + * menu file now references zyn's icon (closes: #299412) + * New upstream release (closes: #269004) + + -- Eduardo Marcel Macan Tue, 28 Dec 2004 20:50:04 -0200 + +zynaddsubfx (1.4.3-1.1) unstable; urgency=low + + * NMU + * recompile with libjack0.80.0-dev (closes: #228790) + + -- Junichi Uekawa Wed, 28 Jan 2004 06:50:09 +0900 + +zynaddsubfx (1.4.3-1) unstable; urgency=low + + * New upstream release + + -- Eduardo Marcel Macan Wed, 3 Sep 2003 16:05:56 -0300 + +zynaddsubfx (1.4.2-2) unstable; urgency=low + + * Fixed build dependencies (closes: #203424) + + -- Eduardo Marcel Macan Thu, 7 Aug 2003 08:54:35 -0300 + +zynaddsubfx (1.4.2-1) unstable; urgency=low + + * New upstream release + + -- Eduardo Marcel Macan Thu, 17 Jul 2003 21:54:46 -0300 + +zynaddsubfx (1.4.1-1) unstable; urgency=low + + * Initial Release. + + -- Eduardo Marcel Macan Thu, 19 Jun 2003 23:33:18 -0300 + --- zynaddsubfx-2.4.0.orig/debian/dirs +++ zynaddsubfx-2.4.0/debian/dirs @@ -0,0 +1,4 @@ +usr/bin +usr/share/zynaddsubfx +usr/share/applications +usr/share/pixmaps --- zynaddsubfx-2.4.0.orig/debian/zynaddsubfx.desktop +++ zynaddsubfx-2.4.0/debian/zynaddsubfx.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] + +Name=ZynAddSubFX Software Synthesizer +Name[pt]=Sintetizador por Software ZynAddSubFX +Comment=ZynAddSubFX Software Synthesizer +Exec=/usr/bin/zynaddsubfx +Terminal=false +Type=Application +Icon=/usr/share/pixmaps/zynaddsubfx.xpm +Categories=Application;AudioVideo;Audio; --- zynaddsubfx-2.4.0.orig/debian/README.Debian +++ zynaddsubfx-2.4.0/debian/README.Debian @@ -0,0 +1,14 @@ +zynaddsubfx for Debian +---------------------- + +This package was currently packaged compiled with ALSA midi in + Jack +DSP out capabilities. Using this setup you will be able to extract +the most out of this package. The upstream author is very responsive +and I am working with him to have the choice of midi in/audio out +in the User Interface thus saving us from the need of another +multibinary package which will soon go away. If such a multibinary +package is needed and asked for, I'll do it, but believe me, if you +are into serious soundmaking using free software, you should be using +jack+alsa anyway. + + -- Eduardo Marcel Macan , Thu, 25 Juj 2003 10:05:18 -0300 --- zynaddsubfx-2.4.0.orig/debian/copyright +++ zynaddsubfx-2.4.0/debian/copyright @@ -0,0 +1,15 @@ +This package was debianized by Eduardo Marcel Macan on +Thu, 19 Jun 2003 23:33:18 -0300. + +It was downloaded from +Upstream Author: Nasca Otavian Paul + +Copyright: + +ZynAddSubFX is Copyright (c) 2002-2003 Nasca Octavian Paul and may be freely +distribuited under version 2 of the GNU General Public License (GNU GPL). +The program is licensed only under version 2 of the GNU GPL and not under +any other version of GNU GPL. This program comes WITH NO WARRANTY OF ANY KIND. + +You can find the complete text of the GPL version 2 and other common licences +on Debian systems under /usr/share/common-licenses/ --- zynaddsubfx-2.4.0.orig/debian/watch +++ zynaddsubfx-2.4.0/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://sf.net/zynaddsubfx/ZynAddSubFX-([\d.]+)\.tar\.bz2 --- zynaddsubfx-2.4.0.orig/debian/substvars +++ zynaddsubfx-2.4.0/debian/substvars @@ -0,0 +1 @@ +shlibs:Depends=fftw2 | fftw2-double, libasound2 (>> 0.9.3), libc6 (>= 2.3.1-1), libfltk1.1c102 (>= 1.1.3+1.1.4rc1), libfontconfig1 (>= 2.2.1), libfreetype6 (>= 2.1.4-1), libjack0.71.2-0 (>= 0.71.2), libstdc++5 (>= 1:3.3-1), libxft2 (>> 2.1.1), libxrender1 (>= 0.8.1), xlibs (>> 4.1.0), zlib1g (>= 1:1.1.4) --- zynaddsubfx-2.4.0.orig/debian/zynaddsubfx.xpm +++ zynaddsubfx-2.4.0/debian/zynaddsubfx.xpm @@ -0,0 +1,125 @@ +/* XPM */ +static char *zynaddsubfx32[] = { +/* columns rows colors chars-per-pixel */ +"32 32 87 1", +" c #0003002C0003", +". c #00040E5D0004", +"X c #0B3406F20B45", +"o c #0C4B0C0C0C4D", +"O c #000013B10000", +"+ c #00001B870000", +"@ c #0DF8135E135E", +"# c #10720FD91078", +"$ c #118C119811D3", +"% c #000023C30000", +"& c #00002CE20000", +"* c #0C1F2E420C3B", +"= c #000035820000", +"- c #00003C190000", +"; c #0F143C3D0F1D", +": c #12803FA61284", +"> c #32AE324D32B6", +", c #32813934326F", +"< c #389138133894", +"1 c #0000467A0000", +"2 c #00004DC90000", +"3 c #0A874D1A0A95", +"4 c #0000562E0000", +"5 c #00005C8F0000", +"6 c #000062980000", +"7 c #00006CA10000", +"8 c #0000745A0000", +"9 c #00007C6D0000", +"0 c #3C5441483C44", +"q c #461B43253E66", +"w c #419341944190", +"e c #5D565A1D5D7B", +"r c #5D3780495D2F", +"t c #6791649267A2", +"y c #69C566DE69E5", +"u c #6DBD6D7E6DBA", +"i c #6D3F7D2A6DB1", +"p c #74C974D674DE", +"a c #7E0B7D457DFC", +"s c #000084250000", +"d c #00008C400000", +"f c #000093ED0000", +"g c #00009B8C0000", +"h c #0000A69D0000", +"j c #0000AC580000", +"k c #0000B2520000", +"l c #0000BE290000", +"z c #0000C5830000", +"x c #0000CC7C0000", +"c c #0000D4690000", +"v c #0000DB910000", +"b c #0000E3B90000", +"n c #0000EE460000", +"m c #0000F5E90000", +"M c #0000FEA00000", +"N c #661D8991667C", +"B c #6BED8F166BCA", +"V c #7F53A481814A", +"C c #9BA67C917CC3", +"Z c #B4BB63136377", +"A c #FF90042C0492", +"S c #E0E536733672", +"D c #EF7B33E233DD", +"F c #D6FE73F16F00", +"G c #DBDB71E771FC", +"H c #84A784A98489", +"J c #8C388C5C8C5B", +"K c #8FD1920C91E9", +"L c #95769550955B", +"P c #967E9B629649", +"I c #98FE983198B2", +"U c #9DCE9DC69DE3", +"Y c #ABE08DB48DD5", +"T c #B66E980797CF", +"R c #A402A3DBA43C", +"E c #A883A862A8CD", +"W c #A6A7AB83A670", +"Q c #AE38A36FA3B9", +"! c #AB23AB35AB5E", +"~ c #B0AEB0FCB0F6", +"^ c #B3E3B3F4B3D8", +"/ c #BD18BD8DBD78", +"( c #BE86C0DFC1C2", +") c #CCF1AE2BAE6E", +"_ c #C403C419C422", +"` c #C9A3C85ECAB6", +"' c None", +/* pixels */ +"''''''''''''''''''''''''''''''''", +"''''''''''''''''''' oo$$$@.'''''", +"&&&&&&&&&&&&&&&=&&*0LEE~TZw-&&&&", +"6&&&&&&&&5=&&&&&&;BW^^/(GAFK:&&6", +"2 1. otRE!!EQSD)`ao 2", +"2 2. >IREERLLJY(((w 2", +"2 1. opUUEERUIKJR)_Lo2", +"2 1. oHLU^^ERUIKK~_~$2", +"2 1. oBKR(^^!RULJ!/!$2", +"2 +sljs& oaJR_)^~ERUUE/E#2", +"2 OgmMMMx& oaJP(((^^!RU!^R#2", +"2 .fmbklMM8 ouHK~`(/^~!QE^Ho2", +"2 .9mb22=kMc1 >HHJ!(_/^ERER< 5", +"2 2nn9 1.%kMv=XeHHJIRRUUURtX&s", +"6&&1zMj==5=&6nMg&;iaHHJJLIIN;&6g", +"6&&fMx=&&5=&&fmn9&*,iaaaHp,*&&6g", +"2 =vm7 1. OfMv= .3ooooo 7j", +"2 8Mz+ 2. =bMd .1 %xk", +"2OlMd 1. jMv&.1 8Mj", +"21nn2 1. 4nM9.1 hMk", +"29Mx+ 1. .gMv21 +zMj", +"2gMg 1O =vMg2 Ojmcs", +"svMs&&&&&5=&&&&&&dmn9&&&&&&9mm86", +"jMb4&&&&&5=&&&&&&=zMv6%&%=6vMk=6", +"kMj. 1. 7mMz4--8vMv1 2", +"km7 1O OsnMMnnmMz1 2", +"kzO 1O O8gcnnbc- 2", +"7= 1. .2 %11-&. 2", +"2 1. .2 2", +"4........2+........+2.....O.O..4", +"21112111122121111112211111111112", +"''''''''''''''''''''''''''''''''" +}; --- zynaddsubfx-2.4.0.orig/debian/menu +++ zynaddsubfx-2.4.0/debian/menu @@ -0,0 +1,3 @@ +?package(zynaddsubfx):needs="X11" section="Applications/Sound"\ + title="zynaddsubfx" command="/usr/bin/zynaddsubfx"\ + icon="/usr/share/pixmaps/zynaddsubfx.xpm" --- zynaddsubfx-2.4.0.orig/debian/patches/06_bankui.patch +++ zynaddsubfx-2.4.0/debian/patches/06_bankui.patch @@ -0,0 +1,23 @@ +Index: zynaddsubfx-2.4.0/src/UI/BankUI.fl +=================================================================== +--- zynaddsubfx-2.4.0.orig/src/UI/BankUI.fl 2011-07-10 11:57:12.000000000 -0400 ++++ zynaddsubfx-2.4.0/src/UI/BankUI.fl 2011-07-10 12:02:57.000000000 -0400 +@@ -32,9 +32,17 @@ + + class BankProcess_ {} { + Function {process()} {open return_type {virtual void} +- } {} ++ } { ++ comment {This body intentionally left blank.} {in_source not_in_header ++ } ++ } + decl {Bank *bank;} {public + } ++ Function {~BankProcess_()} {return_type virtual ++ } { ++ comment {This body intentionally left blank.} {in_source not_in_header ++ } ++ } + } + + class BankSlot {open : {public Fl_Button,BankProcess_} --- zynaddsubfx-2.4.0.orig/debian/patches/05_partui.patch +++ zynaddsubfx-2.4.0/debian/patches/05_partui.patch @@ -0,0 +1,21 @@ +Index: zynaddsubfx-2.4.0/src/UI/PartUI.fl +=================================================================== +--- zynaddsubfx-2.4.0.orig/src/UI/PartUI.fl 2011-07-10 11:57:12.000000000 -0400 ++++ zynaddsubfx-2.4.0/src/UI/PartUI.fl 2011-07-10 12:05:38.000000000 -0400 +@@ -85,7 +85,15 @@ + + class PartUI_ {} { + Function {showparameters(int kititem,int engine)} {return_type virtual +- } {} ++ } { ++ comment {This body intentionally left blank.} {in_source not_in_header ++ } ++ } ++ Function {~PartUI_()} {return_type virtual ++ } { ++ comment {This body intentionally left blank.} {in_source not_in_header ++ } ++ } + } + + class PartKitItem {: {public Fl_Group} --- zynaddsubfx-2.4.0.orig/debian/patches/016_lash.patch +++ zynaddsubfx-2.4.0/debian/patches/016_lash.patch @@ -0,0 +1,13 @@ +--- zynaddsubfx-2.4.0/src/Makefile.inc 2009-08-28 00:16:49.000000000 -0300 ++++ tmp/zynaddsubfx-2.4.0/src/Makefile.inc 2009-08-28 00:13:16.000000000 -0300 +@@ -43,8 +43,8 @@ + #LINUX_DSSI=YES + + #Next line sets if the LASH session handler will be used +-#LINUX_USE_LASH=YES +-LINUX_USE_LASH=NO ++LINUX_USE_LASH=YES ++#LINUX_USE_LASH=NO + + # W I N D O W S C O N F I G U R A T I O N + --- zynaddsubfx-2.4.0.orig/debian/patches/03_main.patch +++ zynaddsubfx-2.4.0/debian/patches/03_main.patch @@ -0,0 +1,38 @@ +--- zynaddsubfx-2.4.0/src/main.cpp 2009-08-30 18:42:39.000000000 -0300 ++++ tmp/zynaddsubfx-2.4.0/src/main.cpp 2009-08-30 18:53:12.000000000 -0300 +@@ -107,7 +107,7 @@ + */ + void set_realtime() + { +-#ifdef OS_LINUX ++#if 0 + sched_param sc; + + sc.sched_priority=50; +@@ -283,7 +283,7 @@ + */ + + +-void initprogram() ++void initprogram(int noui) + { + cerr.precision(1); + cerr << std::fixed; +@@ -341,6 +341,8 @@ + #endif + #ifndef DISABLE_GUI + ui=new MasterUI(master,&Pexitprogram); ++ if (noui=0) ++ ui=new MasterUI(master,&Pexitprogram); + #endif + }; + +@@ -575,7 +577,7 @@ + + //--------- + +- initprogram(); ++ initprogram(noui); + + #ifdef USE_LASH + #ifdef ALSAMIDIIN --- zynaddsubfx-2.4.0.orig/debian/patches/series +++ zynaddsubfx-2.4.0/debian/patches/series @@ -0,0 +1,9 @@ +01_kfreebsd_fix.patch +015_oss_and_jack.patch +02_makefile.patch +03_main.patch +05_partui.patch +06_bankui.patch +07_ossaudiooutput.patch +08_jackaudiooutput.patch +09_fluid_1.3.patch --- zynaddsubfx-2.4.0.orig/debian/patches/01_kfreebsd_fix.patch +++ zynaddsubfx-2.4.0/debian/patches/01_kfreebsd_fix.patch @@ -0,0 +1,14 @@ +--- zynaddsubfx-2.4.0/src/Makefile.inc 2007-03-21 09:02:08.530426000 +0100 ++++ zynaddsubfx-2.4.0/src/Makefile.inc 2007-03-21 09:04:07.000000000 +0100 +@@ -18,7 +18,12 @@ + + # L I N U X C O N F I G U R A T I O N + #Next line sets the midi input. It can be "ALSA", "OSS" or "NONE". ++ifeq ($(shell uname -s),Linux) + LINUX_MIDIIN=ALSA ++else ++# Fallback for GNU/k*BSD ++LINUX_MIDIIN=OSS ++endif + #LINUX_MIDIIN=OSS + #LINUX_MIDIIN=NONE --- zynaddsubfx-2.4.0.orig/debian/patches/02_makefile.patch +++ zynaddsubfx-2.4.0/debian/patches/02_makefile.patch @@ -0,0 +1,11 @@ +diff -urN zynaddsubfx-2.4.0.orig/src/Makefile zynaddsubfx-2.4.0/src/Makefile +--- zynaddsubfx-2.4.0.orig/src/Makefile 2005-04-27 19:45:52.000000000 -0400 ++++ zynaddsubfx-2.4.0/src/Makefile 2007-12-16 20:04:06.000000000 -0500 +@@ -125,3 +125,6 @@ + rm -f */*.o *.o + $(MAKE) -C UI $@ + ++install: ++ install -D zynaddsubfx $(DESTDIR)/usr/bin/zynaddsubfx ++# install -d -m 755 ../banks $(DESTDIR)/usr/share/zynaddsubfx/ + --- zynaddsubfx-2.4.0.orig/debian/patches/09_fluid_1.3.patch +++ zynaddsubfx-2.4.0/debian/patches/09_fluid_1.3.patch @@ -0,0 +1,39 @@ +Index: zynaddsubfx-2.4.0/src/UI/OscilGenUI.fl +=================================================================== +--- zynaddsubfx-2.4.0.orig/src/UI/OscilGenUI.fl 2011-07-10 12:07:11.000000000 -0400 ++++ zynaddsubfx-2.4.0/src/UI/OscilGenUI.fl 2011-07-10 12:08:06.000000000 -0400 +@@ -129,7 +129,11 @@ + + class PSlider {: {public Fl_Slider} + } { +- Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {} ++ Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} { ++ } { ++ comment {This body intentionally left blank.} {in_source not_in_header ++ } ++ } + Function {handle(int event)} {return_type int + } { + code {int X=x(),Y=y(),W=w(),H=h(); +Index: zynaddsubfx-2.4.0/src/UI/PresetsUI.fl +=================================================================== +--- zynaddsubfx-2.4.0.orig/src/UI/PresetsUI.fl 2011-07-10 12:07:21.000000000 -0400 ++++ zynaddsubfx-2.4.0/src/UI/PresetsUI.fl 2011-07-10 12:08:49.000000000 -0400 +@@ -16,9 +16,15 @@ + + class PresetsUI_ {} { + Function {refresh()} {open return_type {virtual void} +- } {} ++ } { ++ comment {This body intentionally left blank.} {in_source not_in_header ++ } ++ } + Function {~PresetsUI_()} {open return_type virtual +- } {} ++ } { ++ comment {This body intentionally left blank.} {in_source not_in_header ++ } ++ } + } + + class PresetsUI {} { --- zynaddsubfx-2.4.0.orig/debian/patches/015_oss_and_jack.patch +++ zynaddsubfx-2.4.0/debian/patches/015_oss_and_jack.patch @@ -0,0 +1,25 @@ +diff -urN zynaddsubfx-2.4.0.orig/src/Makefile.inc zynaddsubfx-2.4.0/src/Makefile.inc +--- zynaddsubfx-2.4.0.orig/src/Makefile.inc 2005-04-27 20:21:35.000000000 -0400 ++++ zynaddsubfx-2.4.0/src/Makefile.inc 2007-12-16 20:10:02.000000000 -0500 +@@ -9,8 +9,8 @@ + FFTW_VERSION=3 + + #Assembler FLOAT to INT conversions +-ASM_F2I=YES +-#ASM_F2I=NO ++#ASM_F2I=YES ++ASM_F2I=NO + + #Graphic user interface disable option (ZynAddSubFX will run only in text-mode) + #DISABLE_GUI=YES +@@ -28,8 +28,8 @@ + #it will try OSS if JACK fails. At runtime you can set the OSS by default by command-line + #parameters (run 'zynaddsubfx --help' for help) + +-#LINUX_AUDIOOUT=OSS_AND_JACK +-LINUX_AUDIOOUT=OSS ++LINUX_AUDIOOUT=OSS_AND_JACK ++#LINUX_AUDIOOUT=OSS + #LINUX_AUDIOOUT=NONE + #LINUX_AUDIOOUT=JACK + #LINUX_AUDIOOUT=JACK_RT JACK_RT support is broken --- zynaddsubfx-2.4.0.orig/debian/patches/08_jackaudiooutput.patch +++ zynaddsubfx-2.4.0/debian/patches/08_jackaudiooutput.patch @@ -0,0 +1,36 @@ +--- zynaddsubfx-2.4.0/src/Output/JACKaudiooutput.cpp 2009-08-27 23:45:00.000000000 -0300 ++++ tmp/zynaddsubfx-2.4.0/src/Output/JACKaudiooutput.cpp 2009-08-27 23:50:19.000000000 -0300 +@@ -36,6 +36,7 @@ + bool JACKaudiooutputinit(Master *master_) + { + jackmaster=master_; ++ const char **ports; + jackclient=0; + + for (int i=0;i<15;i++) { +@@ -52,7 +53,8 @@ + + fprintf(stderr,"Internal SampleRate = %d\nJack Output SampleRate= %d\n",SAMPLE_RATE,jack_get_sample_rate(jackclient)); + if ((unsigned int)jack_get_sample_rate(jackclient)!=(unsigned int) SAMPLE_RATE) +- fprintf(stderr,"It is recomanded that the both samplerates to be equal.\n"); ++ fprintf(stderr,"It is recommended that both of the samplerates be equal.\n"); ++ + + jack_set_process_callback(jackclient,jackprocess,0); + jack_set_sample_rate_callback(jackclient,jacksrate,0); +@@ -74,6 +76,15 @@ + jack_connect(jackclient,jack_port_name(outport_left),"alsa_pcm:out_1"); + jack_connect(jackclient,jack_port_name(outport_right),"alsa_pcm:out_2"); + */ ++ ++ if ((ports = jack_get_ports (jackclient, NULL, NULL, JackPortIsPhysical|JackPortIsInput)) == NULL) ++ fprintf(stderr,"Cannot connect to jack output, you may hear no sound\n"); else { ++ if (jack_connect(jackclient,jack_port_name(outport_left),ports[0])) ++ fprintf(stderr,"Cannot connect to left output port\n"); ++ if (jack_connect(jackclient,jack_port_name(outport_right),ports[1])) ++ fprintf(stderr,"Cannot connect to right output port\n"); ++ } ++ + return(true); + }; + --- zynaddsubfx-2.4.0.orig/debian/patches/07_ossaudiooutput.patch +++ zynaddsubfx-2.4.0/debian/patches/07_ossaudiooutput.patch @@ -0,0 +1,34 @@ +--- zynaddsubfx-2.4.0/src/Output/OSSaudiooutput.cpp 2009-08-27 22:48:04.000000000 -0300 ++++ tmp/zynaddsubfx-2.4.0/src/Output/OSSaudiooutput.cpp 2009-08-27 22:43:47.000000000 -0300 +@@ -34,6 +34,21 @@ + #include "../globals.h" + using namespace std; + ++#if __BYTE_ORDER == __BIG_ENDIAN ++/* borrowed from glib2 */ ++#define SHORT_SWAP_LE_BE(val) ((short) ( \ ++ (short) ((short) (val) >> 8) | \ ++ (short) ((short) (val) << 8))) ++ ++void swap_endian(short *data, int length) ++{ ++ int i; ++ for (i = 0; i < length; i += 1, data++) ++ *data = SHORT_SWAP_LE_BE(*data); ++} ++#endif ++ ++ + OSSaudiooutput::OSSaudiooutput() + { + int i; +@@ -84,6 +99,9 @@ + smps[i*2]=(short int) (l*32767.0); + smps[i*2+1]=(short int) (r*32767.0); + }; ++#if __BYTE_ORDER == __BIG_ENDIAN ++ swap_endian(smps, SOUND_BUFFER_SIZE*4); ++#endif + write(snd_handle,smps,SOUND_BUFFER_SIZE*4);// *2 because is 16 bit, again * 2 because is stereo + }; +