Merge branch 'upstream'

diff --git a/debian/changelog b/debian/changelog
index 712a2c07ec1cede4d3ed38c8b44b72df16d1e339..ffa49cc750197613da274ee711db40cb738c9d2b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+libcec (2.2.0-3~trusty) trusty; urgency=low
+
+  * Backport some fixes
+
+ -- Piment Noir Packaging <contact@piment-noir.org>  Wed, 26 Nov 2014 19:43:00 +0100
+
+libcec (2.2.0-2~trusty) trusty; urgency=low
+
+  * Add a build option for exynos support
+
+ -- Piment Noir Packaging <contact@piment-noir.org>  Mon, 10 Nov 2014 18:44:00 +0100
+
+libcec (2.1.4-4~trusty) trusty; urgency=low
+
+  * Build for Ubuntu 'trusty'
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Sat, 14 Dec 2013 01:02:43 +0100
+
 libcec (2.2.0-1) unstable; urgency=low
 
   * changed / added:

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/debian-packages-fixes.patch b/debian/patches/debian-packages-fixes.patch
new file mode 100644 (file)
index 0000000..00513f4
--- /dev/null
+++ b/debian/patches/debian-packages-fixes.patch
@@ -0,0 +1,22 @@
+--- a/debian/changelog
++++ b/debian/changelog
+@@ -154,7 +154,7 @@
+ 
+  -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Fri, 8 Mar 2013 17:21:00 +0100
+  
+- libcec (2.1.0-1) unstable; urgency=low
++libcec (2.1.0-1) unstable; urgency=low
+ 
+   * changed / added:
+     * added vendor id for Denon
+--- a/debian/libcec-get-orig-source
++++ b/debian/libcec-get-orig-source
+@@ -4,7 +4,7 @@
+ 
+ LIBCEC_GIT_URL="git://github.com/Pulse-Eight/libcec.git"
+ LIBCEC_GIT_BRANCH="release"
+-LIBCEC_VERSION="1.6.1"
++LIBCEC_VERSION="2.2.0"
+ 
+ rm -rf "libcec-${LIBCEC_VERSION}"
+ git clone "$LIBCEC_GIT_URL" "libcec-${LIBCEC_VERSION}"

diff --git a/debian/patches/exynos-dpkg.patch b/debian/patches/exynos-dpkg.patch
new file mode 100644 (file)
index 0000000..279223f
--- /dev/null
+++ b/debian/patches/exynos-dpkg.patch
@@ -0,0 +1,11 @@
+--- a/debian/rules
++++ b/debian/rules
+@@ -6,3 +6,8 @@
+ %:
+       dh  $@ --parallel
+ 
++DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
++ifeq ($(DEB_HOST_ARCH),armhf)
++override_dh_auto_configure:
++      dh_auto_configure -- --enable-exynos
++endif

diff --git a/debian/patches/gbp.conf.patch b/debian/patches/gbp.conf.patch
new file mode 100644 (file)
index 0000000..463c9e8
--- /dev/null
+++ b/debian/patches/gbp.conf.patch
@@ -0,0 +1,6 @@
+--- a/debian/gbp.conf
++++ b/debian/gbp.conf
+@@ -1,2 +1,2 @@
+ [DEFAULT]
+-pristine-tar = True
++pristine-tar = False

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..a3d380c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+# upstreamed 
+#gbp.conf.patch
+#debian-packages-fixes.patch
+# backported
+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)