[SCM] amsynth packaging branch, master, updated. debian/1.2.2-1-1-g4ee0d87
quadrispro-guest at users.alioth.debian.org
quadrispro-guest at users.alioth.debian.org
Fri Dec 4 00:21:16 UTC 2009
The following commit has been merged in the master branch:
commit 4ee0d8797b6c25792bc57243ee987f96d88e51a3
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date: Fri Dec 4 01:21:01 2009 +0100
Remove debian/patches dir
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 6183e25..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-# 90_gcc-4.3_fixes.dpatch
diff --git a/debian/patches/10_gtkmm.dpatch b/debian/patches/10_gtkmm.dpatch
deleted file mode 100644
index ec6f1f1..0000000
--- a/debian/patches/10_gtkmm.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_gtkmm.dpatch by Free Ekanayaka <free at agnula.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./src/main.cc /tmp/dpep-work.HsvM58/amsynth-1.0.0+1.0.1cvs/src/main.cc
---- ./src/main.cc 2005-09-05 10:34:05.000000000 +0200
-+++ /tmp/dpep-work.HsvM58/amsynth-1.0.0+1.0.1cvs/src/main.cc 2005-09-05 10:37:23.000000000 +0200
-@@ -5,7 +5,7 @@
- #include "main.h"
- #include "../config.h"
-
--#include <gtk--/main.h>
-+#include <gtkmm/main.h>
- #include <pthread.h>
- #include <iostream>
- #include <fstream>
diff --git a/debian/patches/20_pthread-kill.dpatch b/debian/patches/20_pthread-kill.dpatch
deleted file mode 100644
index ea0db48..0000000
--- a/debian/patches/20_pthread-kill.dpatch
+++ /dev/null
@@ -1,339 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_pthread-kill.dpatch by Free Ekanayaka <free at agnula.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./src/main.cc /tmp/dpep-work.pNQrlv/amsynth-1.0.0+1.0.1cvs/src/main.cc
---- ./src/main.cc 2005-09-05 10:39:30.000000000 +0200
-+++ /tmp/dpep-work.pNQrlv/amsynth-1.0.0+1.0.1cvs/src/main.cc 2005-09-05 10:39:38.000000000 +0200
-@@ -7,6 +7,7 @@
-
- #include <gtkmm/main.h>
- #include <pthread.h>
-+#include <signal.h>
- #include <iostream>
- #include <fstream>
- #include <unistd.h>
-diff -urNad --exclude=CVS --exclude=.svn ./src/main.cc~ /tmp/dpep-work.pNQrlv/amsynth-1.0.0+1.0.1cvs/src/main.cc~
---- ./src/main.cc~ 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep-work.pNQrlv/amsynth-1.0.0+1.0.1cvs/src/main.cc~ 2005-09-05 10:39:38.000000000 +0200
-@@ -0,0 +1,317 @@
-+/* amSynth
-+ * (c) 2001-2005 Nick Dowell
-+ */
-+
-+#include "main.h"
-+#include "../config.h"
-+
-+#include <gtkmm/main.h>
-+#include <pthread.h>
-+#include <iostream>
-+#include <fstream>
-+#include <unistd.h>
-+
-+int the_pipe[2];
-+
-+void sched_realtime()
-+{
-+ struct sched_param sched;
-+
-+ sched.sched_priority = 50;
-+ int foo = sched_setscheduler(0, SCHED_FIFO, &sched);
-+ sched_getparam(0, &sched);
-+
-+ if (foo) {
-+ config.realtime = 0;
-+ /*
-+ cout << endl << " - - WARNING - -" << endl
-+ << " amSynth could not set realtime priority." << endl
-+ << "You may experience audio buffer underruns "
-+ << "resulting in 'clicks' in the audio." << endl
-+ << "This is most likely because the program is not SUID root." << endl
-+ << "Please read the documentation for information on how to "
-+ << "remedy this." << endl << endl;
-+ */
-+ }
-+ else {
-+ config.realtime = 1;
-+#ifdef _DEBUG
-+ cout << "main: scheduling priority is " << sched.sched_priority << endl;
-+#endif
-+ }
-+}
-+
-+
-+void *midi_thread(void *arg)
-+{
-+#ifdef _DEBUG
-+ cout << "midi_thread() starting" << endl;
-+#endif
-+ int foo = (int) arg;
-+ foo = 0;
-+ // run midi thread with real-time priority
-+ /* if we don't do this, the audio thread can lock the system due to its
-+ * priority. if the midi thread has same priority, it can still control
-+ * the audio thread, and the system can return to normal when voices are
-+ * deleted. */
-+ sched_realtime();
-+ midi_controller->run();
-+#ifdef _DEBUG
-+ cout << "midi_thread() terminated" << endl;
-+#endif
-+ pthread_exit(0);
-+}
-+
-+void *gui_thread(void *arg)
-+// it would be nice to have a GUI thread, so it could run without GUI...
-+{
-+#ifdef _DEBUG
-+ cout << "gui_thread() starting" << endl;
-+#endif
-+ int foo = (int) arg;
-+ foo = 0; // not useful - just gets rid of compiler warning
-+ //kit->run();
-+#ifdef _DEBUG
-+ cout << "gui_thread() terminated" << endl;
-+#endif
-+ pthread_exit(0);
-+}
-+
-+
-+void *audio_thread(void *arg)
-+{
-+#ifdef _DEBUG
-+ cout << "audio_thread() starting" << endl;
-+#endif
-+ int foo = (int) arg;
-+ foo = 0;
-+
-+ // set realtime priority for this (the audio) thread.
-+ sched_realtime();
-+ out->run();
-+#ifdef _DEBUG
-+ cout << "audio_thread() terminated" << endl;
-+#endif
-+ pthread_exit(0);
-+}
-+
-+void
-+pipe_event( void *arg, int foo, GdkInputCondition ic )
-+{
-+ gui->serve_request();
-+}
-+
-+int main( int argc, char *argv[] )
-+{
-+ std::cout <<
-+"amSynth 1.0.0\n\
-+Copyright 2001-2004 Nick Dowell and others.\n\
-+amSynth comes with ABSOLUTELY NO WARRANTY\n\
-+This is free software, and you are welcome to redistribute it\n\
-+under certain conditions; see the file COPYING for details\n";
-+
-+ if( pipe( the_pipe ) ) cout << "pipe() error\n";
-+ int jack = 0;
-+ int enable_audio = 1;
-+ int enable_gui = 1;
-+
-+
-+ int opt;
-+ while( (opt=getopt(argc, argv, "vhstdm:c:a:r:p:b:"))!= -1 ) {
-+ switch(opt) {
-+ case 'v':
-+ cout << "amSynth " << VERSION << " -- compiled "
-+ << __DATE__ << " " << __TIME__ << endl;
-+ return 0;
-+ case 'h':
-+ cout << help_text;
-+ return 0;
-+ case 's':
-+ enable_audio = 0;
-+ break;
-+ case 't':
-+ enable_gui = 0;
-+ break;
-+ default:
-+ break;
-+ }
-+ }
-+
-+
-+ // setup the configuration
-+ config.Defaults ();
-+ config.load ();
-+ config.ParseCOpts (argc, argv);
-+
-+ if (config.debug_drivers)
-+ cout << "\n*** CONFIGURATION:\n"
-+ << "MIDI:- driver:" << config.midi_driver
-+ << " channel:" << config.midi_channel << endl
-+ << "AUDIO:- driver:" << config.audio_driver
-+ << " sample rate:" << config.sample_rate << endl;
-+
-+ string amsynth_bank_file = config.current_bank_file;
-+
-+ presetController = new PresetController();
-+
-+
-+ //
-+ // initialise audio
-+ //
-+ if (config.debug_drivers) std::cerr << "\n\n*** INITIALISING AUDIO ENGINE...\n";
-+
-+ if (enable_audio)
-+ {
-+ if (config.audio_driver=="jack"||config.audio_driver=="JACK")
-+ {
-+ jack = 1;
-+ out = new JackOutput();
-+ if (((JackOutput*)out)->init (config)!=0)
-+ {
-+ std::cerr << ((JackOutput*)out)->get_error_msg() << "\n";
-+ std::cerr << "** failed to initialise JACK... aborting :'( **\n";
-+ exit (10);
-+ }
-+ }
-+ else if (config.audio_driver=="auto"||config.audio_driver=="AUTO")
-+ {
-+ jack = 1;
-+ out = new JackOutput();
-+ if (((JackOutput*)out)->init (config)!=0)
-+ {
-+ jack = 0;
-+ out = new AudioOutput();
-+ }
-+ }
-+ else
-+ {
-+ out = new AudioOutput();
-+ }
-+
-+ if (jack==0) if (out->init (config) != 0)
-+ {
-+ std::cerr << "failed to open any audio device\n\n";
-+ exit (-1);
-+ }
-+ }
-+
-+ vau = new VoiceAllocationUnit;
-+ vau->SetSampleRate (config.sample_rate);
-+ vau->SetMaxVoices (config.polyphony);
-+ if (enable_audio) out->setInput( vau );
-+
-+ presetController->loadPresets(config.current_bank_file.c_str());
-+
-+ int audio_res;
-+ if( enable_audio )
-+ {
-+ if (jack) out->run();
-+ else audio_res =
-+ pthread_create(&audioThread, NULL, audio_thread, NULL);
-+ }
-+
-+ if (config.debug_drivers) std::cerr << "*** DONE :)\n";
-+
-+
-+ //
-+ // init midi
-+ //
-+ if (config.debug_drivers) std::cerr << "\n\n*** INITIALISING MIDI ENGINE...\n";
-+
-+ if (enable_audio)
-+ {
-+ config.alsa_seq_client_name = out->getTitle();
-+ midi_controller = new MidiController( config );
-+ }
-+ else
-+ midi_controller = new MidiController( config );
-+
-+ if (midi_controller->init () != 0)
-+ {
-+ std::cerr << "failed to open any midi device\n\n";
-+ exit (-1);
-+ }
-+
-+ int midi_res;
-+ if (enable_gui) midi_res =
-+ pthread_create( &midiThread, NULL, midi_thread, NULL );
-+ if (config.debug_drivers) std::cerr << "*** DONE :)\n\n";
-+
-+ // need to drop our suid-root permissions :-
-+ // GTK will not work SUID for security reasons..
-+ setreuid( getuid(), getuid() );
-+ setregid( getgid(), getgid() );
-+
-+ midi_controller->setVAU( *vau );
-+ midi_controller->setPresetController( *presetController );
-+
-+ presetController->getCurrentPreset().AddListenerToAll (vau);
-+
-+ if (enable_gui==1)
-+ {
-+ Gtk::Main kit( &argc, &argv ); // this can be called SUID
-+
-+ // make GDK loop read events from the pipe
-+ gdk_input_add( the_pipe[0], GDK_INPUT_READ, &pipe_event, (void*)NULL );
-+
-+ // give audio/midi threads time to start up first..
-+ if (enable_audio && jack) sleep( 1 );
-+
-+ // this can be called SUID:
-+ if (enable_audio)
-+ gui = new GUI( config, *midi_controller, *vau, the_pipe, out, out->getTitle() );
-+ else
-+ gui = new GUI( config, *midi_controller, *vau, the_pipe, 0, (const char*)"amSynth (silent)" );
-+ gui->setPresetController( *presetController );
-+ gui->init();
-+ if (config.xfontname!="")
-+ {
-+ gui->set_x_font ( config.xfontname.c_str() );
-+ }
-+
-+ // cannot be called SUID:
-+ kit.run();
-+ }
-+ else midi_controller->run();
-+
-+
-+#ifdef _DEBUG
-+ cout << "main() : GUI was terminated, shutting down cleanly.." << endl;
-+#endif
-+
-+ /*
-+ * code to shut down cleanly..
-+ */
-+
-+ config.xfontname = gui->get_x_font ();
-+ config.save ();
-+
-+ presetController->savePresets(config.current_bank_file.c_str ());
-+ midi_controller->saveConfig();
-+
-+ if(enable_audio)
-+ {
-+ out->stop();
-+ if (!jack) audio_res = pthread_join(audioThread, NULL);
-+#ifdef _DEBUG
-+ cout << "joined audioThread" << endl;
-+#endif
-+ }
-+
-+ if (config.xruns)
-+ std::cerr << config.xruns << " audio buffer underruns occurred\n";
-+
-+ midi_controller->stop();
-+ // we probably need to kill the midi thread, as it is always waiting for
-+ // a new midi event..
-+ midi_res = pthread_kill( midiThread, 2 );
-+ midi_res = pthread_join( midiThread, NULL );
-+#ifdef _DEBUG
-+ cout << "joined midiThread" << endl;
-+#endif
-+ delete presetController;
-+ delete midi_controller;
-+ delete vau;
-+ delete out;
-+ return 0;
-+}
diff --git a/debian/patches/30_void-to-int.dpatch b/debian/patches/30_void-to-int.dpatch
deleted file mode 100644
index a0f0622..0000000
--- a/debian/patches/30_void-to-int.dpatch
+++ /dev/null
@@ -1,358 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_void-to-int.dpatch by Free Ekanayaka <free at agnula.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./src/main.cc /tmp/dpep-work.1LlXiH/amsynth-1.0.0+1.0.1cvs/src/main.cc
---- ./src/main.cc 2005-09-05 10:40:05.000000000 +0200
-+++ /tmp/dpep-work.1LlXiH/amsynth-1.0.0+1.0.1cvs/src/main.cc 2005-09-05 10:40:45.000000000 +0200
-@@ -48,7 +48,7 @@
- #ifdef _DEBUG
- cout << "midi_thread() starting" << endl;
- #endif
-- int foo = (int) arg;
-+ long foo = (long) arg;
- foo = 0;
- // run midi thread with real-time priority
- /* if we don't do this, the audio thread can lock the system due to its
-@@ -69,7 +69,7 @@
- #ifdef _DEBUG
- cout << "gui_thread() starting" << endl;
- #endif
-- int foo = (int) arg;
-+ long foo = (long) arg;
- foo = 0; // not useful - just gets rid of compiler warning
- //kit->run();
- #ifdef _DEBUG
-@@ -84,7 +84,7 @@
- #ifdef _DEBUG
- cout << "audio_thread() starting" << endl;
- #endif
-- int foo = (int) arg;
-+ long foo = (long) arg;
- foo = 0;
-
- // set realtime priority for this (the audio) thread.
-diff -urNad --exclude=CVS --exclude=.svn ./src/main.cc~ /tmp/dpep-work.1LlXiH/amsynth-1.0.0+1.0.1cvs/src/main.cc~
---- ./src/main.cc~ 2005-09-05 10:40:05.000000000 +0200
-+++ /tmp/dpep-work.1LlXiH/amsynth-1.0.0+1.0.1cvs/src/main.cc~ 1970-01-01 01:00:00.000000000 +0100
-@@ -1,317 +0,0 @@
--/* amSynth
-- * (c) 2001-2005 Nick Dowell
-- */
--
--#include "main.h"
--#include "../config.h"
--
--#include <gtkmm/main.h>
--#include <pthread.h>
--#include <iostream>
--#include <fstream>
--#include <unistd.h>
--
--int the_pipe[2];
--
--void sched_realtime()
--{
-- struct sched_param sched;
--
-- sched.sched_priority = 50;
-- int foo = sched_setscheduler(0, SCHED_FIFO, &sched);
-- sched_getparam(0, &sched);
--
-- if (foo) {
-- config.realtime = 0;
-- /*
-- cout << endl << " - - WARNING - -" << endl
-- << " amSynth could not set realtime priority." << endl
-- << "You may experience audio buffer underruns "
-- << "resulting in 'clicks' in the audio." << endl
-- << "This is most likely because the program is not SUID root." << endl
-- << "Please read the documentation for information on how to "
-- << "remedy this." << endl << endl;
-- */
-- }
-- else {
-- config.realtime = 1;
--#ifdef _DEBUG
-- cout << "main: scheduling priority is " << sched.sched_priority << endl;
--#endif
-- }
--}
--
--
--void *midi_thread(void *arg)
--{
--#ifdef _DEBUG
-- cout << "midi_thread() starting" << endl;
--#endif
-- int foo = (int) arg;
-- foo = 0;
-- // run midi thread with real-time priority
-- /* if we don't do this, the audio thread can lock the system due to its
-- * priority. if the midi thread has same priority, it can still control
-- * the audio thread, and the system can return to normal when voices are
-- * deleted. */
-- sched_realtime();
-- midi_controller->run();
--#ifdef _DEBUG
-- cout << "midi_thread() terminated" << endl;
--#endif
-- pthread_exit(0);
--}
--
--void *gui_thread(void *arg)
--// it would be nice to have a GUI thread, so it could run without GUI...
--{
--#ifdef _DEBUG
-- cout << "gui_thread() starting" << endl;
--#endif
-- int foo = (int) arg;
-- foo = 0; // not useful - just gets rid of compiler warning
-- //kit->run();
--#ifdef _DEBUG
-- cout << "gui_thread() terminated" << endl;
--#endif
-- pthread_exit(0);
--}
--
--
--void *audio_thread(void *arg)
--{
--#ifdef _DEBUG
-- cout << "audio_thread() starting" << endl;
--#endif
-- int foo = (int) arg;
-- foo = 0;
--
-- // set realtime priority for this (the audio) thread.
-- sched_realtime();
-- out->run();
--#ifdef _DEBUG
-- cout << "audio_thread() terminated" << endl;
--#endif
-- pthread_exit(0);
--}
--
--void
--pipe_event( void *arg, int foo, GdkInputCondition ic )
--{
-- gui->serve_request();
--}
--
--int main( int argc, char *argv[] )
--{
-- std::cout <<
--"amSynth 1.0.0\n\
--Copyright 2001-2004 Nick Dowell and others.\n\
--amSynth comes with ABSOLUTELY NO WARRANTY\n\
--This is free software, and you are welcome to redistribute it\n\
--under certain conditions; see the file COPYING for details\n";
--
-- if( pipe( the_pipe ) ) cout << "pipe() error\n";
-- int jack = 0;
-- int enable_audio = 1;
-- int enable_gui = 1;
--
--
-- int opt;
-- while( (opt=getopt(argc, argv, "vhstdm:c:a:r:p:b:"))!= -1 ) {
-- switch(opt) {
-- case 'v':
-- cout << "amSynth " << VERSION << " -- compiled "
-- << __DATE__ << " " << __TIME__ << endl;
-- return 0;
-- case 'h':
-- cout << help_text;
-- return 0;
-- case 's':
-- enable_audio = 0;
-- break;
-- case 't':
-- enable_gui = 0;
-- break;
-- default:
-- break;
-- }
-- }
--
--
-- // setup the configuration
-- config.Defaults ();
-- config.load ();
-- config.ParseCOpts (argc, argv);
--
-- if (config.debug_drivers)
-- cout << "\n*** CONFIGURATION:\n"
-- << "MIDI:- driver:" << config.midi_driver
-- << " channel:" << config.midi_channel << endl
-- << "AUDIO:- driver:" << config.audio_driver
-- << " sample rate:" << config.sample_rate << endl;
--
-- string amsynth_bank_file = config.current_bank_file;
--
-- presetController = new PresetController();
--
--
-- //
-- // initialise audio
-- //
-- if (config.debug_drivers) std::cerr << "\n\n*** INITIALISING AUDIO ENGINE...\n";
--
-- if (enable_audio)
-- {
-- if (config.audio_driver=="jack"||config.audio_driver=="JACK")
-- {
-- jack = 1;
-- out = new JackOutput();
-- if (((JackOutput*)out)->init (config)!=0)
-- {
-- std::cerr << ((JackOutput*)out)->get_error_msg() << "\n";
-- std::cerr << "** failed to initialise JACK... aborting :'( **\n";
-- exit (10);
-- }
-- }
-- else if (config.audio_driver=="auto"||config.audio_driver=="AUTO")
-- {
-- jack = 1;
-- out = new JackOutput();
-- if (((JackOutput*)out)->init (config)!=0)
-- {
-- jack = 0;
-- out = new AudioOutput();
-- }
-- }
-- else
-- {
-- out = new AudioOutput();
-- }
--
-- if (jack==0) if (out->init (config) != 0)
-- {
-- std::cerr << "failed to open any audio device\n\n";
-- exit (-1);
-- }
-- }
--
-- vau = new VoiceAllocationUnit;
-- vau->SetSampleRate (config.sample_rate);
-- vau->SetMaxVoices (config.polyphony);
-- if (enable_audio) out->setInput( vau );
--
-- presetController->loadPresets(config.current_bank_file.c_str());
--
-- int audio_res;
-- if( enable_audio )
-- {
-- if (jack) out->run();
-- else audio_res =
-- pthread_create(&audioThread, NULL, audio_thread, NULL);
-- }
--
-- if (config.debug_drivers) std::cerr << "*** DONE :)\n";
--
--
-- //
-- // init midi
-- //
-- if (config.debug_drivers) std::cerr << "\n\n*** INITIALISING MIDI ENGINE...\n";
--
-- if (enable_audio)
-- {
-- config.alsa_seq_client_name = out->getTitle();
-- midi_controller = new MidiController( config );
-- }
-- else
-- midi_controller = new MidiController( config );
--
-- if (midi_controller->init () != 0)
-- {
-- std::cerr << "failed to open any midi device\n\n";
-- exit (-1);
-- }
--
-- int midi_res;
-- if (enable_gui) midi_res =
-- pthread_create( &midiThread, NULL, midi_thread, NULL );
-- if (config.debug_drivers) std::cerr << "*** DONE :)\n\n";
--
-- // need to drop our suid-root permissions :-
-- // GTK will not work SUID for security reasons..
-- setreuid( getuid(), getuid() );
-- setregid( getgid(), getgid() );
--
-- midi_controller->setVAU( *vau );
-- midi_controller->setPresetController( *presetController );
--
-- presetController->getCurrentPreset().AddListenerToAll (vau);
--
-- if (enable_gui==1)
-- {
-- Gtk::Main kit( &argc, &argv ); // this can be called SUID
--
-- // make GDK loop read events from the pipe
-- gdk_input_add( the_pipe[0], GDK_INPUT_READ, &pipe_event, (void*)NULL );
--
-- // give audio/midi threads time to start up first..
-- if (enable_audio && jack) sleep( 1 );
--
-- // this can be called SUID:
-- if (enable_audio)
-- gui = new GUI( config, *midi_controller, *vau, the_pipe, out, out->getTitle() );
-- else
-- gui = new GUI( config, *midi_controller, *vau, the_pipe, 0, (const char*)"amSynth (silent)" );
-- gui->setPresetController( *presetController );
-- gui->init();
-- if (config.xfontname!="")
-- {
-- gui->set_x_font ( config.xfontname.c_str() );
-- }
--
-- // cannot be called SUID:
-- kit.run();
-- }
-- else midi_controller->run();
--
--
--#ifdef _DEBUG
-- cout << "main() : GUI was terminated, shutting down cleanly.." << endl;
--#endif
--
-- /*
-- * code to shut down cleanly..
-- */
--
-- config.xfontname = gui->get_x_font ();
-- config.save ();
--
-- presetController->savePresets(config.current_bank_file.c_str ());
-- midi_controller->saveConfig();
--
-- if(enable_audio)
-- {
-- out->stop();
-- if (!jack) audio_res = pthread_join(audioThread, NULL);
--#ifdef _DEBUG
-- cout << "joined audioThread" << endl;
--#endif
-- }
--
-- if (config.xruns)
-- std::cerr << config.xruns << " audio buffer underruns occurred\n";
--
-- midi_controller->stop();
-- // we probably need to kill the midi thread, as it is always waiting for
-- // a new midi event..
-- midi_res = pthread_kill( midiThread, 2 );
-- midi_res = pthread_join( midiThread, NULL );
--#ifdef _DEBUG
-- cout << "joined midiThread" << endl;
--#endif
-- delete presetController;
-- delete midi_controller;
-- delete vau;
-- delete out;
-- return 0;
--}
diff --git a/debian/patches/40_skip-edit-config.dpatch b/debian/patches/40_skip-edit-config.dpatch
deleted file mode 100644
index 34251ad..0000000
--- a/debian/patches/40_skip-edit-config.dpatch
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_data-dir.dpatch by Free Ekanayaka <free at agnula.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./src/amSynth.in.2 /tmp/dpep-work.B02au7/amsynth-1.0.0+1.0.1cvs/src/amSynth.in.2
---- ./src/amSynth.in.2 2005-09-05 10:54:51.000000000 +0200
-+++ /tmp/dpep-work.B02au7/amsynth-1.0.0+1.0.1cvs/src/amSynth.in.2 2005-09-05 11:21:54.000000000 +0200
-@@ -3,7 +3,6 @@
-
-
- INST=no
--EDFAIL=no
-
- #
- # copy default config file if needed, and launch editor to edit it
-@@ -16,21 +15,8 @@
- echo "*********************************************************"
- echo ""
- echo "copying default configuration file to ~/.amSynthrc"
--echo "launching editor now, please set config file up for your system"
- cp $DATADIR/rc ~/.amSynthrc
--gedit 1>/dev/null 2>/dev/null 3>/dev/null ~/.amSynthrc ||\
--kwrite 1>/dev/null 2>/dev/null 3>/dev/null ~/.amSynthrc ||\
--nedit 1>/dev/null 2>/dev/null 3>/dev/null ~/.amSynthrc ||\
--xedit 1>/dev/null 2>/dev/null 3>/dev/null ~/.amSynthrc ||\
--EDFAIL=yes
--fi
--
--#
--# quit if we tried to launch an editor and it failed
--#
--if test $EDFAIL = "yes"; then
--echo "couldnt launch an editor, please edit config file by hand before next run"
--exit
-+echo "if you would like to configure amSynth, please edit ~/.amSynthrc"
- fi
-
- #
diff --git a/debian/patches/50_new-instance.dpatch b/debian/patches/50_new-instance.dpatch
deleted file mode 100644
index 4826665..0000000
--- a/debian/patches/50_new-instance.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_new-instance.dpatch by Free Ekanayaka <free at agnula.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./src/GUI/GUI.cc /tmp/dpep-work.o8L4Zx/amsynth-1.0.0+1.0.1cvs/src/GUI/GUI.cc
---- ./src/GUI/GUI.cc 2005-09-05 10:34:05.000000000 +0200
-+++ /tmp/dpep-work.o8L4Zx/amsynth-1.0.0+1.0.1cvs/src/GUI/GUI.cc 2005-09-05 10:53:52.000000000 +0200
-@@ -306,7 +306,7 @@
- //
- Menu *menu_file = manage (new Menu());
- MenuList& list_file = menu_file->items ();
-- list_file.push_back (MenuElem("New Instance", sigc::bind(mem_fun(*this, &GUI::command_run),"amSynth")));
-+ list_file.push_back (MenuElem("New Instance", sigc::bind(mem_fun(*this, &GUI::command_run),"amsynth")));
- list_file.push_back (SeparatorElem());
- list_file.push_back (MenuElem("_Open Bank",Gtk::AccelKey("<control>O"), mem_fun(*this, &GUI::bank_open)));
- // list_file.push_back (MenuElem("_Save Bank","<control>S", mem_fun(*this, &GUI::bank_save)));
diff --git a/debian/patches/60_libexec.dpatch b/debian/patches/60_libexec.dpatch
deleted file mode 100644
index bedc6f8..0000000
--- a/debian/patches/60_libexec.dpatch
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70_libdir.dpatch by Free Ekanayaka <free at agnula.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./src/amSynth.in.2 /tmp/dpep-work.j6YV7V/amsynth-1.0.0+1.0.1cvs/src/amSynth.in.2
---- ./src/amSynth.in.2 2005-09-05 10:54:51.000000000 +0200
-+++ /tmp/dpep-work.j6YV7V/amsynth-1.0.0+1.0.1cvs/src/amSynth.in.2 2005-09-05 11:13:10.000000000 +0200
-@@ -1,4 +1,4 @@
--BINDIR=$PREFIX/libexec
-+BINDIR=$PREFIX/lib/amsynth
- DATADIR=$PREFIX/share/amSynth
-
-
diff --git a/debian/patches/70_signal_h.dpatch b/debian/patches/70_signal_h.dpatch
deleted file mode 100644
index ae156d8..0000000
--- a/debian/patches/70_signal_h.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70_signal_h.dpatch by <root at 64studio>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad amsynth-1.1.0~/src/Thread.h amsynth-1.1.0/src/Thread.h
---- amsynth-1.1.0~/src/Thread.h 2005-10-26 19:45:10.000000000 +0000
-+++ amsynth-1.1.0/src/Thread.h 2005-11-02 23:44:56.467868256 +0000
-@@ -26,6 +26,7 @@
- #define _THREAD_H
-
- #include <pthread.h>
-+#include <signal.h>
-
- class Thread
- {
diff --git a/debian/patches/90_gcc-4.3_fixes.dpatch b/debian/patches/90_gcc-4.3_fixes.dpatch
deleted file mode 100755
index 1b678ec..0000000
--- a/debian/patches/90_gcc-4.3_fixes.dpatch
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_gcc-4.3_fixes.dpatch by Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
---- a/src/Config.cc
-+++ b/src/Config.cc
-@@ -6,6 +6,7 @@
-
- #include <fstream>
- #include <iostream>
-+#include <cstdlib>
-
- using namespace std;
-
---- a/src/MidiController.cc
-+++ b/src/MidiController.cc
-@@ -5,6 +5,7 @@
- #include "MidiController.h"
- #include <fstream>
- #include <assert.h>
-+#include <cstdlib>
-
- using namespace std;
-
---- a/src/Parameter.cc
-+++ b/src/Parameter.cc
-@@ -4,6 +4,8 @@
-
- #include "Parameter.h"
-
-+#include <cstdlib>
-+
- #ifdef _DEBUG
- #include <iostream>
- #endif
---- a/src/VoiceAllocationUnit.cc
-+++ b/src/VoiceAllocationUnit.cc
-@@ -11,6 +11,7 @@
- #include <iostream>
- #include <math.h>
- #include <assert.h>
-+#include <cstring>
-
- using namespace std;
-
---- a/src/drivers/MidiInterface.cc
-+++ b/src/drivers/MidiInterface.cc
-@@ -8,6 +8,7 @@
- #include "OSSMidiDriver.h"
-
- #include <iostream>
-+#include <string.h>
-
- #define MIDI_BUF_SIZE 64
- void sched_realtime (); // defined in main.cc
--
amsynth packaging
More information about the pkg-multimedia-commits
mailing list