diff options
| author | Matthias Schiffer <matthias.schiffer@ew.tq-group.com> | 2020-02-13 18:22:06 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-02-14 10:16:33 +0100 |
| commit | 9824719322b008bfdb72745f13c9cfd54d015971 (patch) | |
| tree | 84e20bd0c3a91740aff984cdd51acdb2561e1549 /patches | |
| parent | 8034204897484d9af6cd8db15c773cb733967db5 (diff) | |
| download | ptxdist-9824719322b008bfdb72745f13c9cfd54d015971.tar.gz ptxdist-9824719322b008bfdb72745f13c9cfd54d015971.tar.xz | |
gst-plugins-good1: qmlglsink: fix build on EGL platform without X11 headers
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Message-Id: <20200213172208.22452-4-matthias.schiffer@ew.tq-group.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/gst-plugins-good-1.16.2/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch | 29 | ||||
| -rw-r--r-- | patches/gst-plugins-good-1.16.2/series | 4 |
2 files changed, 33 insertions, 0 deletions
diff --git a/patches/gst-plugins-good-1.16.2/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch b/patches/gst-plugins-good-1.16.2/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch new file mode 100644 index 000000000..fdf6ec413 --- /dev/null +++ b/patches/gst-plugins-good-1.16.2/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch @@ -0,0 +1,29 @@ +From: Philipp Zabel <p.zabel@pengutronix.de> +Date: Tue, 3 Dec 2019 11:36:07 +0100 +Subject: [PATCH] qmlglsink: fix build on EGL platform without X11 headers + +If Mesa is built without X11 headers, building against Mesa EGL headers +requires a dependency on egl.pc, to define MESA_EGL_NO_X11_HEADERS. +This fixes a build error when compiling ext/qt/gstqtglutility.cc: + + In file included from /usr/include/EGL/egl.h:39, + from /usr/include/gstreamer-1.0/gst/gl/egl/gstegl.h:44, + from ../gst-plugins-good-1.16.1/ext/qt/gstqtglutility.cc:43: + /usr/include/EGL/eglplatform.h:124:10: fatal error: X11/Xlib.h: No such file or directory +--- + ext/qt/meson.build | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ext/qt/meson.build b/ext/qt/meson.build +index 5f040c844174..43ddc6092b21 100644 +--- a/ext/qt/meson.build ++++ b/ext/qt/meson.build +@@ -89,6 +89,8 @@ if have_cxx and build_gstgl + if gst_gl_have_platform_egl + # Embedded linux (e.g. i.MX6) with or without windowing support + qt_defines += ['-DHAVE_QT_EGLFS'] ++ egl_dep = dependency('egl', required : false) ++ optional_deps += egl_dep + have_qt_windowing = true + if have_qpa_include + # Wayland windowing diff --git a/patches/gst-plugins-good-1.16.2/series b/patches/gst-plugins-good-1.16.2/series new file mode 100644 index 000000000..4a1386d15 --- /dev/null +++ b/patches/gst-plugins-good-1.16.2/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch +# 272968855eb57a1460afb6469b245e5d - git-ptx-patches magic |