audio/hydrogen: Updated for version 0.9.6.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

8 files changed, 54 insertions, 106 deletions

diff --git a/audio/hydrogen/README b/audio/hydrogen/README
index 7056665f28..d62ceba161 100644
--- a/audio/hydrogen/README
+++ b/audio/hydrogen/README
@@ -1,7 +1,21 @@
-Hydrogen is an advanced drum machine for GNU/Linux. 
-It's main goal is to bring professional yet simple 
-and intuitive pattern-based drum programming. 
+Hydrogen ( Advanced drum machine )
 
-rubberband, portaudio and portmidi are optional
-dependencies.
-PORTAUDIO=yes enables portmidi support.
+Hydrogen is an advanced drum machine for GNU/Linux.  It's main goal
+is to bring professional yet simple and intuitive pattern-based drum
+programming.
+
+Optional dependencies:
+
+* JACK
+* JACKSESSION
+* CoreAudio
+* CoreMidi
+* PortAudio
+* PortMidi
+* PulseAudio
+* LASH
+* LIBLRDF
+* RUBBERBAND
+* LADSPA_SDK
+
+These will be found automatically.
diff --git a/audio/hydrogen/doinst.sh b/audio/hydrogen/doinst.sh
index 124fa3f186..4869d510e3 100644
--- a/audio/hydrogen/doinst.sh
+++ b/audio/hydrogen/doinst.sh
@@ -8,3 +8,7 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
    fi
 fi
 
+if [ -x /sbin/setcap ]; then
+    /sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/hydrogen
+fi
+
diff --git a/audio/hydrogen/hydrogen.SlackBuild b/audio/hydrogen/hydrogen.SlackBuild
index 999ef5f7e0..0c25981ebe 100644
--- a/audio/hydrogen/hydrogen.SlackBuild
+++ b/audio/hydrogen/hydrogen.SlackBuild
@@ -1,8 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for hydrogen
-
-# Copyright 2009-2011  David Woodfall <dave@dawoodfall.net>
+# Copyright 2013 Dave Woodfall <dave@dawoodfall.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +21,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Thanks to Urchlay for the optional deps ideas
-
 PRGNAM=hydrogen
