summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer
diff options
context:
space:
mode:
authorJose Quaresma <quaresma.jose@gmail.com>2021-10-04 00:41:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-11 18:41:39 +0100
commit53bbc43e796569a1d4d7a5e35a74307a072f2c9a (patch)
tree561181da660a0dd1f3fde342b14f6bd9c5f253f4 /meta/recipes-multimedia/gstreamer
parent5847afb51dd4b7fbd207c795876fe1e6a76a3460 (diff)
downloadpoky-53bbc43e796569a1d4d7a5e35a74307a072f2c9a.tar.gz
gstreamer1.0-plugins-base: 1.18.4 -> 1.18.5
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>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch50
-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 @@
1From 4ef5c91697a141fea7317aff7f0f28e5a861db99 Mon Sep 17 00:00:00 2001
2From: Xavier Claessens <xavier.claessens@collabora.com>
3Date: Mon, 26 Apr 2021 14:25:03 -0400
4Subject: [PATCH] gstgl: Fix build when Meson >= 0.58.0rc1
5
6"implicit_include_directories: false" now also means that current build
7directory is not added to include paths by default any more. We have to
8add it manually because we have some custom_target() that generate
9headers in current build directory.
10
11See https://github.com/mesonbuild/meson/issues/8700.
12
13Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1125>
14Upstream-Status: Backport
15Signed-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
20diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build
21index 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--
49GitLab
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.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
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 \
15 " 14 "
16SRC_URI[sha256sum] = "29e53229a84d01d722f6f6db13087231cdf6113dd85c25746b9b58c3d68e8323" 15SRC_URI[sha256sum] = "960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3"
17 16
18S = "${WORKDIR}/gst-plugins-base-${PV}" 17S = "${WORKDIR}/gst-plugins-base-${PV}"
19 18