hydrogen: Updated to version 0.9.4 Updated to scons install and

fixed DEPENDS.  Closes Bug #15679

9 files changed, 21 insertions, 134 deletions

diff --git a/audio-creation/hydrogen/BUILD b/audio-creation/hydrogen/BUILD
index 18edf61b09..e2696a0590 100755
--- a/audio-creation/hydrogen/BUILD
+++ b/audio-creation/hydrogen/BUILD
@@ -1,5 +1,4 @@
-OPTS="$HYDROGEN_OSS $OPTS"  &&
-if [[ -f /etc/profile.d/qt.sh ]]; then
-  . /etc/profile.d/qt.sh
-fi &&
-default_build
+  QTDIR=/usr    &&
+  PATH=$QTDIR/bin/qt4:$PATH &&
+  export QTDIR=/usr &&
+  scons prefix=$INSTALL_ROOT/usr
diff --git a/audio-creation/hydrogen/DEPENDS b/audio-creation/hydrogen/DEPENDS
index 0bf0881dae..2f6d0a8e9b 100755
--- a/audio-creation/hydrogen/DEPENDS
+++ b/audio-creation/hydrogen/DEPENDS
@@ -1,28 +1,16 @@
-depends  qt-x11      &&
-depends  audiofile   &&
+depends  qt4         &&
+depends  scons       &&
 depends  libsndfile  &&
-
-optional_depends  JACK-DRIVER               \
-                  "--enable-jack-support"   \
-                  "--disable-jack-support"  \
-                  "for JACK support"        &&
+depends JACK-DRIVER  &&
+depends libtar       &&
+depends liblrdf      &&
 
 optional_depends  alsa-lib            \
                   "--enable-alsa"     \
                   "--disable-alsa"    \
                   "for ALSA support"  &&
 
-optional_depends  ladspa                \
-                  "--enable-ladspa"     \
-                  "--disable-ladspa"    \
-                  "for LADSPA support"  &&
-
 optional_depends  flac  	            \
                   "--enable-flac-support"   \
                   "--disable-flac-support"  \
-                  "for flac support"        &&
-
-optional_depends  liblrdf  	            \
-                  "--enable-lrdf-support"   \
-                  "--disable-lrdf-support"  \
-                  "for LRDF support"
+                  "for flac support" 
diff --git a/audio-creation/hydrogen/DETAILS b/audio-creation/hydrogen/DETAILS
index 28abf73670..a9bf29e223 100755
--- a/audio-creation/hydrogen/DETAILS
+++ b/audio-creation/hydrogen/DETAILS
@@ -1,9 +1,9 @@
            SPELL=hydrogen
-         VERSION=0.9.3
+         VERSION=0.9.4
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:d25becb06758fe40c256049315f61b4e5173fdfeb9ba87814cbccb1520b6111bf94bc745a8d730fdc9fd0d155f4ad88784d6906b0d2b87b74829edb878852c44
+     SOURCE_HASH=sha512:d36f483698f6c21dec0e7afeeab1def1523282e601f42e0a071228f2b6f24c249c476f14ddba16fc9b3e6844e98c799a0f2fbcb9e9c9e37b3aa62f934f6ed715
         WEB_SITE=http://www.hydrogen-music.org
          ENTERED=20031217
       LICENSE[0]=GPL