-VERSION=${VERSION:-0.9.5.1}
+VERSION=${VERSION:-0.9.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,7 +59,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -71,41 +68,33 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-if [ "${PORTAUDIO:-no}" = "yes" ]; then
-  patch --verbose -p0 < patches/portaudio.patch
-  EXTRACONF="portaudio=1 portmidi=1"
-fi
-
-if [ "${LASH:-yes}" = "yes" ]; then
-  EXTRACONF="$EXTRACONF lash=1"
-fi
-
-if [ "${JACK:-yes}" = "yes" ]; then
-  EXTRACONF="$EXTRACONF jack=1"
-else
-  EXTRACONF="$EXTRACONF jack=0"
-fi
-
-patch --verbose -p1 < $CWD/patches/sconstruct-install-images.patch
-patch --verbose -p1 < $CWD/patches/sconstruct-raptor2.patch
-patch --verbose -p1 < $CWD/patches/gcc47.patch
-
-QTDIR=$QT4DIR \
-scons \
-  prefix=/usr \
-  oss=0 \
-  libarchive=1 \
-  optflags="$SLKCFLAGS" \
-  $EXTRACONF
-
-QTDIR=$QT4DIR \
-scons install DESTDIR=$PKG
+mkdir build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DWANT_LASH=ON \
+    -DWANT_LRDF=ON \
+    -DWANT_PORTAUDIO=ON \
+    -DWANT_PORTMIDI=ON \
+    -DWANT_RUBBERBAND=ON \
+    -DLADSPA_LIBRARIES=/usr/lib$LIBDIRSUFIX/ladspa \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+mkdir -p $PKG/usr/share/icons/hicolor/scalable/categories
+cp data/img/gray/h2-icon.svg \
+    $PKG/usr/share/icons/hicolor/scalable/categories
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog README.txt COPYING DEVELOPERS INSTALL.txt \
+cp -a AUTHORS COPYING ChangeLog INSTALL.txt README.txt *.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/audio/hydrogen/hydrogen.info b/audio/hydrogen/hydrogen.info
index a368601c8b..d02ad5ae73 100644
--- a/audio/hydrogen/hydrogen.info
+++ b/audio/hydrogen/hydrogen.info
@@ -1,10 +1,10 @@
 PRGNAM="hydrogen"
-VERSION="0.9.5.1"
+VERSION="0.9.6.1"
 HOMEPAGE="http://www.hydrogen-music.org/"
-DOWNLOAD="http://downloads.sourceforge.net/hydrogen/hydrogen-0.9.5.1.tar.gz"
-MD5SUM="52f3a528705818c65acf546a3be4c6fb"
+DOWNLOAD="https://github.com/hydrogen-music/hydrogen/archive/0.9.6.1.tar.gz"
+MD5SUM="527a44eec22fd31f55e6b3cf1089613d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lash liblrdf libtar scons"
+REQUIRES="ladspa_sdk"
 MAINTAINER="David Woodfall"
 EMAIL="dave@dawoodfall.net"
diff --git a/audio/hydrogen/patches/gcc47.patch b/audio/hydrogen/patches/gcc47.patch
deleted file mode 100644
index 13cf39469d..0000000000
--- a/audio/hydrogen/patches/gcc47.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur a/gui/src/MainForm.cpp b/gui/src/MainForm.cpp
---- a/gui/src/MainForm.cpp	2012-02-19 21:54:05.000000000 +0000
-+++ b/gui/src/MainForm.cpp	2014-11-28 09:13:01.930327087 +0000
-@@ -20,6 +20,7 @@
-  *
-  */
- #include "version.h"
-+#include "unistd.h"
- 
- 
- #include <hydrogen/hydrogen.h>
-diff -Naur a/libs/hydrogen/src/IO/portmidi_driver.cpp b/libs/hydrogen/src/IO/portmidi_driver.cpp
---- a/libs/hydrogen/src/IO/portmidi_driver.cpp	2012-01-16 23:20:51.000000000 +0000
-+++ b/libs/hydrogen/src/IO/portmidi_driver.cpp	2014-11-28 09:13:01.931327087 +0000
-@@ -20,6 +20,7 @@
-  *
-  */
- 
-+#include "unistd.h"
- #include "PortMidiDriver.h"
- 
- #include <hydrogen/Preferences.h>
diff --git a/audio/hydrogen/patches/sconstruct-install-images.patch b/audio/hydrogen/patches/sconstruct-install-images.patch
deleted file mode 100644
index 4618d302c0..0000000000
--- a/audio/hydrogen/patches/sconstruct-install-images.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur a/Sconstruct b/Sconstruct
---- a/Sconstruct	2011-03-15 12:22:35.000000000 +0000
-+++ b/Sconstruct	2011-10-28 03:17:21.000000000 +0100
-@@ -214,12 +214,7 @@
- 	for file in files:
- 		if file.endswith(".png"):
- 			
--			if env['prefix'].endswith("/"):
--				dname = dir[2:]  
--			else:
--				dname = dir[1:]  
--
--			env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/' + dname, source= dir + "/" + file))
-+			env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/img/gray'  + file))
- 
- def get_hydrogen_gui( lib_hydrogen , opts ):
- 	includes, cppflags, ldflags = get_platform_flags( opts )
-@@ -301,7 +296,7 @@
- 	env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
- 
- 	#add every img in ./data/img to the install list. 
--	os.path.walk("./data/img/",install_images,env) 
-+	os.path.walk("./data/img/gray",install_images,env) 
- 
- 
- 	env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/drumkits"))
diff --git a/audio/hydrogen/patches/sconstruct-raptor2.patch b/audio/hydrogen/patches/sconstruct-raptor2.patch
deleted file mode 100644
index a5e374410f..0000000000
--- a/audio/hydrogen/patches/sconstruct-raptor2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur hydrogen-0.9.5.orig/Sconstruct hydrogen-0.9.5/Sconstruct
---- hydrogen-0.9.5.orig/Sconstruct	2011-03-15 13:22:35.000000000 +0100
-+++ hydrogen-0.9.5/Sconstruct	2012-09-12 17:32:56.865019039 +0200
-@@ -81,6 +81,7 @@
- 	if str(env['libarchive']) == "1": cppflags.append('-DLIBARCHIVE_SUPPORT')
- 
- 	includes.append( './' )
-+	includes.append( '/usr/include/raptor2' )
- 	includes.append( 'gui/src/' )
- 	includes.append( '3rdparty/install/include' )
- 
diff --git a/audio/hydrogen/slack-desc b/audio/hydrogen/slack-desc
index ace18a7015..57b7a39de3 100644
--- a/audio/hydrogen/slack-desc
+++ b/audio/hydrogen/slack-desc
@@ -11,7 +11,7 @@ hydrogen: Hydrogen is an advanced drum machine for GNU/Linux.
 hydrogen: It's main goal is to bring professional yet simple
 hydrogen: and intuitive pattern-based drum programming.
 hydrogen:
-hydrogen: See README for deps.
+hydrogen: See README for optional deps.
 hydrogen:
 hydrogen: Homepage: http://www.hydrogen-music.org
 hydrogen: