diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2024-08-06 14:33:38 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-06 14:33:38 -0300 |
commit | dd91b8bb8b45b593deb795a94e5c6014b3a9d6d5 (patch) | |
tree | a97fcaee86729b285e99b3c2a468fe943aa7464f /recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch | |
parent | a1357042f9519501566ecd61007de166afed8a79 (diff) | |
parent | 0f663b89eaff6e2f8cbeb44966725b6e58633de3 (diff) | |
download | meta-freescale-dd91b8bb8b45b593deb795a94e5c6014b3a9d6d5.tar.gz |
Merge pull request #1874 from hiagofranco/upgrade_gstreamer-master
Update gstreamer and imx-opencl-converter from 6.6.3-1.0.0 to 6.6.23-2.0.0
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch')
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch b/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch new file mode 100644 index 00000000..fd6b1c16 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 8d7e2eaed10e2928358805f613223a6a149790d6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hiago De Franco <hiago.franco@toradex.com> | ||
3 | Date: Wed, 31 Jul 2024 11:51:06 -0300 | ||
4 | Subject: [PATCH] meson.build: Fix missing python_opt | ||
5 | |||
6 | 'python_opt' was not declared earlier, giving the following build error: | ||
7 | |||
8 | | Message: python_abi_flags = | ||
9 | | | ||
10 | | ../gst-python-1.24.0/meson.build:84:16: ERROR: Unknown variable "python_opt". | ||
11 | |||
12 | Remove it and keep the error message. | ||
13 | |||
14 | Upstream-Status: Inappropriate [oe specific] | ||
15 | |||
16 | The patch already exists upstream, but this is related to another fix [1] | ||
17 | not suitable for OE. Moreover, the backport does not apply since | ||
18 | the patch was added to the gstreamer monorepo. | ||
19 | |||
20 | [1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6734? | ||
21 | |||
22 | Signed-off-by: Hiago De Franco <hiago.franco@toradex.com> | ||
23 | --- | ||
24 | meson.build | 7 +------ | ||
25 | 1 file changed, 1 insertion(+), 6 deletions(-) | ||
26 | |||
27 | diff --git a/meson.build b/meson.build | ||
28 | index f240b6fd8aca..53f7a43702c7 100644 | ||
29 | --- a/meson.build | ||
30 | +++ b/meson.build | ||
31 | @@ -80,12 +80,7 @@ foreach loc: pylib_locs | ||
32 | endforeach | ||
33 | endforeach | ||
34 | if pylib_fname == '' | ||
35 | - error_msg = 'Could not find python library to load' | ||
36 | - if python_opt.enabled() | ||
37 | - error(error_msg) | ||
38 | - else | ||
39 | - message(error_msg) | ||
40 | - endif | ||
41 | + message('Could not find python library to load') | ||
42 | endif | ||
43 | |||
44 | pygi_override_dir = get_option('pygi-overrides-dir') | ||
45 | -- | ||
46 | 2.39.2 | ||
47 | |||