Backport some fixes.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/debian/patches/abi_fix.patch b/debian/patches/abi_fix.patch
new file mode 100644 (file)
index 0000000..c1ad83e
--- /dev/null
+++ b/debian/patches/abi_fix.patch
@@ -0,0 +1,14 @@
+--- a/src/lib/LibCECC.cpp
++++ b/src/lib/LibCECC.cpp
+@@ -346,6 +346,11 @@
+   return cec_parser ? (cec_parser->PersistConfiguration(configuration) ? 1 : 0) : -1;
+ }
+ 
++int cec_set_configuration(libcec_configuration *configuration)
++{
++  return cec_set_configuration(static_cast<const libcec_configuration*>(configuration));
++}
++
+ int cec_set_configuration(const libcec_configuration *configuration)
+ {
+   return cec_parser ? (cec_parser->SetConfiguration(configuration) ? 1 : 0) : -1;

diff --git a/debian/patches/series b/debian/patches/series
index 3af2378f33852b9fc12b5f20af3450b6d7f3e670..f26e74aefaa1a33990a47d8432688ddd04b0da9e 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 gbp.conf.patch
 debian-packages-fixes.patch
 exynos-dpkg.patch
+abi_fix.patch
+thread_proto_fix.patch

diff --git a/debian/patches/thread_proto_fix.patch b/debian/patches/thread_proto_fix.patch
new file mode 100644 (file)
index 0000000..6e2959f
--- /dev/null
+++ b/debian/patches/thread_proto_fix.patch
@@ -0,0 +1,13 @@
+--- a/src/lib/platform/threads/threads.h
++++ b/src/lib/platform/threads/threads.h
+@@ -52,8 +52,9 @@
+         if (ThreadsWait(m_thread, &retVal)){}; // silence unused warning
+     }
+ 
+-    static void *ThreadHandler(CThread *thread)
++    static void *ThreadHandler(void *_thread)
+     {
++      CThread *thread = static_cast<CThread *>(_thread);
+       void *retVal = NULL;
+ 
+       if (thread)