From 8ad5e44127356ab9f61d49cb2a53887d97f0f3ab Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 2 Nov 2018 10:45:23 +0000 Subject: [PATCH] libcec: update to libcec-96ba7dd --- packages/devel/libcec/package.mk | 4 +- .../cec-framework/libcec-0001-PR380.patch | 39 ++++++++++--------- .../patches/libcec-001-drop-tinfo.patch | 12 ------ .../libcec/patches/libcec-002-PR390.patch | 24 ------------ 4 files changed, 22 insertions(+), 57 deletions(-) delete mode 100644 packages/devel/libcec/patches/libcec-001-drop-tinfo.patch delete mode 100644 packages/devel/libcec/patches/libcec-002-PR390.patch diff --git a/packages/devel/libcec/package.mk b/packages/devel/libcec/package.mk index 9997a18bee..f394df8655 100644 --- a/packages/devel/libcec/package.mk +++ b/packages/devel/libcec/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libcec" -PKG_VERSION="8adc786" -PKG_SHA256="742efcc24e8949d822effdd06cfebfd0d62babab826be33c1686c7bfea52f455" +PKG_VERSION="96ba7dd54c5082323798d53d2315e2d4c5d6b434" +PKG_SHA256="539a23de83953fdc2b7e92ce05cef1b308d46d93e7710a9bee44f2065db39a96" PKG_LICENSE="GPL" PKG_SITE="http://libcec.pulse-eight.com/" PKG_URL="https://github.com/Pulse-Eight/libcec/archive/$PKG_VERSION.tar.gz" diff --git a/packages/devel/libcec/patches/cec-framework/libcec-0001-PR380.patch b/packages/devel/libcec/patches/cec-framework/libcec-0001-PR380.patch index 5a871d36f9..98565abc0e 100644 --- a/packages/devel/libcec/patches/cec-framework/libcec-0001-PR380.patch +++ b/packages/devel/libcec/patches/cec-framework/libcec-0001-PR380.patch @@ -1,22 +1,22 @@ -From 93908ac97c496447e47182945dd17dd64fadb73a Mon Sep 17 00:00:00 2001 +From 48255b7d4e1cba1050b8abfbd03be37c0737e832 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Wed, 6 Sep 2017 17:37:05 +0200 Subject: [PATCH] Add Linux CEC Adapter --- - docs/README.linux.md | 6 + - include/cectypes.h | 11 + - src/libcec/CECTypeUtils.h | 2 + - src/libcec/CMakeLists.txt | 2 + - src/libcec/adapter/AdapterFactory.cpp | 26 +- - .../adapter/Linux/LinuxCECAdapterCommunication.cpp | 367 +++++++++++++++++++++ - .../adapter/Linux/LinuxCECAdapterCommunication.h | 94 ++++++ - .../adapter/Linux/LinuxCECAdapterDetection.cpp | 50 +++ - .../adapter/Linux/LinuxCECAdapterDetection.h | 51 +++ - src/libcec/cmake/CheckPlatformSupport.cmake | 12 + - src/libcec/cmake/DisplayPlatformSupport.cmake | 6 + - src/libcec/env.h.in | 3 + - 12 files changed, 628 insertions(+), 2 deletions(-) + docs/README.linux.md | 6 + + include/cectypes.h | 11 + + src/libcec/CECTypeUtils.h | 2 + + src/libcec/CMakeLists.txt | 2 + + src/libcec/adapter/AdapterFactory.cpp | 26 +- + .../Linux/LinuxCECAdapterCommunication.cpp | 367 ++++++++++++++++++ + .../Linux/LinuxCECAdapterCommunication.h | 95 +++++ + .../Linux/LinuxCECAdapterDetection.cpp | 50 +++ + .../adapter/Linux/LinuxCECAdapterDetection.h | 51 +++ + src/libcec/cmake/CheckPlatformSupport.cmake | 12 + + src/libcec/cmake/DisplayPlatformSupport.cmake | 6 + + src/libcec/env.h.in | 3 + + 12 files changed, 629 insertions(+), 2 deletions(-) create mode 100644 src/libcec/adapter/Linux/LinuxCECAdapterCommunication.cpp create mode 100644 src/libcec/adapter/Linux/LinuxCECAdapterCommunication.h create mode 100644 src/libcec/adapter/Linux/LinuxCECAdapterDetection.cpp @@ -82,10 +82,10 @@ index 25c1c6e3..15f9543f 100644 return "unknown"; } diff --git a/src/libcec/CMakeLists.txt b/src/libcec/CMakeLists.txt -index 5c888070..eb1c7ee3 100644 +index 6baee69e..74fe5f37 100644 --- a/src/libcec/CMakeLists.txt +++ b/src/libcec/CMakeLists.txt -@@ -88,6 +88,8 @@ set(CEC_HEADERS devices/CECRecordingDevice.h +@@ -89,6 +89,8 @@ set(CEC_HEADERS devices/CECRecordingDevice.h adapter/Exynos/ExynosCEC.h adapter/Exynos/ExynosCECAdapterDetection.h adapter/Exynos/ExynosCECAdapterCommunication.h @@ -534,10 +534,10 @@ index 00000000..878c572f +#endif diff --git a/src/libcec/adapter/Linux/LinuxCECAdapterCommunication.h b/src/libcec/adapter/Linux/LinuxCECAdapterCommunication.h new file mode 100644 -index 00000000..0453bb26 +index 00000000..f4fac87e --- /dev/null +++ b/src/libcec/adapter/Linux/LinuxCECAdapterCommunication.h -@@ -0,0 +1,94 @@ +@@ -0,0 +1,95 @@ +#pragma once +/* + * This file is part of the libCEC(R) library. @@ -610,6 +610,7 @@ index 00000000..0453bb26 + bool IsRunningLatestFirmware(void) override { return true; } + bool SetControlledMode(bool UNUSED(controlled)) override { return true; } + bool PersistConfiguration(const libcec_configuration & UNUSED(configuration)) override { return false; } ++ bool SetAutoMode(bool UNUSED(automode)) override { return false; } + bool GetConfiguration(libcec_configuration & UNUSED(configuration)) override { return false; } + std::string GetPortName(void) override { return std::string("LINUX"); } + uint16_t GetPhysicalAddress(void) override; @@ -746,7 +747,7 @@ index 00000000..f5ea2c47 + +#endif diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake -index 73612dec..c1c182a6 100644 +index d9e1e41b..4c60b6db 100644 --- a/src/libcec/cmake/CheckPlatformSupport.cmake +++ b/src/libcec/cmake/CheckPlatformSupport.cmake @@ -9,6 +9,7 @@ diff --git a/packages/devel/libcec/patches/libcec-001-drop-tinfo.patch b/packages/devel/libcec/patches/libcec-001-drop-tinfo.patch deleted file mode 100644 index 281f4c73cf..0000000000 --- a/packages/devel/libcec/patches/libcec-001-drop-tinfo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/cec-client/CMakeLists.txt b/src/cec-client/CMakeLists.txt -index 37c733b..2cb42bb 100644 ---- a/src/cec-client/CMakeLists.txt -+++ b/src/cec-client/CMakeLists.txt -@@ -44,7 +44,6 @@ if (NOT WIN32) - # curses - if (HAVE_CURSES_API) - target_link_libraries(cec-client curses) -- target_link_libraries(cec-client tinfo) - endif() - - # rt diff --git a/packages/devel/libcec/patches/libcec-002-PR390.patch b/packages/devel/libcec/patches/libcec-002-PR390.patch deleted file mode 100644 index 88272d4173..0000000000 --- a/packages/devel/libcec/patches/libcec-002-PR390.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c1efce96275218f8b82bbb4ac9a467966a4f5530 Mon Sep 17 00:00:00 2001 -From: maart84 <1885039+maart84@users.noreply.github.com> -Date: Wed, 13 Dec 2017 22:46:46 +0100 -Subject: [PATCH] Fix LG TV always changing input when turned on - -This fixes the issue that LG TV's from 2012 always change input to libreelec. -see https://github.com/Pulse-Eight/libcec/pull/390 ---- - src/libcec/implementations/SLCommandHandler.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libcec/implementations/SLCommandHandler.cpp b/src/libcec/implementations/SLCommandHandler.cpp -index dbdd01ce..83e78bd8 100644 ---- a/src/libcec/implementations/SLCommandHandler.cpp -+++ b/src/libcec/implementations/SLCommandHandler.cpp -@@ -129,7 +129,7 @@ int CSLCommandHandler::HandleVendorCommand(const cec_command &command) - else if (command.parameters.size == 1 && - command.parameters[0] == SL_COMMAND_REQUEST_RECONNECT) - { -- HandleVendorCommandPowerOn(command, false); -+ HandleVendorCommandPowerOnStatus(command); - return COMMAND_HANDLED; - } - else if (command.parameters.size == 1 &&