From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Tue, 23 Dec 2014 17:46:25 +0000 (+0100)
Subject: package/libcec: Bump to version 2.2.0
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e243a5102aa0e589262f14c9b49a61e8c8028ab9;p=buildroot.git

package/libcec: Bump to version 2.2.0

Kodi Helix depends on libcec >= 2.2.0

Removed libcec-0001-Fix-unregistering-a-callback-that-wasn-t-register.patch
applied upstream: https://github.com/Pulse-Eight/libcec/commit/485660f

Renamed remaining patch according to new naming convention.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/package/libcec/0001-no-psabi-warning.patch b/package/libcec/0001-no-psabi-warning.patch
new file mode 100644
index 0000000000..bd6557e077
--- /dev/null
+++ b/package/libcec/0001-no-psabi-warning.patch
@@ -0,0 +1,22 @@
+Do not use -Wno-psabi warning, not available on old g++
+
+AVR32 uses a very old g++ version, which does not implement the
+-Wno-psabi warning flag. This patch simply removes this warning flag
+from the libcec build. It can be dropped if only gcc 4.5+ versions are
+supported in Buildroot.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -130,7 +130,7 @@
+ use_udev="no"
+ use_adapter_detection="yes"
+ use_lockdev="no"
+-SUPPRESS_MANGLING_WARNINGS=" -Wno-psabi"
++SUPPRESS_MANGLING_WARNINGS=""
+ case "${host}" in
+   *-*-linux*)
+     ## search for udev if pkg-config was found
diff --git a/package/libcec/libcec-0001-Fix-unregistering-a-callback-that-wasn-t-register.patch b/package/libcec/libcec-0001-Fix-unregistering-a-callback-that-wasn-t-register.patch
deleted file mode 100644
index 41d93aa5a4..0000000000
--- a/package/libcec/libcec-0001-Fix-unregistering-a-callback-that-wasn-t-register.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 78e52d55d6fc079b9a96d1a663d1991d9a0f2a2b Mon Sep 17 00:00:00 2001
-From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
-Date: Wed, 7 May 2014 08:41:27 +0200
-Subject: [PATCH] Fix unregistering a callback that wasn't register
-
-This patchs fixes an asserts that get's thrown when you start XBMC and thus
-prevents it from starting.
-The asserts you'll endup getting is:
-assertion failure:
-[...]/interface/vmcs_host/vc_vchi_tvservice.c:430:vc_tv_unregister_callback():done
-
-Found: https://github.com/raspberrypi/userland/issues/159
-
-Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
----
- src/lib/adapter/RPi/RPiCECAdapterCommunication.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/adapter/RPi/RPiCECAdapterCommunication.cpp b/src/lib/adapter/RPi/RPiCECAdapterCommunication.cpp
-index 76c61b3..1eb6417 100644
---- a/src/lib/adapter/RPi/RPiCECAdapterCommunication.cpp
-+++ b/src/lib/adapter/RPi/RPiCECAdapterCommunication.cpp
-@@ -353,7 +353,9 @@ void CRPiCECAdapterCommunication::Close(void)
-     else
-       return;
-   }
--  vc_tv_unregister_callback(rpi_tv_callback);
-+
-+  if (m_bInitialised)
-+    vc_tv_unregister_callback(rpi_tv_callback);
-
-   UnregisterLogicalAddress();
-
---
-1.9.2
-
diff --git a/package/libcec/libcec-0002-no-psabi-warning.patch b/package/libcec/libcec-0002-no-psabi-warning.patch
deleted file mode 100644
index bd6557e077..0000000000
--- a/package/libcec/libcec-0002-no-psabi-warning.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Do not use -Wno-psabi warning, not available on old g++
-
-AVR32 uses a very old g++ version, which does not implement the
--Wno-psabi warning flag. This patch simply removes this warning flag
-from the libcec build. It can be dropped if only gcc 4.5+ versions are
-supported in Buildroot.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -130,7 +130,7 @@
- use_udev="no"
- use_adapter_detection="yes"
- use_lockdev="no"
--SUPPRESS_MANGLING_WARNINGS=" -Wno-psabi"
-+SUPPRESS_MANGLING_WARNINGS=""
- case "${host}" in
-   *-*-linux*)
-     ## search for udev if pkg-config was found
diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk
index 5a889b9c60..8bdc9ea0fd 100644
--- a/package/libcec/libcec.mk
+++ b/package/libcec/libcec.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBCEC_VERSION = libcec-2.1.4-repack
+LIBCEC_VERSION = libcec-2.2.0-repack
 LIBCEC_SITE = $(call github,Pulse-Eight,libcec,$(LIBCEC_VERSION))
 LIBCEC_LICENSE = GPLv2+
 LIBCEC_LICENSE_FILES = COPYING