summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorMatteo Bernardini <ponce@slackbuilds.org>2012-09-17 21:32:57 +0200
committerRobby Workman <rworkman@slackbuilds.org>2012-09-17 23:34:14 -0500
commit595965b5a80f7b35356219d5b7cc522cfb465dfe (patch)
tree4742a3d758a5df6eeac3123821c91f1909639c77 /multimedia
parentc074a97e37e799b84159af9eabfad87ffc0650d1 (diff)
downloadslackbuilds-595965b5a80f7b35356219d5b7cc522cfb465dfe.tar.gz
multimedia/linuxsampler: Added a patch for gcc-4.7.x, cleanups.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/linuxsampler/gcc47.patch12
-rw-r--r--multimedia/linuxsampler/linuxsampler.SlackBuild13
2 files changed, 19 insertions, 6 deletions
diff --git a/multimedia/linuxsampler/gcc47.patch b/multimedia/linuxsampler/gcc47.patch
new file mode 100644
index 0000000000..d021a01e0c
--- /dev/null
+++ b/multimedia/linuxsampler/gcc47.patch
@@ -0,0 +1,12 @@
+diff -Naur linuxsampler-1.0.0.orig/src/common/Pool.h linuxsampler-1.0.0/src/common/Pool.h
+--- linuxsampler-1.0.0.orig/src/common/Pool.h 2008-12-07 01:18:04.000000000 +0100
++++ linuxsampler-1.0.0/src/common/Pool.h 2012-09-17 15:27:17.580041864 +0200
+@@ -393,7 +393,7 @@
+ inline Iterator allocAppend() {
+ if (pPool->poolIsEmpty()) return RTListBase<T>::begin();
+ Iterator element = pPool->alloc();
+- append(element);
++ this->append(element);
+ #if CONFIG_DEVMODE
+ element.list = this;
+ #endif // CONFIG_DEVMODE
diff --git a/multimedia/linuxsampler/linuxsampler.SlackBuild b/multimedia/linuxsampler/linuxsampler.SlackBuild
index 4407980fe3..e012d1c302 100644
--- a/multimedia/linuxsampler/linuxsampler.SlackBuild
+++ b/multimedia/linuxsampler/linuxsampler.SlackBuild
@@ -5,7 +5,7 @@
PRGNAM=linuxsampler
VERSION=${VERSION:-1.0.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
@@ -52,6 +52,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Fix for gcc-4.7.x
+patch -p1 < $CWD/gcc47.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -67,13 +70,11 @@ CXXFLAGS="$SLKCFLAGS" \
make
make 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
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \