diff options
-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.5.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.4.bb) | 3 |
2 files changed, 1 insertions, 52 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 deleted file mode 100644 index a2f5dff5e9..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 4ef5c91697a141fea7317aff7f0f28e5a861db99 Mon Sep 17 00:00:00 2001 -From: Xavier Claessens <xavier.claessens@collabora.com> -Date: Mon, 26 Apr 2021 14:25:03 -0400 -Subject: [PATCH] gstgl: Fix build when Meson >= 0.58.0rc1 - -"implicit_include_directories: false" now also means that current build -directory is not added to include paths by default any more. We have to -add it manually because we have some custom_target() that generate -headers in current build directory. - -See https://github.com/mesonbuild/meson/issues/8700. - -Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1125> -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - gst-libs/gst/gl/meson.build | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build -index 66668644e..53891625a 100644 ---- a/gst-libs/gst/gl/meson.build -+++ b/gst-libs/gst/gl/meson.build -@@ -1004,11 +1004,20 @@ if build_gstgl - command : [mkenums, glib_mkenums, '@OUTPUT@', '@INPUT@']) - gen_sources = [gl_enumtypes_h] - -+ common_args = gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'] -+ -+ # We have custom_target() that generate headers in the current build dir, -+ # but with implicit_include_directories: false, meson >= 0.58.0 won't include -+ # it by default. We cannot use include_directories('.') here because it would -+ # also include current source dir which is what we want to avoid because -+ # case-insensitive FS would include gst-libs/gl/egl/egl.h as EGL/egl.h. -+ common_args += '-I@0@'.format(meson.current_build_dir()) -+ - gstgl = library('gstgl-' + api_version, - gl_sources, gl_egl_sources, gl_x11_sources, gl_wayland_sources, gl_priv_sources, gl_enumtypes_c, gl_enumtypes_h, -- c_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'], -- cpp_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'], -- objc_args : gst_plugins_base_args + gl_cpp_args + gl_objc_args + ['-DBUILDING_GST_GL'], -+ c_args : common_args, -+ cpp_args : common_args, -+ objc_args : common_args + gl_objc_args, - include_directories : [configinc, libsinc, gl_includes], - version : libversion, - soversion : soversion, --- -GitLab - 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.5.bb index 90a8d7dfbb..5e2cca3864 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.5.bb @@ -11,9 +11,8 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba file://0003-viv-fb-Make-sure-config.h-is-included.patch \ file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ file://0004-glimagesink-Downrank-to-marginal.patch \ - file://4ef5c91697a141fea7317aff7f0f28e5a861db99.patch \ " -SRC_URI[sha256sum] = "29e53229a84d01d722f6f6db13087231cdf6113dd85c25746b9b58c3d68e8323" +SRC_URI[sha256sum] = "960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3" S = "${WORKDIR}/gst-plugins-base-${PV}" |