diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-05-13 22:56:21 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-14 07:57:28 +0100 |
commit | 6b10910b47d79bd12cbcda8f423a3f5965a4cc79 (patch) | |
tree | 186f3e8b434d04ff185bb9b2dc9caff2548e141c /meta/recipes-multimedia/gstreamer | |
parent | 830e634bbb4dbefbb4059319fbdcc200b5f9ac4e (diff) | |
download | poky-6b10910b47d79bd12cbcda8f423a3f5965a4cc79.tar.gz |
gstreamer1.0-plugins-base: backport a patch to fix meson 0.58 builds
(From OE-Core rev: 4e509099d1a8c22e5f592e6675dabacfe910b9b9)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch | 50 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.4.bb | 1 |
2 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch new file mode 100644 index 0000000000..a2f5dff5e9 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From 4ef5c91697a141fea7317aff7f0f28e5a861db99 Mon Sep 17 00:00:00 2001 | ||
2 | From: Xavier Claessens <xavier.claessens@collabora.com> | ||
3 | Date: Mon, 26 Apr 2021 14:25:03 -0400 | ||
4 | Subject: [PATCH] gstgl: Fix build when Meson >= 0.58.0rc1 | ||
5 | |||
6 | "implicit_include_directories: false" now also means that current build | ||
7 | directory is not added to include paths by default any more. We have to | ||
8 | add it manually because we have some custom_target() that generate | ||
9 | headers in current build directory. | ||
10 | |||
11 | See https://github.com/mesonbuild/meson/issues/8700. | ||
12 | |||
13 | Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1125> | ||
14 | Upstream-Status: Backport | ||
15 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
16 | --- | ||
17 | gst-libs/gst/gl/meson.build | 15 ++++++++++++--- | ||
18 | 1 file changed, 12 insertions(+), 3 deletions(-) | ||
19 | |||
20 | diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build | ||
21 | index 66668644e..53891625a 100644 | ||
22 | --- a/gst-libs/gst/gl/meson.build | ||
23 | +++ b/gst-libs/gst/gl/meson.build | ||
24 | @@ -1004,11 +1004,20 @@ if build_gstgl | ||
25 | command : [mkenums, glib_mkenums, '@OUTPUT@', '@INPUT@']) | ||
26 | gen_sources = [gl_enumtypes_h] | ||
27 | |||
28 | + common_args = gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'] | ||
29 | + | ||
30 | + # We have custom_target() that generate headers in the current build dir, | ||
31 | + # but with implicit_include_directories: false, meson >= 0.58.0 won't include | ||
32 | + # it by default. We cannot use include_directories('.') here because it would | ||
33 | + # also include current source dir which is what we want to avoid because | ||
34 | + # case-insensitive FS would include gst-libs/gl/egl/egl.h as EGL/egl.h. | ||
35 | + common_args += '-I@0@'.format(meson.current_build_dir()) | ||
36 | + | ||
37 | gstgl = library('gstgl-' + api_version, | ||
38 | gl_sources, gl_egl_sources, gl_x11_sources, gl_wayland_sources, gl_priv_sources, gl_enumtypes_c, gl_enumtypes_h, | ||
39 | - c_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'], | ||
40 | - cpp_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'], | ||
41 | - objc_args : gst_plugins_base_args + gl_cpp_args + gl_objc_args + ['-DBUILDING_GST_GL'], | ||
42 | + c_args : common_args, | ||
43 | + cpp_args : common_args, | ||
44 | + objc_args : common_args + gl_objc_args, | ||
45 | include_directories : [configinc, libsinc, gl_includes], | ||
46 | version : libversion, | ||
47 | soversion : soversion, | ||
48 | -- | ||
49 | GitLab | ||
50 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.4.bb index beddfb0386..73b433ab91 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.4.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.4.bb | |||
@@ -11,6 +11,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba | |||
11 | file://0003-viv-fb-Make-sure-config.h-is-included.patch \ | 11 | file://0003-viv-fb-Make-sure-config.h-is-included.patch \ |
12 | file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ | 12 | file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ |
13 | file://0004-glimagesink-Downrank-to-marginal.patch \ | 13 | file://0004-glimagesink-Downrank-to-marginal.patch \ |
14 | file://4ef5c91697a141fea7317aff7f0f28e5a861db99.patch \ | ||
14 | " | 15 | " |
15 | SRC_URI[sha256sum] = "29e53229a84d01d722f6f6db13087231cdf6113dd85c25746b9b58c3d68e8323" | 16 | SRC_URI[sha256sum] = "29e53229a84d01d722f6f6db13087231cdf6113dd85c25746b9b58c3d68e8323" |
16 | 17 | ||