summaryrefslogtreecommitdiffstats
path: root/meta-multimedia/recipes-multimedia/libcamera/files/0001-meson-import-python3-to-use-also-from-sysroot.patch
diff options
context:
space:
mode:
authorMadhavan Krishnan <madhavan.krishnan@linaro.org>2020-01-21 08:08:43 +0100
committerKhem Raj <raj.khem@gmail.com>2020-02-20 15:32:27 -0800
commit59daa1229a36abc63431e4b290bb175949407dab (patch)
tree97a6ae06f6b94930001f57bbf38c3761f1970ab5 /meta-multimedia/recipes-multimedia/libcamera/files/0001-meson-import-python3-to-use-also-from-sysroot.patch
parent7449a3e08389a0c50cdf17bc16995ef1678dc2d2 (diff)
downloadmeta-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/files/0001-meson-import-python3-to-use-also-from-sysroot.patch')
-rw-r--r--meta-multimedia/recipes-multimedia/libcamera/files/0001-meson-import-python3-to-use-also-from-sysroot.patch61
1 files changed, 0 insertions, 61 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 @@
1From ea47e53911213d71e997eb34848ae72735bacc82 Mon Sep 17 00:00:00 2001
2From: madhavank27 <madhavan.krishnan@linaro.org>
3Date: Thu, 9 Jan 2020 07:42:18 +0100
4Subject: [PATCH] meson: import python3 to use also from sysroot
5
6importing python module can provide the exact path
7which can be used in desktop build as well as from
8any build system
9
10Upstream-Status: Pending
11Signed-off-by: madhavank27 <madhavan.krishnan@linaro.org>
12---
13 include/libcamera/meson.build | 4 +++-
14 src/libcamera/meson.build | 4 +++-
15 2 files changed, 6 insertions(+), 2 deletions(-)
16
17diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
18index 99abf06..83525e2 100644
19--- a/include/libcamera/meson.build
20+++ b/include/libcamera/meson.build
21@@ -21,13 +21,15 @@ include_dir = join_paths(libcamera_include_dir, 'libcamera')
22 install_headers(libcamera_api,
23 subdir : include_dir)
24
25+python_mod = import('python3').find_python()
26+
27 gen_controls = files('../../src/libcamera/gen-controls.py')
28
29 control_ids_h = custom_target('control_ids_h',
30 input : files('../../src/libcamera/control_ids.yaml', 'control_ids.h.in'),
31 output : 'control_ids.h',
32 depend_files : gen_controls,
33- command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'],
34+ command : [python_mod, gen_controls, '-o', '@OUTPUT@', '@INPUT@'],
35 install : true,
36 install_dir : join_paths('include', include_dir))
37
38diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
39index c4f965b..243935b 100644
40--- a/src/libcamera/meson.build
41+++ b/src/libcamera/meson.build
42@@ -65,13 +65,15 @@ if libudev.found()
43 ])
44 endif
45
46+python_mod = import('python3').find_python()
47+
48 gen_controls = files('gen-controls.py')
49
50 control_ids_cpp = custom_target('control_ids_cpp',
51 input : files('control_ids.yaml', 'control_ids.cpp.in'),
52 output : 'control_ids.cpp',
53 depend_files : gen_controls,
54- command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'])
55+ command : [python_mod, gen_controls, '-o', '@OUTPUT@', '@INPUT@'])
56
57 libcamera_sources += control_ids_cpp
58 libcamera_sources += control_ids_h
59--
602.7.4
61