hydrogen: fix things by updating to 0.9.6.1

6 files changed, 51 insertions, 21 deletions

diff --git a/audio-creation/hydrogen/BUILD b/audio-creation/hydrogen/BUILD
index 34a629c2b7..3599c4e5bd 100755
--- a/audio-creation/hydrogen/BUILD
+++ b/audio-creation/hydrogen/BUILD
@@ -1,4 +1,5 @@
-  QTDIR=/usr    &&
-  PATH=$QTDIR/bin/qt4:$PATH &&
-  export QTDIR=/usr/bin/qt4 && # ????? it runs /usr/bin/uic otherwise
-  scons prefix=$INSTALL_ROOT/usr
+export QTDIR=$QT4DIR  &&
+# Refuses to use ladspa unless path to plugins specified.
+export LADSPA_PATH=$INSTALL_ROOT/usr/lib/ladspa &&
+OPTS+=" $HYDROGEN_OSS" &&
+cmake_build
diff --git a/audio-creation/hydrogen/CONFIGURE b/audio-creation/hydrogen/CONFIGURE
deleted file mode 100755
index 5aacaa60c2..0000000000
--- a/audio-creation/hydrogen/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query_option  HYDROGEN_OSS  "Compile with OSS support?"  y     \
-                     "--enable-oss-support"  "--disable-oss-support"
diff --git a/audio-creation/hydrogen/DEPENDS b/audio-creation/hydrogen/DEPENDS
index 914f7f38a7..bda2606e19 100755
--- a/audio-creation/hydrogen/DEPENDS
+++ b/audio-creation/hydrogen/DEPENDS
@@ -1,17 +1,45 @@
 depends -sub CXX gcc &&
 depends  qt4         &&
-depends  scons       &&
+depends  cmake       &&
 depends  libsndfile  &&
-depends JACK-DRIVER  &&
-depends libtar       &&
-depends liblrdf      &&
+
+optional_depends  libarchive \
+                  "-DWANT_LIBARCHIVE=ON" \
+                  "-DWANT_LIBARCHIVE=OFF" \
+                  "libarchive for file access instead of libtar and zlib" &&
+if ! is_depends_enabled $SPELL libarchive; then
+  depends libtar
+fi &&
+
+optional_depends  liblrdf \
+                  "-DWANT_LRDF=ON" \
+                  "-DWANT_LRDF=OFF" \
+                  "for ladspa plugins (triggers plain ladspa dependency, too)" &&
+if is_depends_enabled $SPELL liblrdf; then
+  depends ladspa
+fi &&
+
+optional_depends  JACK-DRIVER \
+                  "-DWANT_JACK=ON" \
+                  "-DWANT_JACK=OFF" \
+                  "for JACK output" &&
 
 optional_depends  alsa-lib            \
-                  "--enable-alsa"     \
-                  "--disable-alsa"    \
-                  "for ALSA support"  &&
+                  "-DWANT_ALSA=ON"     \
+                  "-DWANT_ALSA=OFF"    \
+                  "for ALSA output"  &&
+
+optional_depends  oss  \
+                  "-DWANT_OSS=ON" \
+                  "-DWANT_OSS=OFF" \
+                  "for OSS4 output" &&
+
+optional_depends  pulseaudio \
+                  "-DWANT_PULSEAUDIO=ON" \
+                  "-DWANT_PULSEAUDIO=OFF" \
+                  "for pulseaudio output" &&
 
-optional_depends  flac  	            \
-                  "--enable-flac-support"   \
-                  "--disable-flac-support"  \
-                  "for flac support" 
+optional_depends  lash \
+                  "-DWANT_LASH=ON" \
+                  "-DWANT_LASH=OFF" \
+                  "session handling"
diff --git a/audio-creation/hydrogen/DETAILS b/audio-creation/hydrogen/DETAILS
index 35bf99507d..d60404aa38 100755
--- a/audio-creation/hydrogen/DETAILS
+++ b/audio-creation/hydrogen/DETAILS
@@ -1,9 +1,9 @@
            SPELL=hydrogen
-         VERSION=0.9.5
+         VERSION=0.9.6.1
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:0053f0cb301c541326b66eb416dc548561a973ade993c055e7bc2acbdf28732e627a605061c8b487644026510f5b8395946bba209ddfd19230c960e9bb619f97
+   SOURCE_URL[0]=https://github.com/hydrogen-music/$SPELL/archive/$VERSION.tar.gz
+     SOURCE_HASH=sha512:afb501fb1565a95677aa2702f5d93ee611f03f60dfc8aa5a22714bb261bfeecf2b28e0b591763ec4d1a0b60f8153ef01c3fdfae924ca252943a2396ac953717f
         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 482b3240ab..323cf6e720 100644
--- a/audio-creation/hydrogen/HISTORY
+++ b/audio-creation/hydrogen/HISTORY
@@ -1,3 +1,7 @@
+2016-03-02 Thomas Orgis <sobukus@sourcemage.org>
+	DETAILS, CONFIGURE, DEPENDS, BUILD: update to 0.9.6.1
+	INSTALL: gone
+
 2015-05-25 Thomas Orgis <sobukus@sourcemage.org>
 	* DETAILS: remove SOURCEFORGE_URL usage (automated)
 
diff --git a/audio-creation/hydrogen/INSTALL b/audio-creation/hydrogen/INSTALL
deleted file mode 100755
index 9f0c0eb126..0000000000
--- a/audio-creation/hydrogen/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-scons install