diff options
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-viv-fb-code-must-link-against-libg2d.patch')
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-viv-fb-code-must-link-against-libg2d.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-viv-fb-code-must-link-against-libg2d.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-viv-fb-code-must-link-against-libg2d.patch deleted file mode 100644 index c761619f..00000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-viv-fb-code-must-link-against-libg2d.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From 8153e86dac04076fb80fc272c8374d4ba019fa3c Mon Sep 17 00:00:00 2001 | ||
2 | From: Zan Dobersek <zdobersek@igalia.com> | ||
3 | Date: Wed, 4 Nov 2020 14:02:10 +0100 | ||
4 | Subject: [PATCH] meson: viv-fb code must link against libg2d | ||
5 | |||
6 | Find the libg2d library and link against it, if necessary, avoiding | ||
7 | linking errors for couple of libg2d symbols. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Zan Dobersek <zdobersek@igalia.com> | ||
12 | --- | ||
13 | gst-libs/gst/gl/meson.build | 6 +++++- | ||
14 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build | ||
17 | index 6f6c6866d..fb6a9aabf 100644 | ||
18 | --- a/gst-libs/gst/gl/meson.build | ||
19 | +++ b/gst-libs/gst/gl/meson.build | ||
20 | @@ -818,9 +818,11 @@ if need_win_gbm != 'no' | ||
21 | endif | ||
22 | |||
23 | if need_platform_egl != 'no' and need_win_viv_fb != 'no' | ||
24 | - if egl_dep.found() and cc.has_function ('fbGetDisplay', dependencies : egl_dep) | ||
25 | + g2d_dep = cc.find_library('g2d', required : false) | ||
26 | + if egl_dep.found() and g2d_dep.found() and cc.has_function ('fbGetDisplay', dependencies : egl_dep) | ||
27 | if cc.has_function ('glTexDirectVIV', dependencies : gles2_dep) | ||
28 | enabled_gl_winsys += 'viv-fb' | ||
29 | + gl_winsys_deps += [g2d_dep] | ||
30 | glconf.set10('GST_GL_HAVE_WINDOW_VIV_FB', 1) | ||
31 | glconf.set10('GST_GL_HAVE_VIV_DIRECTVIV', 1) | ||
32 | glconf.set10('GST_GL_HAVE_PHYMEM', 1) | ||
33 | @@ -834,6 +836,8 @@ if need_platform_egl != 'no' and need_win_viv_fb != 'no' | ||
34 | ] | ||
35 | gl_cpp_args += ['-DEGL_API_FB'] | ||
36 | endif | ||
37 | + else | ||
38 | + g2d_dep = unneeded_dep | ||
39 | endif | ||
40 | endif | ||
41 | |||
42 | -- | ||
43 | 2.28.0 | ||
44 | |||