From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Date: Fri, 14 Feb 2020 10:18:26 +0100 From: Michael Olbrich Message-ID: <20200214091826.GD7958@pengutronix.de> References: <20200213172208.22452-1-matthias.schiffer@ew.tq-group.com> <20200213172208.22452-4-matthias.schiffer@ew.tq-group.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200213172208.22452-4-matthias.schiffer@ew.tq-group.com> Subject: Re: [ptxdist] [PATCH] gst-plugins-good1: qmlglsink: fix build on EGL platform without X11 headers List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Cc: matthias.schiffer@ew.tq-group.com On Thu, Feb 13, 2020 at 06:22:06PM +0100, Matthias Schiffer wrote: > Signed-off-by: Matthias Schiffer > --- > > Considering who authored the upstream patch, I'm surprised this is not > in PTXdist yet - it seems it was forgotten? It probably got lost. We usually have more gst-plugins-good patches in the BSP anyways (for v4l2 and others), so we don't notice this. But it's a good idea to have this patch, so I'll apply this. Michael > ...ild-on-EGL-platform-without-X11-head.patch | 29 +++++++++++++++++++ > patches/gst-plugins-good-1.16.2/series | 4 +++ > 2 files changed, 33 insertions(+) > create mode 100644 patches/gst-plugins-good-1.16.2/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch > create mode 100644 patches/gst-plugins-good-1.16.2/series > > 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 > +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 > -- > 2.17.1 > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de