diff options
author | Pascal Bach <pascal.bach@siemens.com> | 2018-10-05 15:41:59 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-10-05 14:51:14 -0700 |
commit | bb36a6190bd91e1e4906f2db4fdc5f057229f8bb (patch) | |
tree | 257e5b2208ae0c40179e764080d641b30712bf0c | |
parent | bbd963f3e4858057ff0c5259cc892dda6bd1c753 (diff) | |
download | meta-openembedded-bb36a6190bd91e1e4906f2db4fdc5f057229f8bb.tar.gz |
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>
3 files changed, 35 insertions, 33 deletions
diff --git a/meta-oe/recipes-extended/libcec/files/0001-Explicitly-use-python3-in-pyCecClient.patch b/meta-oe/recipes-extended/libcec/files/0001-Explicitly-use-python3-in-pyCecClient.patch new file mode 100644 index 000000000..ec1f5d0d5 --- /dev/null +++ b/meta-oe/recipes-extended/libcec/files/0001-Explicitly-use-python3-in-pyCecClient.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From 16e8c072709572ccefa6c7f835136db01f031323 Mon Sep 17 00:00:00 2001 | ||
2 | From: Pascal Bach <pascal.bach@siemens.com> | ||
3 | Date: Fri, 28 Sep 2018 16:56:14 +0200 | ||
4 | Subject: [PATCH] Explicitly use python3 in pyCecClient | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/Pulse-Eight/libcec/pull/433] | ||
7 | |||
8 | --- | ||
9 | src/pyCecClient/pyCecClient.py | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/src/pyCecClient/pyCecClient.py b/src/pyCecClient/pyCecClient.py | ||
13 | index 6d47857..d0504ac 100755 | ||
14 | --- a/src/pyCecClient/pyCecClient.py | ||
15 | +++ b/src/pyCecClient/pyCecClient.py | ||
16 | @@ -1,4 +1,4 @@ | ||
17 | -#! /usr/bin/python | ||
18 | +#! /usr/bin/python3 | ||
19 | ## demo of the python-libcec API | ||
20 | |||
21 | # This file is part of the libCEC(R) library. | ||
22 | -- | ||
23 | 2.11.0 | ||
24 | |||
diff --git a/meta-oe/recipes-extended/libcec/files/python-install-location.patch b/meta-oe/recipes-extended/libcec/files/python-install-location.patch deleted file mode 100644 index b6be78dd4..000000000 --- a/meta-oe/recipes-extended/libcec/files/python-install-location.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 330fa6777d51d41eefacff8e98e4250d210fde35 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Javi=20Mart=C3=ADnez?= <javi@flamingalah.net> | ||
3 | Date: Tue, 13 Dec 2016 22:31:13 +0100 | ||
4 | Subject: [PATCH] Improve/fix installation of Python bindings | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | dist-packages is a Debian-specific directory for distribution packages (and used in derivatives such as Ubuntu). Therefore changed to site-packages. | ||
9 | --- | ||
10 | src/libcec/cmake/CheckPlatformSupport.cmake | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake | ||
14 | index fcd0ef7..7661107 100644 | ||
15 | --- a/src/libcec/cmake/CheckPlatformSupport.cmake | ||
16 | +++ b/src/libcec/cmake/CheckPlatformSupport.cmake | ||
17 | @@ -195,9 +195,9 @@ else() | ||
18 | RENAME __init__.py) | ||
19 | else() | ||
20 | install(TARGETS ${SWIG_MODULE_cec_REAL_NAME} | ||
21 | - DESTINATION lib/python${PYTHON_VERSION}/dist-packages/cec) | ||
22 | + DESTINATION lib/python${PYTHON_VERSION}/site-packages/cec) | ||
23 | install(FILES ${CMAKE_BINARY_DIR}/src/libcec/cec.py | ||
24 | - DESTINATION lib/python${PYTHON_VERSION}/dist-packages/cec | ||
25 | + DESTINATION lib/python${PYTHON_VERSION}/site-packages/cec | ||
26 | RENAME __init__.py) | ||
27 | endif() | ||
28 | endif() | ||
diff --git a/meta-oe/recipes-extended/libcec/libcec_git.bb b/meta-oe/recipes-extended/libcec/libcec_git.bb index cb65caad8..4ad49971a 100644 --- a/meta-oe/recipes-extended/libcec/libcec_git.bb +++ b/meta-oe/recipes-extended/libcec/libcec_git.bb | |||
@@ -4,24 +4,30 @@ HOMEPAGE = "http://libcec.pulse-eight.com/" | |||
4 | LICENSE = "GPLv2+" | 4 | LICENSE = "GPLv2+" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=e61fd86f9c947b430126181da2c6c715" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=e61fd86f9c947b430126181da2c6c715" |
6 | 6 | ||
7 | DEPENDS = "p8platform udev lockdev ncurses swig-native python3" | 7 | DEPENDS = "p8platform udev ncurses swig-native python3" |
8 | 8 | ||
9 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11 libxrandr', '', d)}" | 9 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11 libxrandr', '', d)}" |
10 | DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" | 10 | DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" |
11 | 11 | ||
12 | PV = "4.0.1+gitr${SRCPV}" | 12 | PV = "4.0.2+gitr${SRCPV}" |
13 | 13 | ||
14 | SRCREV = "2fc92b5f02dca702da92ccc5ed7b805b240ef5df" | 14 | SRCREV = "0a97062dd4b196ceeb003ec41841c7a7edc36dd1" |
15 | SRC_URI = "git://github.com/Pulse-Eight/libcec.git \ | 15 | SRC_URI = "git://github.com/Pulse-Eight/libcec.git \ |
16 | file://python-install-location.patch" | 16 | file://0001-Explicitly-use-python3-in-pyCecClient.patch" |
17 | 17 | ||
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | 19 | ||
20 | inherit cmake pkgconfig | 20 | inherit cmake pkgconfig |
21 | 21 | ||
22 | # Put client tools into a separate package | ||
23 | PACKAGE_BEFORE_PN += "${PN}-tools" | ||
24 | FILES_${PN}-tools = "${bindir}" | ||
25 | RDEPENDS_${PN}-tools = "python3-${BPN}" | ||
26 | |||
22 | # Create the wrapper for python3 | 27 | # Create the wrapper for python3 |
23 | PACKAGES += "python3-${BPN}" | 28 | PACKAGES += "python3-${BPN}" |
24 | FILES_python3-${BPN} = "${libdir}/python3*" | 29 | FILES_python3-${BPN} = "${libdir}/python3* ${bindir}/py*" |
30 | RDEPENDS_${PN} = "python3-core" | ||
25 | 31 | ||
26 | # cec-client and xbmc need the .so present to work :( | 32 | # cec-client and xbmc need the .so present to work :( |
27 | FILES_${PN} += "${libdir}/*.so" | 33 | FILES_${PN} += "${libdir}/*.so" |