[SCM] clam/master: Link against libvorbis and libogg to fix FTBFS

jcowgill-guest at users.alioth.debian.org jcowgill-guest at users.alioth.debian.org
Fri Nov 21 16:53:40 UTC 2014


The following commit has been merged in the master branch:
commit f6bb1f2af9fbaea42f6936fa91faf3e851fe5f33
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Fri Nov 21 15:51:33 2014 +0000

    Link against libvorbis and libogg to fix FTBFS

diff --git a/debian/patches/link-to-vorbis-ogg.patch b/debian/patches/link-to-vorbis-ogg.patch
new file mode 100644
index 0000000..abd54e9
--- /dev/null
+++ b/debian/patches/link-to-vorbis-ogg.patch
@@ -0,0 +1,17 @@
+Description: Link against libvorbis and libogg to fix FTBFS
+Author: James Cowgill <james410 at cowgill.org.uk>
+Bug-Debian: https://bugs.debian.org/769213
+Forwarded: no
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/scons/libs/clam_dependent_libs_checks.py
++++ b/scons/libs/clam_dependent_libs_checks.py
+@@ -88,7 +88,7 @@ def test_sndfile( env, conf ) :
+ 	return True
+ 
+ def test_oggvorbis( env, conf ) :
+-	if not conf.CheckPkgConfigFile(['vorbisfile', 'vorbisenc']) :
++	if not conf.CheckPkgConfigFile(['vorbisfile', 'vorbisenc', 'vorbis', 'ogg']) :
+ 		return False
+ 	if not conf.CheckLibrarySample('libogg', 'c', None, libogg_test_code ) : return False
+ 	if not conf.CheckLibrarySample('libvorbis', 'c', None, libvorbis_test_code ) : return False
diff --git a/debian/patches/series b/debian/patches/series
index 07f2e21..704d255 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ ftbfs_NULL
 gcc48.patch
 time_utc.patch
 xerces-c-3.patch
+link-to-vorbis-ogg.patch

-- 
clam packaging



More information about the pkg-multimedia-commits mailing list