1 files changed, 25 insertions, 36 deletions
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