[SCM] ardour Debian packaging branch, master, updated. debian/2.8.4-1-6-g347e345

[adiknoth-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 347e34548cd877123865ddd65339398123f6b6a0
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Thu Dec 10 13:14:21 2009 +0100

    Fix crash when performing audio-analysis (Closes: #560052)
    
    We _link_ against system's VAMP libraries. This works, however, the
    compile process references upstream's VAMP source code shipped in
    libs/vamp-sdk. This leads to unresolved symbols at run time, causing a
    crash due to missing _ZTIN11_VampPlugin4Vamp17PluginAdapterBaseE.
    
    With this patch, reference to this symbol is avoided. Instead,
    _ZTIN4Vamp17PluginAdapterBaseE (mind the prefix) from
    /usr/lib/libvamp-sdk.so.1 is used.

diff --git a/debian/patches/111_libardourvampplugins.patch b/debian/patches/111_libardourvampplugins.patch
new file mode 100644
index 0000000..b1a6d06
--- /dev/null
+++ b/debian/patches/111_libardourvampplugins.patch
@@ -0,0 +1,19 @@
+Description: Fix for broken symbol resolving in libardourvampplugins.so
+Forwarded: not-needed
+Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;bug=560052
+Bug-Debian: http://bugs.debian.org/560052
+Acked-by: Klaumi Klingsporn <klaumikli at gmx.de>
+Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
+
+diff --git a/libs/vamp-plugins/SConscript b/libs/vamp-plugins/SConscript
+index fd86c09..055c46d 100644
+--- a/libs/vamp-plugins/SConscript
++++ b/libs/vamp-plugins/SConscript
+@@ -19,7 +19,6 @@ Onset.cpp
+ Import('env install_prefix libraries')
+ vampplugs = env.Clone()
+ 
+-vampplugs.Append (CPPATH='#libs/vamp-sdk/vamp', CXXFLAGS="-Ilibs/vamp-sdk")
+ vampplugs.Merge ([libraries['vamp'],
+                   libraries['vamphost']
+                   ])
diff --git a/debian/patches/series b/debian/patches/series
index e4b6bb4..7a91a04 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 90_ardour-x-change.patch
 100_syslibs.patch
 110_vamp.patch
+111_libardourvampplugins.patch

-- 
ardour Debian packaging