diff --git a/audio-creation/hydrogen/HISTORY b/audio-creation/hydrogen/HISTORY
index 3f191893bd..30572a9acb 100644
--- a/audio-creation/hydrogen/HISTORY
+++ b/audio-creation/hydrogen/HISTORY
@@ -1,3 +1,11 @@
+2010-04-24 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated to version 0.9.4
+	* PRE_BUILD: Removed
+	* DEPENDS: Removed depends audiofile. Now depends scons and qt4
+	  depends liblrdf and libtar
+	* BUILD: Use scons
+	* INSTALL: Added to use scons
+
 2008-04-13 Eric Sandall <sandalle@sourcemage.org>
 	* PRE_BUILD: Apply gcc43.patch
 	  Apply flac.patch (Fixes Bug #14078
diff --git a/audio-creation/hydrogen/INSTALL b/audio-creation/hydrogen/INSTALL
new file mode 100755
index 0000000000..9f0c0eb126
--- /dev/null
+++ b/audio-creation/hydrogen/INSTALL
@@ -0,0 +1 @@
+scons install
diff --git a/audio-creation/hydrogen/PRE_BUILD b/audio-creation/hydrogen/PRE_BUILD
deleted file mode 100755
index 9c79c4309d..0000000000
--- a/audio-creation/hydrogen/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build     &&
-cd $SOURCE_DIRECTORY  &&
-
-patch -p0 < $SCRIPT_DIRECTORY/gcc4.patch   &&
-patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch  &&
-patch -p1 < $SCRIPT_DIRECTORY/flac.patch
diff --git a/audio-creation/hydrogen/flac.patch b/audio-creation/hydrogen/flac.patch
deleted file mode 100644
index 0e3e16e46f..0000000000
--- a/audio-creation/hydrogen/flac.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From Anthony Hillairet <anthony@hillairet.org>
-Bug http://bugs.sourcemage.org/show_bug.cgi?id=14078
---
-diff -Naur hydrogen-0.9.3.orig/src/lib/FLACFile.cpp hydrogen-0.9.3/src/lib/FLACFile.cpp
---- hydrogen-0.9.3.orig/src/lib/FLACFile.cpp	2008-04-13 10:49:49.000000000 +0000
-+++ hydrogen-0.9.3/src/lib/FLACFile.cpp	2008-04-13 10:49:01.000000000 +0000
-@@ -165,14 +165,13 @@
- 	}
- 
- 	set_metadata_ignore_all();
--	set_filename( sFilename.c_str() );
- 
--	State s=init();
--	if( s != FLAC__FILE_DECODER_OK ) {
-+	FLAC__StreamDecoderInitStatus s = init(sFilename.c_str());
-+	if( s != FLAC__STREAM_DECODER_INIT_STATUS_OK ) {
- 		errorLog( "[load] Error in init()" );
- 	}
- 
--	if ( process_until_end_of_file() == false ) {
-+	if ( process_until_end_of_stream() == false ) {
- 		errorLog( "[load] Error in process_until_end_of_file()" );
- 	}
- }
diff --git a/audio-creation/hydrogen/gcc4.patch b/audio-creation/hydrogen/gcc4.patch
deleted file mode 100644
index 564b6d57c5..0000000000
--- a/audio-creation/hydrogen/gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/xml/tinyxml.h.old	2006-07-20 22:43:50.934852216 +0200
-+++ src/lib/xml/tinyxml.h	2006-07-20 22:45:24.970556616 +0200
-@@ -823,7 +823,7 @@ public:
- #endif
- 
- 	/// Construct.
--	TiXmlDeclaration::TiXmlDeclaration( const char * _version,
-+	TiXmlDeclaration( const char * _version,
- 										const char * _encoding,
- 										const char * _standalone );
- 
diff --git a/audio-creation/hydrogen/gcc43.patch b/audio-creation/hydrogen/gcc43.patch
deleted file mode 100644
index b0f70b4c3b..0000000000
--- a/audio-creation/hydrogen/gcc43.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -Naur hydrogen-0.9.3.orig/src/gui/DrumkitManager.cpp hydrogen-0.9.3/src/gui/DrumkitManager.cpp
---- hydrogen-0.9.3.orig/src/gui/DrumkitManager.cpp	2008-04-13 10:29:07.000000000 +0000
-+++ hydrogen-0.9.3/src/gui/DrumkitManager.cpp	2008-04-13 10:36:33.000000000 +0000
-@@ -22,6 +22,7 @@
-  *
-  */
- #include <qcursor.h>
-+#include <cstdlib>
- 
- #include "config.h"
- #include "Skin.h"
-diff -Naur hydrogen-0.9.3.orig/src/gui/HydrogenApp.cpp hydrogen-0.9.3/src/gui/HydrogenApp.cpp
---- hydrogen-0.9.3.orig/src/gui/HydrogenApp.cpp	2008-04-13 10:29:07.000000000 +0000
-+++ hydrogen-0.9.3/src/gui/HydrogenApp.cpp	2008-04-13 10:38:19.000000000 +0000
-@@ -51,6 +51,8 @@
- #include <qhbox.h>
- #include <qdir.h>
- 
-+#include <cstdlib>
-+
- HydrogenApp* HydrogenApp::m_pInstance = NULL;
- 
- HydrogenApp::HydrogenApp( MainForm *pMainForm, Song *pFirstSong )
-diff -Naur hydrogen-0.9.3.orig/src/gui/main.cpp hydrogen-0.9.3/src/gui/main.cpp
---- hydrogen-0.9.3.orig/src/gui/main.cpp	2008-04-13 10:29:07.000000000 +0000
-+++ hydrogen-0.9.3/src/gui/main.cpp	2008-04-13 10:39:58.000000000 +0000
-@@ -43,6 +43,8 @@
- #include "lib/Exception.h"
- 
- #include <iostream>
-+#include <cstdlib>
-+
- using namespace std;
- 
- void showInfo();
-diff -Naur hydrogen-0.9.3.orig/src/lib/FLACFile.cpp hydrogen-0.9.3/src/lib/FLACFile.cpp
---- hydrogen-0.9.3.orig/src/lib/FLACFile.cpp	2008-04-13 10:29:07.000000000 +0000
-+++ hydrogen-0.9.3/src/lib/FLACFile.cpp	2008-04-13 10:45:11.000000000 +0000
-@@ -27,6 +27,7 @@
- 
- #include <vector>
- #include <fstream>
-+#include <cstring>
- 
- #ifdef FLAC_SUPPORT
- 
-diff -Naur hydrogen-0.9.3.orig/src/lib/drivers/OssDriver.cpp hydrogen-0.9.3/src/lib/drivers/OssDriver.cpp
---- hydrogen-0.9.3.orig/src/lib/drivers/OssDriver.cpp	2008-04-13 10:29:07.000000000 +0000
-+++ hydrogen-0.9.3/src/lib/drivers/OssDriver.cpp	2008-04-13 10:31:49.000000000 +0000
-@@ -30,6 +30,7 @@
- #include "../Preferences.h"
- 
- #include <pthread.h>
-+#include <cstring>
- 
- audioProcessCallback ossDriver_audioProcessCallback;
- bool ossDriver_running;
-diff -Naur hydrogen-0.9.3.orig/src/tools/HydrogenPlayer.cpp hydrogen-0.9.3/src/tools/HydrogenPlayer.cpp
---- hydrogen-0.9.3.orig/src/tools/HydrogenPlayer.cpp	2008-04-13 10:29:07.000000000 +0000
-+++ hydrogen-0.9.3/src/tools/HydrogenPlayer.cpp	2008-04-13 10:36:39.000000000 +0000
-@@ -27,6 +27,7 @@
- 
- #include <iostream>
- #include <stdio.h>
-+#include <cstdlib>
- #include <string>
- 
- #include "lib/Hydrogen.h"