diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2012-09-16 09:24:38 +0200 |
|---|---|---|
| committer | dsomero <xgizzmo@slackbuilds.org> | 2012-09-16 19:44:41 -0400 |
| commit | 5958c5006350be7f98ad0f07ab1eb92998e5c613 (patch) | |
| tree | 42d2536652b42b62482a7d2cea319ddca33aabd0 | |
| parent | cdd811af8e7244b3446cd052b43cae21acd7d5d6 (diff) | |
| download | slackbuilds-5958c5006350be7f98ad0f07ab1eb92998e5c613.tar.gz | |
audio/clam: Updated for subversion revision 15298.
Added a fix for an improperly called header.
Exported CFLAGS like required by the scons script
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
| -rw-r--r-- | audio/clam/clam.SlackBuild | 17 | ||||
| -rw-r--r-- | audio/clam/clam.info | 6 | ||||
| -rw-r--r-- | audio/clam/wrong_include.patch | 12 |
3 files changed, 26 insertions, 9 deletions
diff --git a/audio/clam/clam.SlackBuild b/audio/clam/clam.SlackBuild index 3e5a01a7bb..2a718dd82e 100644 --- a/audio/clam/clam.SlackBuild +++ b/audio/clam/clam.SlackBuild @@ -5,7 +5,7 @@ # Written by B. Watson (yalhcru@gmail.com) PRGNAM=clam -VERSION=${VERSION:-1.4.0} +VERSION=${VERSION:-r15298} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -44,7 +44,7 @@ rm -rf $PKG mkdir -p $TMP $PKG/usr $OUTPUT # NB: $PKG/usr must exist, not just $PKG cd $TMP rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* cd $SRCNAM-$VERSION chown -R root:root . find . \ @@ -53,16 +53,19 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# An include is called incorrectly +patch -p1 < $CWD/wrong_include.patch + # Annoying scons script has hard-coded self.lib = self.prefix + '/lib' if [ "$LIBDIRSUFFIX" != "" ]; then sed -i "s,/lib\>,/lib$LIBDIRSUFFIX," scons/libs/clam_build_helpers.py fi -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CCFLAGS="$SLKCFLAGS" \ +CPPFLAGS="$SLKCFLAGS" \ scons configure \ - with-fftw3=1 \ - release=1 \ + with_fftw3=yes \ + release=yes \ prefix=/usr \ prefix_for_packaging=$PKG/usr @@ -70,6 +73,8 @@ scons scons install strip $PKG/usr/lib$LIBDIRSUFFIX/*.so.*.* +mv $PKG/usr/share/man $PKG/usr/man + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a CHANGES examples $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/audio/clam/clam.info b/audio/clam/clam.info index 72ca1646aa..207d667f2e 100644 --- a/audio/clam/clam.info +++ b/audio/clam/clam.info @@ -1,8 +1,8 @@ PRGNAM="clam" -VERSION="1.4.0" +VERSION="r15298" HOMEPAGE="http://clam-project.org/" -DOWNLOAD="http://clam-project.org/download/src/CLAM-1.4.0.tar.gz" -MD5SUM="614bb957a7aeecc667e144a46a1b87d2" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/CLAM-r15298.tar.xz" +MD5SUM="35a006de1ceedc10f31f353ded09af4f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="id3lib jack-audio-connection-kit ladspa_sdk portaudio scons xerces-c" diff --git a/audio/clam/wrong_include.patch b/audio/clam/wrong_include.patch new file mode 100644 index 0000000000..eb1b4f3af5 --- /dev/null +++ b/audio/clam/wrong_include.patch @@ -0,0 +1,12 @@ +diff -Naur CLAM-r15298.orig/src/core/ports/OutPort.hxx CLAM-r15298/src/core/ports/OutPort.hxx +--- CLAM-r15298.orig/src/core/ports/OutPort.hxx 2012-09-16 07:59:34.924000047 +0200 ++++ CLAM-r15298/src/core/ports/OutPort.hxx 2012-09-16 08:08:17.459002302 +0200 +@@ -23,7 +23,7 @@ + #define __OutPort_hxx__ + + #include "WritingRegion.hxx" +-#include <typeinfo> ++#include "TypeInfo.hxx" + #include <list> + #include <string> + #include "InPort.hxx" |