aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2022-01-11 13:32:18 -0500
committerScott Murray <scott.murray@konsulko.com>2022-03-30 14:08:33 -0400
commitd4605cc4d5e3209d29e1ccd357611125e6262242 (patch)
tree9be44155409a49d2ac93f721f7d2a3dc9c9d0cf1
parent6c546aa68a4c0281cb74e2b2dc68f82b102fbbbd (diff)
meta-agl-core: remove backported gstreamer patch
Remove backported gstreamer1.0-plugins-bad waylandsink patch as it is no longer required with the version in poky master/Kirkstone. Bug-AGL: SPEC-3819 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I84ef92bde4ac28382321e9faf7be6ac8a4ce70e8
-rw-r--r--meta-agl-core/recipes-multimedia/gstreamer/files/0001-waylandsink-Fix-xdg_shell-fullscreen-mode.patch60
-rw-r--r--meta-agl-core/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.3.bbappend1
-rw-r--r--meta-agl-core/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_aglcore.inc3
3 files changed, 0 insertions, 64 deletions
diff --git a/meta-agl-core/recipes-multimedia/gstreamer/files/0001-waylandsink-Fix-xdg_shell-fullscreen-mode.patch b/meta-agl-core/recipes-multimedia/gstreamer/files/0001-waylandsink-Fix-xdg_shell-fullscreen-mode.patch
deleted file mode 100644
index 9a11fa1d7..000000000
--- a/meta-agl-core/recipes-multimedia/gstreamer/files/0001-waylandsink-Fix-xdg_shell-fullscreen-mode.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 58b1f41f992e457b25eda125b6f823f97128e203 Mon Sep 17 00:00:00 2001
-From: Shinya Saito <ssaito@igel.co.jp>
-Date: Thu, 22 Aug 2019 16:04:37 +0900
-Subject: [PATCH] waylandsink: Fix xdg_shell fullscreen mode
-
-xdg_shell fullscreen mode doesn't work for committing
-xdg_surface without configure acknowledgement.
-
-In addition, we can't set different surface setting from
-acknowledged config in this mode.
-
-Upstream-Status: Backport [from master/1.17.1]
----
- ext/wayland/wlwindow.c | 16 +++++++++++-----
- 1 file changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/ext/wayland/wlwindow.c b/ext/wayland/wlwindow.c
-index f22ebcab6..50158795b 100644
---- a/ext/wayland/wlwindow.c
-+++ b/ext/wayland/wlwindow.c
-@@ -259,7 +259,6 @@ gst_wl_window_new_toplevel (GstWlDisplay * display, const GstVideoInfo * info,
- gboolean fullscreen, GMutex * render_lock)
- {
- GstWlWindow *window;
-- gint width;
-
- window = gst_wl_window_new_internal (display, render_lock);
-
-@@ -325,10 +324,14 @@ gst_wl_window_new_toplevel (GstWlDisplay * display, const GstVideoInfo * info,
- goto error;
- }
-
-- /* set the initial size to be the same as the reported video size */
-- width =
-- gst_util_uint64_scale_int_round (info->width, info->par_n, info->par_d);
-- gst_wl_window_set_render_rectangle (window, 0, 0, width, info->height);
-+ /* render_rectangle is already set via toplevel_configure in
-+ * xdg_shell fullscreen mode */
-+ if (!(display->xdg_wm_base && fullscreen)) {
-+ /* set the initial size to be the same as the reported video size */
-+ gint width =
-+ gst_util_uint64_scale_int_round (info->width, info->par_n, info->par_d);
-+ gst_wl_window_set_render_rectangle (window, 0, 0, width, info->height);
-+ }
-
- return window;
-
-@@ -548,6 +551,9 @@ gst_wl_window_set_render_rectangle (GstWlWindow * window, gint x, gint y,
-
- gst_wl_window_update_borders (window);
-
-+ if (!window->configured)
-+ return;
-+
- if (window->video_width != 0) {
- wl_subsurface_set_sync (window->video_subsurface);
- gst_wl_window_resize_video_surface (window, TRUE);
---
-2.20.1
-
diff --git a/meta-agl-core/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.3.bbappend b/meta-agl-core/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.3.bbappend
deleted file mode 100644
index 980783236..000000000
--- a/meta-agl-core/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.3.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require ${@bb.utils.contains('AGL_FEATURES', 'aglcore', '${BPN}_aglcore.inc', '', d)}
diff --git a/meta-agl-core/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_aglcore.inc b/meta-agl-core/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_aglcore.inc
deleted file mode 100644
index 618065f7f..000000000
--- a/meta-agl-core/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_aglcore.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://0001-waylandsink-Fix-xdg_shell-fullscreen-mode.patch"