* [PATCH] gstreamer1.0-plugins-good: backport qmlglsink EGL build fix
@ 2021-03-12 22:26 Gowtham Tammana
2021-03-12 22:50 ` Denys Dmytriyenko
0 siblings, 1 reply; 3+ messages in thread
From: Gowtham Tammana @ 2021-03-12 22:26 UTC (permalink / raw)
To: meta-arago
Backport qmlglsink build fix for EGL platform with no X11 headers.
Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
---
...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 <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
+
+Upstream-Status: Backport [c47a585052fba6830a2cddd8caa18e2305596ed0]
+
+Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
+---
+ 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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] gstreamer1.0-plugins-good: backport qmlglsink EGL build fix
2021-03-12 22:26 [PATCH] gstreamer1.0-plugins-good: backport qmlglsink EGL build fix Gowtham Tammana
@ 2021-03-12 22:50 ` Denys Dmytriyenko
2021-03-16 1:31 ` [EXTERNAL] " Tammana, Gowtham
0 siblings, 1 reply; 3+ messages in thread
From: Denys Dmytriyenko @ 2021-03-12 22:50 UTC (permalink / raw)
To: Gowtham Tammana; +Cc: meta-arago
On Fri, Mar 12, 2021 at 04:26:52PM -0600, Gowtham Tammana wrote:
> Backport qmlglsink build fix for EGL platform with no X11 headers.
>
> Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
> ---
> ...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 <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
Thanks for the backport! We've seen this issue in the past in other places
too, e.g.:
https://github.com/meta-qt5/meta-qt5/commit/41666ddba78ff1f094310589489e0a070e0094d8
http://arago-project.org/git/meta-arago.git?p=meta-arago.git;a=commitdiff;h=1e83ebf61bd22ca8ad04d5538db044d81330df2c
> +Upstream-Status: Backport [c47a585052fba6830a2cddd8caa18e2305596ed0]
Special thanks for Upstream-Status! :)
> +Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
Reviewed-by: Denys Dmytriyenko <denis@denix.org>
> +---
> + 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
--
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [EXTERNAL] Re: [PATCH] gstreamer1.0-plugins-good: backport qmlglsink EGL build fix
2021-03-12 22:50 ` Denys Dmytriyenko
@ 2021-03-16 1:31 ` Tammana, Gowtham
0 siblings, 0 replies; 3+ messages in thread
From: Tammana, Gowtham @ 2021-03-16 1:31 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago@arago-project.org
>-----Original Message-----
>From: Denys Dmytriyenko <denis@denix.org>
>Sent: Friday, March 12, 2021 4:51 PM
>To: Tammana, Gowtham <g-tammana@ti.com>
>Cc: meta-arago@arago-project.org
>Subject: [EXTERNAL] Re: [meta-arago] [PATCH] gstreamer1.0-plugins-good:
>backport qmlglsink EGL build fix
>
>On Fri, Mar 12, 2021 at 04:26:52PM -0600, Gowtham Tammana wrote:
>> Backport qmlglsink build fix for EGL platform with no X11 headers.
>>
>> Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
>> ---
>> ...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 <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
>
>Thanks for the backport! We've seen this issue in the past in other places
>too, e.g.:
That is correct, earlier we were explicitly adding the #define in the
headers as a quick workaround. Got around this again as part of migration,
and noticed the dependency miss and the patch in master.
>https://github.com/meta-qt5/meta-
>qt5/commit/41666ddba78ff1f094310589489e0a070e0094d8
>http://arago-project.org/git/meta-arago.git?p=meta-
>arago.git;a=commitdiff;h=1e83ebf61bd22ca8ad04d5538db044d81330df2c
Thanks for these links, will submit patches to revert these as followup.
>
>> +Upstream-Status: Backport [c47a585052fba6830a2cddd8caa18e2305596ed0]
>
>Special thanks for Upstream-Status! :)
>
>
>> +Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
>
>Reviewed-by: Denys Dmytriyenko <denis@denix.org>
Thanks for the review.
Gowtham
>
>> +---
>> + 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
>
>--
>Regards,
>Denys Dmytriyenko <denis@denix.org>
>PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
>Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-16 1:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-12 22:26 [PATCH] gstreamer1.0-plugins-good: backport qmlglsink EGL build fix Gowtham Tammana
2021-03-12 22:50 ` Denys Dmytriyenko
2021-03-16 1:31 ` [EXTERNAL] " Tammana, Gowtham
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.