libcec: update to 4.0.2

This also removes a warning that /usr/bin/python is not provided by any package.

Further it moves all binaires to a separate package libcec-tools

Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Pascal Bach 2018-10-05 15:41:59 +02:00 committed by Khem Raj
parent bbd963f3e4
commit bb36a6190b
3 changed files with 35 additions and 33 deletions

View File

@ -0,0 +1,24 @@
From 16e8c072709572ccefa6c7f835136db01f031323 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@siemens.com>
Date: Fri, 28 Sep 2018 16:56:14 +0200
Subject: [PATCH] Explicitly use python3 in pyCecClient
Upstream-Status: Submitted [https://github.com/Pulse-Eight/libcec/pull/433]
---
src/pyCecClient/pyCecClient.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pyCecClient/pyCecClient.py b/src/pyCecClient/pyCecClient.py
index 6d47857..d0504ac 100755
--- a/src/pyCecClient/pyCecClient.py
+++ b/src/pyCecClient/pyCecClient.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python3
## demo of the python-libcec API
# This file is part of the libCEC(R) library.
--
2.11.0

View File

@ -1,28 +0,0 @@
From 330fa6777d51d41eefacff8e98e4250d210fde35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADnez?= <javi@flamingalah.net>
Date: Tue, 13 Dec 2016 22:31:13 +0100
Subject: [PATCH] Improve/fix installation of Python bindings
Upstream-Status: Backport
dist-packages is a Debian-specific directory for distribution packages (and used in derivatives such as Ubuntu). Therefore changed to site-packages.
---
src/libcec/cmake/CheckPlatformSupport.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake
index fcd0ef7..7661107 100644
--- a/src/libcec/cmake/CheckPlatformSupport.cmake
+++ b/src/libcec/cmake/CheckPlatformSupport.cmake
@@ -195,9 +195,9 @@ else()
RENAME __init__.py)
else()
install(TARGETS ${SWIG_MODULE_cec_REAL_NAME}
- DESTINATION lib/python${PYTHON_VERSION}/dist-packages/cec)
+ DESTINATION lib/python${PYTHON_VERSION}/site-packages/cec)
install(FILES ${CMAKE_BINARY_DIR}/src/libcec/cec.py
- DESTINATION lib/python${PYTHON_VERSION}/dist-packages/cec
+ DESTINATION lib/python${PYTHON_VERSION}/site-packages/cec
RENAME __init__.py)
endif()
endif()

View File

@ -4,24 +4,30 @@ HOMEPAGE = "http://libcec.pulse-eight.com/"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=e61fd86f9c947b430126181da2c6c715"
DEPENDS = "p8platform udev lockdev ncurses swig-native python3"
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)}"
PV = "4.0.1+gitr${SRCPV}"
PV = "4.0.2+gitr${SRCPV}"
SRCREV = "2fc92b5f02dca702da92ccc5ed7b805b240ef5df"
SRCREV = "0a97062dd4b196ceeb003ec41841c7a7edc36dd1"
SRC_URI = "git://github.com/Pulse-Eight/libcec.git \
file://python-install-location.patch"
file://0001-Explicitly-use-python3-in-pyCecClient.patch"
S = "${WORKDIR}/git"
inherit cmake pkgconfig
# Put client tools into a separate package
PACKAGE_BEFORE_PN += "${PN}-tools"
FILES_${PN}-tools = "${bindir}"
RDEPENDS_${PN}-tools = "python3-${BPN}"
# Create the wrapper for python3
PACKAGES += "python3-${BPN}"
FILES_python3-${BPN} = "${libdir}/python3*"
FILES_python3-${BPN} = "${libdir}/python3* ${bindir}/py*"
RDEPENDS_${PN} = "python3-core"
# cec-client and xbmc need the .so present to work :(
FILES_${PN} += "${libdir}/*.so"