diff options
author | Madhavan Krishnan <madhavan.krishnan@linaro.org> | 2020-01-21 08:08:43 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-02-20 15:32:27 -0800 |
commit | 59daa1229a36abc63431e4b290bb175949407dab (patch) | |
tree | 97a6ae06f6b94930001f57bbf38c3761f1970ab5 /meta-multimedia/recipes-multimedia/libcamera | |
parent | 7449a3e08389a0c50cdf17bc16995ef1678dc2d2 (diff) | |
download | meta-openembedded-59daa1229a36abc63431e4b290bb175949407dab.tar.gz |
libcamera: Bumped to latest source revision
libcamera uses the host machine python instead of sysroot,
We use the patch file for libcamera source to use the
sysroot python. But libcamera team has fix this issue and,
pushed the changes to libcamera source, now we are pointing
to that particular source revision of libcamera.
In musl, we faced the compilation iisue, so we changed the
source revision pointing to the fix of musl compilation issue.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia/recipes-multimedia/libcamera')
-rw-r--r-- | meta-multimedia/recipes-multimedia/libcamera/files/0001-meson-import-python3-to-use-also-from-sysroot.patch | 61 | ||||
-rw-r--r-- | meta-multimedia/recipes-multimedia/libcamera/libcamera.bb | 5 |
2 files changed, 2 insertions, 64 deletions
diff --git a/meta-multimedia/recipes-multimedia/libcamera/files/0001-meson-import-python3-to-use-also-from-sysroot.patch b/meta-multimedia/recipes-multimedia/libcamera/files/0001-meson-import-python3-to-use-also-from-sysroot.patch deleted file mode 100644 index fc56a68528..0000000000 --- a/meta-multimedia/recipes-multimedia/libcamera/files/0001-meson-import-python3-to-use-also-from-sysroot.patch +++ /dev/null @@ -1,61 +0,0 @@ -From ea47e53911213d71e997eb34848ae72735bacc82 Mon Sep 17 00:00:00 2001 -From: madhavank27 <madhavan.krishnan@linaro.org> -Date: Thu, 9 Jan 2020 07:42:18 +0100 -Subject: [PATCH] meson: import python3 to use also from sysroot - -importing python module can provide the exact path -which can be used in desktop build as well as from -any build system - -Upstream-Status: Pending -Signed-off-by: madhavank27 <madhavan.krishnan@linaro.org> ---- - include/libcamera/meson.build | 4 +++- - src/libcamera/meson.build | 4 +++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build -index 99abf06..83525e2 100644 ---- a/include/libcamera/meson.build -+++ b/include/libcamera/meson.build -@@ -21,13 +21,15 @@ include_dir = join_paths(libcamera_include_dir, 'libcamera') - install_headers(libcamera_api, - subdir : include_dir) - -+python_mod = import('python3').find_python() -+ - gen_controls = files('../../src/libcamera/gen-controls.py') - - control_ids_h = custom_target('control_ids_h', - input : files('../../src/libcamera/control_ids.yaml', 'control_ids.h.in'), - output : 'control_ids.h', - depend_files : gen_controls, -- command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'], -+ command : [python_mod, gen_controls, '-o', '@OUTPUT@', '@INPUT@'], - install : true, - install_dir : join_paths('include', include_dir)) - -diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build -index c4f965b..243935b 100644 ---- a/src/libcamera/meson.build -+++ b/src/libcamera/meson.build -@@ -65,13 +65,15 @@ if libudev.found() - ]) - endif - -+python_mod = import('python3').find_python() -+ - gen_controls = files('gen-controls.py') - - control_ids_cpp = custom_target('control_ids_cpp', - input : files('control_ids.yaml', 'control_ids.cpp.in'), - output : 'control_ids.cpp', - depend_files : gen_controls, -- command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@']) -+ command : [python_mod, gen_controls, '-o', '@OUTPUT@', '@INPUT@']) - - libcamera_sources += control_ids_cpp - libcamera_sources += control_ids_h --- -2.7.4 - diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb index b95bf6d09d..3f8fe2f360 100644 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb @@ -10,12 +10,11 @@ LIC_FILES_CHKSUM = "\ SRC_URI = " \ git://linuxtv.org/libcamera.git;protocol=git \ - file://0001-meson-import-python3-to-use-also-from-sysroot.patch \ " -SRCREV = "53eab996809e826bc914e4c34c78fe74d86f8dc4" +SRCREV = "a8be6e94e79f602d543a15afd44ef60e378b138f" -PV = "201910+git${SRCPV}" +PV = "202002+git${SRCPV}" S = "${WORKDIR}/git" |