aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2012-09-21 06:28:20 +0200
committerRobby Workman <rworkman@slackbuilds.org>2012-09-22 11:39:45 -0500
commitf06395d6cc8d79e2dc0a0f3960286d07cd2b84ea (patch)
tree334ce5b70a501f0351bc60da80872f4840fcf239
parent01db23cd32288c7a205c9486752b753fdb6e92c0 (diff)
audio/sonic-visualiser: Updated for version 1.9.
Added a patch for gcc-4.7.x and another to fix underlinking, forced make -j1 Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--audio/sonic-visualiser/gcc47.diff20
-rw-r--r--audio/sonic-visualiser/libx11.diff11
-rw-r--r--audio/sonic-visualiser/sonic-visualiser.SlackBuild15
-rw-r--r--audio/sonic-visualiser/sonic-visualiser.info6
4 files changed, 46 insertions, 6 deletions
diff --git a/audio/sonic-visualiser/gcc47.diff b/audio/sonic-visualiser/gcc47.diff
new file mode 100644
index 0000000000000..e19d4fd28e48f
--- /dev/null
+++ b/audio/sonic-visualiser/gcc47.diff
@@ -0,0 +1,20 @@
+--- sonic-visualiser-1.9/svcore/data/fileio/CodedAudioFileReader.cpp.gcc47 2011-10-10 22:37:09.000000000 +0700
++++ sonic-visualiser-1.9/svcore/data/fileio/CodedAudioFileReader.cpp 2012-03-03 11:45:00.426572588 +0700
+@@ -22,6 +22,7 @@
+ #include "base/Serialiser.h"
+ #include "base/Resampler.h"
+
++#include <stdint.h>
+ #include <iostream>
+ #include <QDir>
+ #include <QMutexLocker>
+--- sonic-visualiser-1.9/svcore/data/model/WritableWaveFileModel.cpp.gcc47 2011-10-10 22:37:09.000000000 +0700
++++ sonic-visualiser-1.9/svcore/data/model/WritableWaveFileModel.cpp 2012-03-03 11:46:42.603157996 +0700
+@@ -26,6 +26,7 @@
+
+ #include <cassert>
+ #include <iostream>
++#include <stdint.h>
+
+ //#define DEBUG_WRITABLE_WAVE_FILE_MODEL 1
+
diff --git a/audio/sonic-visualiser/libx11.diff b/audio/sonic-visualiser/libx11.diff
new file mode 100644
index 0000000000000..2b37386e9b305
--- /dev/null
+++ b/audio/sonic-visualiser/libx11.diff
@@ -0,0 +1,11 @@
+--- sonic-visualiser-1.8/sonic-visualiser/sonic-visualiser.pro.implicit-dso 2011-04-08 17:56:20.000000000 +0200
++++ sonic-visualiser-1.8/sonic-visualiser/sonic-visualiser.pro 2011-05-31 23:11:17.157498460 +0200
+@@ -23,7 +23,7 @@
+
+ contains(DEFINES, BUILD_STATIC):LIBS -= -ljack
+
+-LIBS = -L../svapp -L../svgui -L../svcore -lsvapp -lsvgui -lsvcore $$LIBS
++LIBS = -L../svapp -L../svgui -L../svcore -lsvapp -lsvgui -lsvcore -lX11 $$LIBS
+
+ PRE_TARGETDEPS += ../svapp/libsvapp.a \
+ ../svgui/libsvgui.a \
diff --git a/audio/sonic-visualiser/sonic-visualiser.SlackBuild b/audio/sonic-visualiser/sonic-visualiser.SlackBuild
index 27614418692c3..485c7f3e9b164 100644
--- a/audio/sonic-visualiser/sonic-visualiser.SlackBuild
+++ b/audio/sonic-visualiser/sonic-visualiser.SlackBuild
@@ -5,7 +5,7 @@
# Written by B. Watson (yalhcru@gmail.com)
PRGNAM=sonic-visualiser
-VERSION=${VERSION:-1.8}
+VERSION=${VERSION:-1.9}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -51,6 +51,11 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# add some missing includes and libraries, patches from here:
+# http://cvs.rpmfusion.org/viewvc/rpms/sonic-visualiser-freeworld/F-17/?root=free
+patch -p1 < $CWD/libx11.diff
+patch -p1 < $CWD/gcc47.diff
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -62,15 +67,19 @@ CXXFLAGS="$SLKCFLAGS" \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--build=$ARCH-slackware-linux
-make
+make -j1
# There is no 'make install', stick everything where it goes:
mkdir -p $PKG/usr/{bin,share/$PRGNAM/samples}
install -s -m0755 $PRGNAM/$PRGNAM $PKG/usr/bin/$PRGNAM
install -m0644 $PRGNAM/samples/* $PKG/usr/share/$PRGNAM/samples
+# desktop file fails to validate due to a couple of missing semicolons,
+# so fix it:
mkdir -p $PKG/usr/share/applications
-cp $PRGNAM/$PRGNAM.desktop $PKG/usr/share/applications
+sed '/^\(Categories\|MimeType\)/s,$,;,' \
+ < $PRGNAM/$PRGNAM.desktop \
+ > $PKG/usr/share/applications/$PRGNAM.desktop
mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps
cp $PRGNAM/icons/sv-icon.svg $PKG/usr/share/icons/hicolor/scalable/apps
diff --git a/audio/sonic-visualiser/sonic-visualiser.info b/audio/sonic-visualiser/sonic-visualiser.info
index 2491ed011fa93..180dcc13feb59 100644
--- a/audio/sonic-visualiser/sonic-visualiser.info
+++ b/audio/sonic-visualiser/sonic-visualiser.info
@@ -1,8 +1,8 @@
PRGNAM="sonic-visualiser"
-VERSION="1.8"
+VERSION="1.9"
HOMEPAGE="http://sonicvisualiser.org/"
-DOWNLOAD="http://downloads.sourceforge.net/sv1/sonic-visualiser-1.8.tar.gz"
-MD5SUM="ad676d0b4cf5b8561306487f52642862"
+DOWNLOAD="http://code.soundsoftware.ac.uk/attachments/download/194/sonic-visualiser-1.9.tar.gz"
+MD5SUM="a50037994d180c7b9b113fbde3131a8c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="jack-audio-connection-kit liblrdf rubberband"