diff --git a/meta-oe/recipes-extended/libcec/libcec/0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch b/meta-oe/recipes-extended/libcec/libcec/0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch deleted file mode 100644 index 3ecbfce250..0000000000 --- a/meta-oe/recipes-extended/libcec/libcec/0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 95d4df3b713925e2c4894a2e4d50b06df861d9ef Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 18 Dec 2019 23:37:40 -0800 -Subject: [PATCH] CheckPlatformSupport.cmake: Do not hardcode lib path - -Using CMAKE_INSTALL_LIBDIR ensures that we can build for multilib env - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/libcec/cmake/CheckPlatformSupport.cmake | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake -index 2d7102f..55e78f8 100644 ---- a/src/libcec/cmake/CheckPlatformSupport.cmake -+++ b/src/libcec/cmake/CheckPlatformSupport.cmake -@@ -224,16 +224,16 @@ else() - - if (${PYTHON_MAJOR_VERSION} EQUAL 2) - install(TARGETS ${SWIG_MODULE_cec_REAL_NAME} -- DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}/cec) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}/cec) - install(FILES ${CMAKE_BINARY_DIR}/src/libcec/cec.py -- DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}) -+ DESTINATION l${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}) - install(FILES ${CMAKE_SOURCE_DIR}/src/libcec/cmake/__init__.py -- DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/cec) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/cec) - else() - install(TARGETS ${SWIG_MODULE_cec_REAL_NAME} -- DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}) - install(FILES ${CMAKE_BINARY_DIR}/src/libcec/cec.py -- DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}) - endif() - endif() - endif() --- -2.24.1 - diff --git a/meta-oe/recipes-extended/libcec/libcec/0001-Remove-buggy-test-confusing-host-and-target.patch b/meta-oe/recipes-extended/libcec/libcec/0001-Remove-buggy-test-confusing-host-and-target.patch deleted file mode 100644 index 07277f7064..0000000000 --- a/meta-oe/recipes-extended/libcec/libcec/0001-Remove-buggy-test-confusing-host-and-target.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8ce50bf569ec2d931735180079bbe507730626c8 Mon Sep 17 00:00:00 2001 -From: Yann Dirson -Date: Mon, 7 Sep 2020 18:17:21 +0200 -Subject: [PATCH] Remove buggy test confusing host and target - ---- -Upstream-Status: Pending - - src/libcec/cmake/CheckPlatformSupport.cmake | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake -index 1d99bd8..31dac4f 100644 ---- a/src/libcec/cmake/CheckPlatformSupport.cmake -+++ b/src/libcec/cmake/CheckPlatformSupport.cmake -@@ -266,14 +266,6 @@ else() - DESTINATION python/cec) - endif() - else() -- if(EXISTS "/etc/os-release") -- file(READ "/etc/os-release" OS_RELEASE) -- string(REGEX MATCH "ID(_LIKE)?=debian" IS_DEBIAN ${OS_RELEASE}) -- if (IS_DEBIAN) -- SET(PYTHON_PKG_DIR "dist-packages") -- endif() -- endif() -- - if (NOT PYTHON_PKG_DIR) - SET(PYTHON_PKG_DIR "site-packages") - endif() --- -2.28.0 - diff --git a/meta-oe/recipes-extended/libcec/libcec/0001-cecloader-Match-return-type-of-function-LibCecBootlo.patch b/meta-oe/recipes-extended/libcec/libcec/0001-cecloader-Match-return-type-of-function-LibCecBootlo.patch deleted file mode 100644 index ab1ab5b8eb..0000000000 --- a/meta-oe/recipes-extended/libcec/libcec/0001-cecloader-Match-return-type-of-function-LibCecBootlo.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 2241edc8b70c2a54d109ac9c0e821889ac138d40 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 27 Jan 2022 22:49:52 -0800 -Subject: [PATCH] cecloader: Match return type of function LibCecBootloader - -Fixes -include/cecloader.h:175:14: error: cannot initialize return object of type 'bool' with an rvalue of type 'nullptr_t' - return NULL; - ^~~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - include/cecloader.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/cecloader.h b/include/cecloader.h -index be76468f..550f598e 100644 ---- a/include/cecloader.h -+++ b/include/cecloader.h -@@ -172,7 +172,7 @@ bool LibCecBootloader(const char *strLib = NULL) - if (!g_libCEC) - { - std::cout << dlerror() << std::endl; -- return NULL; -+ return false; - } - } - -@@ -181,7 +181,7 @@ bool LibCecBootloader(const char *strLib = NULL) - if (!LibCecBootloader) - { - std::cout << "cannot find CECStartBootloader" << std::endl; -- return NULL; -+ return false; - } - - bool bReturn = LibCecBootloader(); --- -2.35.0 - diff --git a/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb b/meta-oe/recipes-extended/libcec/libcec_7.0.0.bb similarity index 80% rename from meta-oe/recipes-extended/libcec/libcec_6.0.2.bb rename to meta-oe/recipes-extended/libcec/libcec_7.0.0.bb index 22155e534c..532179a9bb 100644 --- a/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb +++ b/meta-oe/recipes-extended/libcec/libcec_7.0.0.bb @@ -2,19 +2,16 @@ SUMMARY = "USB CEC Adaptor communication Library" HOMEPAGE = "http://libcec.pulse-eight.com/" LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=b3a719e97f49e4841e90573f9b1a98ac" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b3a719e97f49e4841e90573f9b1a98ac" DEPENDS = "p8platform udev ncurses swig-native python3" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11 libxrandr', '', d)}" DEPENDS:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" -SRCREV = "29d82c80bcc62be2878a9ac080de7eb286c4beb9" +SRCREV = "ceeec8bfd2242792b6de59ce8fb854437208dc11" SRC_URI = "git://github.com/Pulse-Eight/libcec.git;branch=release;protocol=https \ - file://0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch \ file://0001-Enhance-reproducibility.patch \ - file://0001-Remove-buggy-test-confusing-host-and-target.patch \ - file://0001-cecloader-Match-return-type-of-function-LibCecBootlo.patch \ " S = "${WORKDIR}/git"