mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-18 03:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

gstreamer1.0-plugins-base: 1.18.4 -> 1.18.5

Browse Source 
Drop backport patches:
    * 4ef5c91697a141fea7317aff7f0f28e5a861db99.patch

(From OE-Core rev: de0ee4323a19a27b6bcef7cc791d0373c311ef22)

Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jose Quaresma
2021-10-04 00:41:56 +01:00
committed by Richard Purdie
parent 5847afb51d
commit 53bbc43e79
2 changed files with 1 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch
View File

@@ -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

3
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.4.bb → meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb
View File

@@ -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}"