Backport qmlglsink build fix for EGL platform with no X11 headers. Signed-off-by: Gowtham Tammana <[email protected]> --- ...ild-on-EGL-platform-without-X11-head.patch | 36 +++++++++++++++++++ .../gstreamer1.0-plugins-good_1.16.%.bbappend | 3 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch new file mode 100644 index 00000000..79db0e27 --- /dev/null +++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch @@ -0,0 +1,36 @@ +From 85229adbddcd8e7cacd5ebd9467c834352a882d0 Mon Sep 17 00:00:00 2001 +From: Philipp Zabel <[email protected]> +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 + +Upstream-Status: Backport [c47a585052fba6830a2cddd8caa18e2305596ed0] + +Signed-off-by: Gowtham Tammana <[email protected]> +--- + ext/qt/meson.build | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ext/qt/meson.build b/ext/qt/meson.build +index 5f040c844..43ddc6092 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 +-- +2.17.1 diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.%.bbappend b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.%.bbappend index 004a9968..e2ddbc27 100644 --- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.%.bbappend +++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.%.bbappend @@ -7,6 +7,7 @@ SRC_URI += " \ file://0002-v4l2src-Use-generic-dmabuf-import-in-v4l2src.patch \ file://0001-v4l2object-Update-formats-table-to-include-YUV422-mu.patch \ file://0001-v4l2src-Check-for-drm-memory-support-in-try_import.patch \ + file://0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch \ " -PR_append = ".arago2" +PR_append = ".arago3" -- 2.29.0 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
