From 4aabb8ad50ff9da6beb2fd8ebf762a4e5a7436f7 Mon Sep 17 00:00:00 2001 From: David Woodfall Date: Sat, 11 Jun 2011 12:11:48 +0200 Subject: [PATCH] audio/hydrogen: Updated for version 0.9.5. Signed-off-by: Heinz Wiesinger --- audio/hydrogen/README | 23 +++++++++++++++++++-- audio/hydrogen/doinst.sh | 6 +++++- audio/hydrogen/hydrogen.SlackBuild | 33 ++++++++++++++++++------------ audio/hydrogen/hydrogen.info | 10 ++++----- audio/hydrogen/porttime.patch | 11 ---------- audio/hydrogen/slack-desc | 2 +- 6 files changed, 52 insertions(+), 33 deletions(-) delete mode 100644 audio/hydrogen/porttime.patch diff --git a/audio/hydrogen/README b/audio/hydrogen/README index 62707fbef0..d81a3d74b9 100644 --- a/audio/hydrogen/README +++ b/audio/hydrogen/README @@ -2,5 +2,24 @@ 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. -This requires jack-audio-connection-kit, liblrdf, -ladspa_sdk, lash, portaudio, and portmidi. +Dependencies: + +libtar +jack-audio-connection-kit (optional, default=yes) +ladspa_sdk +liblrdf +lash (optional, default=yes) +portaudio (optional, default=no) +portmidi (optional, default=no) +scons + +Optional deps can be set with the following flags: + +JACK=yes|no +LASH=yes|no +PORTAUDIO=yes|no + +PORTAUDIO=yes enables portmidi support. + +*Note: if portaudio was built with jack support then +hydrogen will require it too. diff --git a/audio/hydrogen/doinst.sh b/audio/hydrogen/doinst.sh index f8f852bc2b..7949e121ae 100644 --- a/audio/hydrogen/doinst.sh +++ b/audio/hydrogen/doinst.sh @@ -2,4 +2,8 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi - +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/audio/hydrogen/hydrogen.SlackBuild b/audio/hydrogen/hydrogen.SlackBuild index 3e155f279b..a46a27f867 100644 --- a/audio/hydrogen/hydrogen.SlackBuild +++ b/audio/hydrogen/hydrogen.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for hydrogen -# Copyright 2009 David Woodfall +# Copyright 2009-2011 David Woodfall # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,20 +22,18 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Thanks to pprkut for pointing out problem with QTDIR. +# Thanks to Urchlay for the optional deps ideas PRGNAM=hydrogen -VERSION=${VERSION:-0.9.4.2} +VERSION=${VERSION:-0.9.5} BUILD=${BUILD:-3} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -74,19 +72,28 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch --verbose -p0 < $CWD/porttime.patch -patch --verbose -p0 < patches/portaudio.patch +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 -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ QTDIR=$QT4DIR \ scons \ prefix=/usr \ - lash=1 \ oss=0 \ libarchive=1 \ - portaudio=1 \ - portmidi=1 + optflags="$SLKCFLAGS" \ + $EXTRACONF QTDIR=$QT4DIR \ scons install DESTDIR=$PKG @@ -95,7 +102,7 @@ find $PKG | xargs 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/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog README.txt COPYING DEVELOPERS COPYING.TinyXML INSTALL.txt \ +cp -a AUTHORS ChangeLog README.txt COPYING DEVELOPERS INSTALL.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 e2be475e13..3ef2b7117f 100644 --- a/audio/hydrogen/hydrogen.info +++ b/audio/hydrogen/hydrogen.info @@ -1,10 +1,10 @@ PRGNAM="hydrogen" -VERSION="0.9.4.2" +VERSION="0.9.5" HOMEPAGE="http://www.hydrogen-music.org/" -DOWNLOAD="http://downloads.sourceforge.net/project/hydrogen/Hydrogen/0.9.4%20Sources/hydrogen-0.9.4.2.tar.gz" -MD5SUM="11759bce8193234b8393db6539aa287f" +DOWNLOAD="http://downloads.sourceforge.net/hydrogen/hydrogen-0.9.5.tar.gz" +MD5SUM="e96f291d60e58f5d62fe616cee577dc0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="David Woodfall" -EMAIL="info@davidwoodfall.co.uk" -APPROVED="Erik Hanson" +EMAIL="dave@dawoodfall.net" +APPROVED="pprkut" diff --git a/audio/hydrogen/porttime.patch b/audio/hydrogen/porttime.patch deleted file mode 100644 index b4f6bbca21..0000000000 --- a/audio/hydrogen/porttime.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Sconstruct.orig 2009-10-29 12:05:41.000000000 +0000 -+++ Sconstruct 2009-10-29 12:05:02.000000000 +0000 -@@ -265,7 +265,7 @@ - if str(env['portaudio']) == "1": env.Append( LIBS = [ "portaudio" ] ) - if str(env['portmidi']) == "1": - env.Append( LIBS = [ "portmidi" ] ) -- env.Append( LIBS = [ "porttime" ] ) -+# env.Append( LIBS = [ "porttime" ] ) - if str(env['lash']) == "1": - env.ParseConfig('pkg-config --cflags --libs lash-1.0') - diff --git a/audio/hydrogen/slack-desc b/audio/hydrogen/slack-desc index bc99891477..826c1ecd79 100644 --- a/audio/hydrogen/slack-desc +++ b/audio/hydrogen/slack-desc @@ -10,7 +10,7 @@ hydrogen: Hydrogen (advanced drum machine for GNU/Linux) hydrogen: 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: and intuitive pattern-based drum programming. hydrogen: hydrogen: See README for deps. hydrogen: