summaryrefslogtreecommitdiff
path: root/audio/hydrogen
diff options
context:
space:
mode:
Diffstat (limited to 'audio/hydrogen')
-rw-r--r--audio/hydrogen/hydrogen.SlackBuild15
-rw-r--r--audio/hydrogen/hydrogen.info6
-rw-r--r--audio/hydrogen/patches/gcc47.patch23
3 files changed, 16 insertions, 28 deletions
diff --git a/audio/hydrogen/hydrogen.SlackBuild b/audio/hydrogen/hydrogen.SlackBuild
index 4f50d51183..999ef5f7e0 100644
--- a/audio/hydrogen/hydrogen.SlackBuild
+++ b/audio/hydrogen/hydrogen.SlackBuild
@@ -24,10 +24,9 @@
# Thanks to Urchlay for the optional deps ideas
-
PRGNAM=hydrogen
-VERSION=${VERSION:-0.9.5}
-BUILD=${BUILD:-6}
+VERSION=${VERSION:-0.9.5.1}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -67,10 +66,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -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
@@ -102,7 +101,7 @@ scons \
QTDIR=$QT4DIR \
scons install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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/doc/$PRGNAM-$VERSION
diff --git a/audio/hydrogen/hydrogen.info b/audio/hydrogen/hydrogen.info
index 4205ddefda..a368601c8b 100644
--- a/audio/hydrogen/hydrogen.info
+++ b/audio/hydrogen/hydrogen.info
@@ -1,8 +1,8 @@
PRGNAM="hydrogen"
-VERSION="0.9.5"
+VERSION="0.9.5.1"
HOMEPAGE="http://www.hydrogen-music.org/"
-DOWNLOAD="http://downloads.sourceforge.net/hydrogen/hydrogen-0.9.5.tar.gz"
-MD5SUM="e96f291d60e58f5d62fe616cee577dc0"
+DOWNLOAD="http://downloads.sourceforge.net/hydrogen/hydrogen-0.9.5.1.tar.gz"
+MD5SUM="52f3a528705818c65acf546a3be4c6fb"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="lash liblrdf libtar scons"
diff --git a/audio/hydrogen/patches/gcc47.patch b/audio/hydrogen/patches/gcc47.patch
index 41537bc647..13cf39469d 100644
--- a/audio/hydrogen/patches/gcc47.patch
+++ b/audio/hydrogen/patches/gcc47.patch
@@ -1,6 +1,6 @@
-diff -Naur hydrogen-0.9.5.orig/gui/src/MainForm.cpp hydrogen-0.9.5/gui/src/MainForm.cpp
---- hydrogen-0.9.5.orig/gui/src/MainForm.cpp 2011-02-08 10:15:04.000000000 +0100
-+++ hydrogen-0.9.5/gui/src/MainForm.cpp 2012-09-12 17:40:17.305970299 +0200
+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 @@
*
*/
@@ -9,20 +9,9 @@ diff -Naur hydrogen-0.9.5.orig/gui/src/MainForm.cpp hydrogen-0.9.5/gui/src/MainF
#include <hydrogen/hydrogen.h>
-diff -Naur hydrogen-0.9.5.orig/gui/src/SongEditor/SongEditor.cpp hydrogen-0.9.5/gui/src/SongEditor/SongEditor.cpp
---- hydrogen-0.9.5.orig/gui/src/SongEditor/SongEditor.cpp 2010-03-28 12:06:05.000000000 +0200
-+++ hydrogen-0.9.5/gui/src/SongEditor/SongEditor.cpp 2012-09-12 17:37:17.764043771 +0200
-@@ -23,6 +23,7 @@
- #include <assert.h>
- #include <algorithm>
- #include <memory>
-+#include <unistd.h>
-
- #include <hydrogen/Song.h>
- #include <hydrogen/hydrogen.h>
-diff -Naur hydrogen-0.9.5.orig/libs/hydrogen/src/IO/portmidi_driver.cpp hydrogen-0.9.5/libs/hydrogen/src/IO/portmidi_driver.cpp
---- hydrogen-0.9.5.orig/libs/hydrogen/src/IO/portmidi_driver.cpp 2010-02-01 22:06:17.000000000 +0100
-+++ hydrogen-0.9.5/libs/hydrogen/src/IO/portmidi_driver.cpp 2012-09-12 17:45:38.426002346 +0200
+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 @@
*
*/