summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/clam/clam.SlackBuild9
-rw-r--r--audio/clam/clam.info6
-rw-r--r--audio/clam/scons_sucks.diff19
3 files changed, 29 insertions, 5 deletions
diff --git a/audio/clam/clam.SlackBuild b/audio/clam/clam.SlackBuild
index 0211230929..6927378043 100644
--- a/audio/clam/clam.SlackBuild
+++ b/audio/clam/clam.SlackBuild
@@ -4,8 +4,10 @@
# Written by B. Watson (yalhcru@gmail.com)
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
PRGNAM=clam
-VERSION=${VERSION:-r15441}
+VERSION=${VERSION:-r15456}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -53,6 +55,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# scons failing to link libvorbis/libogg test progs.
+patch -p1 < $CWD/scons_sucks.diff
+
# An include is called incorrectly
patch -p1 < $CWD/wrong_include.patch
@@ -69,7 +74,7 @@ CPPFLAGS="$SLKCFLAGS" \
prefix=/usr \
prefix_for_packaging=$PKG/usr
-scons
+scons $MAKEFLAGS
scons install
strip $PKG/usr/lib$LIBDIRSUFFIX/*.so.*.*
diff --git a/audio/clam/clam.info b/audio/clam/clam.info
index 0b183c6fb9..ec362ba9a0 100644
--- a/audio/clam/clam.info
+++ b/audio/clam/clam.info
@@ -1,8 +1,8 @@
PRGNAM="clam"
-VERSION="r15441"
+VERSION="r15456"
HOMEPAGE="http://clam-project.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/CLAM-r15441.tar.xz"
-MD5SUM="5cbdefa901d467fd2d92c5e57d2a4372"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/CLAM-r15456.tar.xz"
+MD5SUM="c54caaa742960c015dc4783935ddc8d5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="id3lib jack-audio-connection-kit ladspa_sdk lv2 portaudio scons xerces-c"
diff --git a/audio/clam/scons_sucks.diff b/audio/clam/scons_sucks.diff
new file mode 100644
index 0000000000..e4f42c1af6
--- /dev/null
+++ b/audio/clam/scons_sucks.diff
@@ -0,0 +1,19 @@
+diff -Naur CLAM-r15456.orig/scons/libs/clam_dependent_libs_checks.py CLAM-r15456/scons/libs/clam_dependent_libs_checks.py
+--- CLAM-r15456.orig/scons/libs/clam_dependent_libs_checks.py 2015-11-26 05:11:44.000000000 -0500
++++ CLAM-r15456/scons/libs/clam_dependent_libs_checks.py 2015-11-26 18:30:34.574999000 -0500
+@@ -91,10 +91,14 @@
+ return True
+
+ def test_oggvorbis( env, conf ) :
+- if not conf.CheckPkgConfigFile(['vorbisfile', 'vorbisenc']) :
++ if not conf.CheckPkgConfigFile(['ogg']) :
+ return False
+ if not conf.CheckLibrarySample('libogg', 'c', None, libogg_test_code ) : return False
++ if not conf.CheckPkgConfigFile(['vorbis', 'vorbisenc']) :
++ return False
+ if not conf.CheckLibrarySample('libvorbis', 'c', None, libvorbis_test_code ) : return False
++ if not conf.CheckPkgConfigFile(['vorbisfile', 'vorbisenc']) :
++ return False
+ if not conf.CheckLibrarySample('libvorbisfile', 'c', None, libvorbisfile_test_code) : return False
+ return True
+