From: Denys Dmytriyenko <de...@konsulko.com>
Drop previously backported patch.
Signed-off-by: Denys Dmytriyenko <de...@konsulko.com>
---
...ix-build-on-EGL-platform-without-X11-head.patch | 36 ----------------------
...d => gstreamer1.0-plugins-good_1.18.%.bbappend} | 1 -
2 files changed, 37 deletions(-)
delete mode 100644
meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch
rename
meta-arago-extras/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.16.%.bbappend
=> gstreamer1.0-plugins-good_1.18.%.bbappend} (84%)
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
deleted file mode 100644
index 79db0e2..0000000
---
a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 85229adbddcd8e7cacd5ebd9467c834352a882d0 Mon Sep 17 00:00:00 2001
-From: Philipp Zabel <p.za...@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-tamm...@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.18.%.bbappend
similarity index 84%
rename from
meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.%.bbappend
rename to
meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.%.bbappend
index e2ddbc2..4864f4b 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.18.%.bbappend
@@ -7,7 +7,6 @@ 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 = ".arago3"
--
2.7.4
_______________________________________________
meta-arago mailing list
meta-arago@arago-project.org
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
