Update to 0.9.2

10 files changed, 41 insertions, 67 deletions

diff --git a/audio/hydrogen/files/patch-hydrogen_gui::InstrumentPropertiesDialog.cpp b/audio/hydrogen/files/patch-hydrogen_gui::InstrumentPropertiesDialog.cpp
deleted file mode 100644
index 6f3745c05c45..000000000000
--- a/audio/hydrogen/files/patch-hydrogen_gui::InstrumentPropertiesDialog.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- hydrogen_gui/InstrumentPropertiesDialog.cpp.orig	Sun Aug 15 19:06:50 2004
-+++ hydrogen_gui/InstrumentPropertiesDialog.cpp	Sun Aug 15 19:07:17 2004
-@@ -42,6 +42,12 @@
- #include "Mixer.h"
- #include "PatternEditorPanel.h"
- 
-+// workaround
-+
-+inline int round(double x) { return x > 0 ? (int) (x+0.5) :
-+-(int)(-x+0.5); }
-+
-+
- InstrumentPropertiesDialog::InstrumentPropertiesDialog( QWidget* parent )
-  : InstrumentPropertiesDialog_UI(parent)
-  , Object( "InstrPropDialog" )
diff --git a/audio/hydrogen/files/patch-hydrogen_gui::PatternEditor.cpp b/audio/hydrogen/files/patch-hydrogen_gui::PatternEditor.cpp
deleted file mode 100644
index 7abcd0390dfe..000000000000
--- a/audio/hydrogen/files/patch-hydrogen_gui::PatternEditor.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- hydrogen_gui/PatternEditor.cpp.orig	Sun Aug 15 19:17:40 2004
-+++ hydrogen_gui/PatternEditor.cpp	Sun Aug 15 19:30:40 2004
-@@ -36,6 +36,7 @@
- #include <assert.h>
- #include "qcursor.h"
- 
-+#include <algo.h>
- 
- PatternEditor::PatternEditor(QWidget* parent, PatternEditorPanel *pPanel)
-  : QWidget(parent, "", WNoAutoErase )
diff --git a/audio/hydrogen/files/patch-hydrogen_gui::SongEditor.cpp b/audio/hydrogen/files/patch-hydrogen_gui::SongEditor.cpp
deleted file mode 100644
index a912ba49f0c4..000000000000
--- a/audio/hydrogen/files/patch-hydrogen_gui::SongEditor.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- hydrogen_gui/SongEditor.cpp.orig	Sun Aug 15 19:31:41 2004
-+++ hydrogen_gui/SongEditor.cpp	Sun Aug 15 19:31:55 2004
-@@ -40,6 +40,8 @@
- #include "qvbox.h"
- #include "qcursor.h"
- 
-+#include <algo.h>
-+
- SongEditorPanel::SongEditorPanel(QWidget *parent)
-  : QWidget(parent)
-  , Object( "SongEditPanel" )
diff --git a/audio/hydrogen/files/patch-lib::Object.h b/audio/hydrogen/files/patch-lib::Object.h
deleted file mode 100644
index c9e2c434ee61..000000000000
--- a/audio/hydrogen/files/patch-lib::Object.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/Object.h.orig	Wed Jun 23 01:10:55 2004
-+++ lib/Object.h	Wed Jun 23 01:11:45 2004
-@@ -31,6 +31,7 @@
- #include <string>
- using std::string;
- using std::map;
-+#include <qglobal.h>
- 
- 
- class Object;
diff --git a/audio/hydrogen/files/patch-lib::PreferencesMng.cpp b/audio/hydrogen/files/patch-lib::PreferencesMng.cpp
deleted file mode 100644
index 9eaa5ed938df..000000000000
--- a/audio/hydrogen/files/patch-lib::PreferencesMng.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/PreferencesMng.cpp.orig	Sun Aug 15 18:53:34 2004
-+++ lib/PreferencesMng.cpp	Sun Aug 15 18:53:45 2004
-@@ -70,7 +70,6 @@
- 	}
- 	else {
- 		m_ladspaPathVect.push_back("/usr/lib/ladspa");
--		m_ladspaPathVect.push_back("/usr/local/lib/ladspa");
- 	}
- 	
- 	recordEvents = false;
diff --git a/audio/hydrogen/files/patch-src_gui_AboutDialog.cpp b/audio/hydrogen/files/patch-src_gui_AboutDialog.cpp
new file mode 100644
index 000000000000..99c34f3c390b
--- /dev/null
+++ b/audio/hydrogen/files/patch-src_gui_AboutDialog.cpp
@@ -0,0 +1,11 @@
+--- src/gui/AboutDialog.cpp.orig	Mon Aug 29 17:14:14 2005
++++ src/gui/AboutDialog.cpp	Mon Aug 29 17:14:51 2005
+@@ -106,7 +106,7 @@
+ 
+ 	sAuthors += "<ul>";
+ 	for ( int i = 0; i < authorList.size(); ++i ) {
+-		Author a = authorList.at( i );
++		Author a = authorList[i];
+ 		sAuthors += "<li><p>";
+ 		sAuthors += "<i>" + a.m_sName + "</i>";
+ 		sAuthors += "</p></li>";
diff --git a/audio/hydrogen/files/patch-src_lib_Object.cpp b/audio/hydrogen/files/patch-src_lib_Object.cpp
new file mode 100644
index 000000000000..f9943337e62e
--- /dev/null
+++ b/audio/hydrogen/files/patch-src_lib_Object.cpp
@@ -0,0 +1,10 @@
+--- src/lib/Object.cpp.orig	Mon Aug 29 02:11:16 2005
++++ src/lib/Object.cpp	Mon Aug 29 02:11:39 2005
+@@ -25,6 +25,7 @@
+ #include "Object.h"
+ #include "config.h"
+ 
++#include <stdio.h>
+ #include <pthread.h>
+ 
+ #ifdef WIN32
diff --git a/audio/hydrogen/files/patch-src_lib_Preferences.cpp b/audio/hydrogen/files/patch-src_lib_Preferences.cpp
new file mode 100644
index 000000000000..c23264db9d0e
--- /dev/null
+++ b/audio/hydrogen/files/patch-src_lib_Preferences.cpp
@@ -0,0 +1,10 @@
+--- src/lib/Preferences.cpp.orig	Mon Aug 29 01:08:31 2005
++++ src/lib/Preferences.cpp	Mon Aug 29 01:15:20 2005
+@@ -80,7 +80,6 @@
+ 	}
+ 	else {
+ 		m_ladspaPathVect.push_back("/usr/lib/ladspa");
+-		m_ladspaPathVect.push_back("/usr/local/lib/ladspa");
+ 	}
+ 
+ 	m_pDefaultUIStyle = new UIStyle();
diff --git a/audio/hydrogen/files/patch-src_lib_drivers_JackDriver.cpp b/audio/hydrogen/files/patch-src_lib_drivers_JackDriver.cpp
new file mode 100644
index 000000000000..f959c3e20488
--- /dev/null
+++ b/audio/hydrogen/files/patch-src_lib_drivers_JackDriver.cpp
@@ -0,0 +1,10 @@
+--- src/lib/drivers/JackDriver.cpp.orig	Mon Aug 29 19:29:16 2005
++++ src/lib/drivers/JackDriver.cpp	Mon Aug 29 19:29:27 2005
+@@ -25,6 +25,7 @@
+ #include "JackDriver.h"
+ #ifdef JACK_SUPPORT
+ 
++#include <stdio.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include "lib/Hydrogen.h"
diff --git a/audio/hydrogen/files/patch-tools::Makefile.in b/audio/hydrogen/files/patch-tools::Makefile.in
deleted file mode 100644
index 89438d4fbe2d..000000000000
--- a/audio/hydrogen/files/patch-tools::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/Makefile.in.orig	Sun Aug 15 18:48:10 2004
-+++ tools/Makefile.in	Sun Aug 15 18:48:16 2004
-@@ -240,7 +240,7 @@
- 
- hydrogenPlayer_SOURCES = hydrogenPlayer.cpp
- hydrogenPlayer_LDADD = ../lib/libhydrogen.a ../lib/xml/libtinyxml.a ../lib/drivers/libdrivers.a ../lib/fx/libfx.a ../lib/smf/libsmf.a
--hydrogenPlayer_LDFLAGS = -ldl $(all_libraries)
-+hydrogenPlayer_LDFLAGS = $(all_libraries)
- 
- hydrogen2midi_SOURCES = hydrogen2midi.cpp
- hydrogen2midi_LDADD = ../lib/libhydrogen.a ../lib/xml/libtinyxml.a ../lib/drivers/libdrivers.a ../lib/fx/libfx.a ../lib/smf/libsmf.a