diff options
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch')
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch deleted file mode 100644 index 0fa3dd30d..000000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch +++ /dev/null | |||
| @@ -1,48 +0,0 @@ | |||
| 1 | From 1718197bf6ebf3d8784a55126609aa8770fff682 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 | --- | ||
| 18 | gst-libs/gst/gl/meson.build | 15 ++++++++++++--- | ||
| 19 | 1 file changed, 12 insertions(+), 3 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build | ||
| 22 | index ae19d7aca..3ad7ddcf6 100644 | ||
| 23 | --- a/gst-libs/gst/gl/meson.build | ||
| 24 | +++ b/gst-libs/gst/gl/meson.build | ||
| 25 | @@ -1023,11 +1023,20 @@ if build_gstgl | ||
| 26 | command : [mkenums, glib_mkenums, '@OUTPUT@', '@INPUT@']) | ||
| 27 | gen_sources = [gl_enumtypes_h] | ||
| 28 | |||
| 29 | + common_args = gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'] | ||
| 30 | + | ||
| 31 | + # We have custom_target() that generate headers in the current build dir, | ||
| 32 | + # but with implicit_include_directories: false, meson >= 0.58.0 won't include | ||
| 33 | + # it by default. We cannot use include_directories('.') here because it would | ||
| 34 | + # also include current source dir which is what we want to avoid because | ||
| 35 | + # case-insensitive FS would include gst-libs/gl/egl/egl.h as EGL/egl.h. | ||
| 36 | + common_args += '-I@0@'.format(meson.current_build_dir()) | ||
| 37 | + | ||
| 38 | gstgl = library('gstgl-' + api_version, | ||
| 39 | gl_sources, gl_egl_sources, gl_x11_sources, gl_wayland_sources, gl_priv_sources, gl_enumtypes_c, gl_enumtypes_h, | ||
| 40 | - c_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'], | ||
| 41 | - cpp_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'], | ||
| 42 | - objc_args : gst_plugins_base_args + gl_cpp_args + gl_objc_args + ['-DBUILDING_GST_GL'], | ||
| 43 | + c_args : common_args, | ||
| 44 | + cpp_args : common_args, | ||
| 45 | + objc_args : common_args + gl_objc_args, | ||
| 46 | include_directories : [configinc, libsinc, gl_includes], | ||
| 47 | version : libversion, | ||
| 48 | soversion : soversion, | ||
