[SCM] ardour/master: Add patch to fix FTBFS with new lilv

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Fri Oct 4 20:43:34 UTC 2013


The following commit has been merged in the master branch:
commit 948c9dd102e7a9c39137dd502f5af474f7153f48
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Fri Oct 4 20:23:18 2013 +0200

    Add patch to fix FTBFS with new lilv

diff --git a/debian/patches/171_lilv-constness.patch b/debian/patches/171_lilv-constness.patch
new file mode 100644
index 0000000..b4a7242
--- /dev/null
+++ b/debian/patches/171_lilv-constness.patch
@@ -0,0 +1,33 @@
+From: Paul Davis <paul at linuxaudiosystems.com>
+Forwarded: not-needed
+Origin: upstream/2.0-ongoing 4ce89b51782ae8b86ee00175c5abdeec07cc4e4c
+Applied-Upstream: 2.8.17 (yet to be released)
+Description: Fix const-correctness for current lilv
+--- a/libs/ardour/ardour/lv2_plugin.h
++++ b/libs/ardour/ardour/lv2_plugin.h
+@@ -154,7 +154,7 @@ class LV2Plugin : public ARDOUR::Plugin
+ 	/** Find the LV2 input port with the given designation.
+ 	 * If found, bufptrs[port_index] will be set to bufptr.
+ 	 */
+-	LilvPort* designated_input (const char* uri, void** bufptrs[], void** bufptr);
++        const LilvPort* designated_input (const char* uri, void** bufptrs[], void** bufptr);
+ };
+ 
+ 
+diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
+index 4a1719d..6d21091 100644
+--- a/libs/ardour/lv2_plugin.cc
++++ b/libs/ardour/lv2_plugin.cc
+@@ -644,10 +644,10 @@ LV2Plugin::latency_compute_run ()
+ 	deactivate ();
+ }
+ 
+-LilvPort*
++const LilvPort*
+ LV2Plugin::designated_input (const char* uri, void** bufptrs[], void** bufptr)
+ {
+-	LilvPort* port = NULL;
++	const LilvPort* port = NULL;
+ #ifdef HAVE_NEW_LILV
+ 	LilvNode* designation = lilv_new_uri(_world.world, uri);
+ 	port = lilv_plugin_get_port_by_designation(

-- 
ardour Debian packaging



More information about the pkg-multimedia-commits mailing list