From 3b1c9c16b7dc6d3afca254f9f9adff073235c258 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 25 May 2020 17:06:41 +0000 Subject: Remove agl-gstrecorder / meta-gstrecorder-rcar-gen3 Remove the agl-gstrecorder feature and its meta-gstrecorder-rcar-gen3 layer. The feature itself is going to be replaced with a more generic agl-weston-remoting feature in meta-agl. From the layer, the remoting gbm fix is no longer required for rcar3 in Weston 8.0.0, and the remoting initialization timing patch is generic, and is thus going to be applied for all platforms in meta-agl-profile-graphical to make cluster support generic. Bug-AGL: SPEC-3395 Signed-off-by: Scott Murray Change-Id: I69ea73cc14a30e084fb0443628956fdc2572060e --- .../conf/include/agl_gstrecorder.inc | 1 - meta-gstrecorder-rcar-gen3/conf/layer.conf | 12 ------- ...0001-remoting-Fix-remoting-gbm-dependency.patch | 41 ---------------------- ...ain-change-remoting-initialization-timing.patch | 39 -------------------- .../recipes-graphics/wayland/weston_6.0.0.bbappend | 12 ------- .../feature/agl-gstrecorder/50_bblayers.conf.inc | 5 --- .../feature/agl-gstrecorder/50_local.conf.inc | 3 -- .../feature/agl-gstrecorder/50_setupwarning.sh | 14 -------- .../README_feature_agl-gstrecorder.md | 9 ----- 9 files changed, 136 deletions(-) delete mode 100644 meta-gstrecorder-rcar-gen3/conf/include/agl_gstrecorder.inc delete mode 100644 meta-gstrecorder-rcar-gen3/conf/layer.conf delete mode 100644 meta-gstrecorder-rcar-gen3/recipes-graphics/wayland/weston/0001-remoting-Fix-remoting-gbm-dependency.patch delete mode 100644 meta-gstrecorder-rcar-gen3/recipes-graphics/wayland/weston/0002-main-change-remoting-initialization-timing.patch delete mode 100644 meta-gstrecorder-rcar-gen3/recipes-graphics/wayland/weston_6.0.0.bbappend delete mode 100644 templates/feature/agl-gstrecorder/50_bblayers.conf.inc delete mode 100644 templates/feature/agl-gstrecorder/50_local.conf.inc delete mode 100755 templates/feature/agl-gstrecorder/50_setupwarning.sh delete mode 100644 templates/feature/agl-gstrecorder/README_feature_agl-gstrecorder.md diff --git a/meta-gstrecorder-rcar-gen3/conf/include/agl_gstrecorder.inc b/meta-gstrecorder-rcar-gen3/conf/include/agl_gstrecorder.inc deleted file mode 100644 index bd289b10..00000000 --- a/meta-gstrecorder-rcar-gen3/conf/include/agl_gstrecorder.inc +++ /dev/null @@ -1 +0,0 @@ -DISTRO_FEATURES_append = " gst-record" diff --git a/meta-gstrecorder-rcar-gen3/conf/layer.conf b/meta-gstrecorder-rcar-gen3/conf/layer.conf deleted file mode 100644 index fe4492a6..00000000 --- a/meta-gstrecorder-rcar-gen3/conf/layer.conf +++ /dev/null @@ -1,12 +0,0 @@ -# We have a conf and classes directory, add to BBPATH -BBPATH =. "${LAYERDIR}:" - -# We have recipes-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" - -BBFILE_COLLECTIONS += "gstrecorder-rcar-gen3" -BBFILE_PATTERN_gstrecorder-rcar-gen3 = "^${LAYERDIR}/" -BBFILE_PRIORITY_gstrecorder-rcar-gen3 = "7" - -LAYERSERIES_COMPAT_gstrecorder-rcar-gen3 = "thud" diff --git a/meta-gstrecorder-rcar-gen3/recipes-graphics/wayland/weston/0001-remoting-Fix-remoting-gbm-dependency.patch b/meta-gstrecorder-rcar-gen3/recipes-graphics/wayland/weston/0001-remoting-Fix-remoting-gbm-dependency.patch deleted file mode 100644 index a4334750..00000000 --- a/meta-gstrecorder-rcar-gen3/recipes-graphics/wayland/weston/0001-remoting-Fix-remoting-gbm-dependency.patch +++ /dev/null @@ -1,41 +0,0 @@ -From edc292341e037f9646dd183dfc110ad850184a4d Mon Sep 17 00:00:00 2001 -From: Harunobu Kurokawa -Date: Fri, 7 Jun 2019 12:18:07 +0900 -Subject: [PATCH] remoting: Fix remoting gbm dependency - -Add missing dependency for gbm. - -Signed-off-by: Harunobu Kurokawa ---- - configure.ac | 1 + - remoting/remoting-plugin.c | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c05ad01..0483ecd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -246,6 +246,7 @@ if test x$enable_remoting = xyes; then - if test x$enable_drm_compositor != xyes; then - AC_MSG_WARN([The remoting-plugin.so module requires the DRM backend.]) - fi -+ PKG_CHECK_MODULES(REMOTING_GBM, [gbm]) - PKG_CHECK_MODULES(REMOTING_GST, [gstreamer-1.0 gstreamer-allocators-1.0 gstreamer-app-1.0 gstreamer-video-1.0]) - fi - -diff --git a/remoting/remoting-plugin.c b/remoting/remoting-plugin.c -index e99d61e..f076825 100644 ---- a/remoting/remoting-plugin.c -+++ b/remoting/remoting-plugin.c -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - - #include - #include --- -2.7.4 - diff --git a/meta-gstrecorder-rcar-gen3/recipes-graphics/wayland/weston/0002-main-change-remoting-initialization-timing.patch b/meta-gstrecorder-rcar-gen3/recipes-graphics/wayland/weston/0002-main-change-remoting-initialization-timing.patch deleted file mode 100644 index db5060d2..00000000 --- a/meta-gstrecorder-rcar-gen3/recipes-graphics/wayland/weston/0002-main-change-remoting-initialization-timing.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0a0103f20437d9ed63b6cec500027a6d7bf6185f Mon Sep 17 00:00:00 2001 -From: Harunobu Kurokawa -Date: Mon, 20 May 2019 18:31:32 +0900 -Subject: [PATCH] main: change remoting initialization timing - -Signed-off-by: Tomohito Esaki -Signed-off-by: Harunobu Kurokawa ---- - compositor/main.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/compositor/main.c b/compositor/main.c -index 248298e..de7190b 100644 ---- a/compositor/main.c -+++ b/compositor/main.c -@@ -2018,9 +2018,6 @@ load_drm_backend(struct weston_compositor *c, - ret = weston_compositor_load_backend(c, WESTON_BACKEND_DRM, - &config.base); - -- /* remoting */ -- load_remoting(c, wc); -- - free(config.gbm_format); - free(config.seat_id); - -@@ -2664,6 +2661,10 @@ int main(int argc, char *argv[]) - if (wet.init_failed) - goto out; - -+ /* remoting: only support on drm-backend */ -+ if (strstr(backend, "drm-backend.so")) -+ load_remoting(wet.compositor, config); -+ - if (idle_time < 0) - weston_config_section_get_int(section, "idle-time", &idle_time, -1); - if (idle_time < 0) --- -2.9.2 - diff --git a/meta-gstrecorder-rcar-gen3/recipes-graphics/wayland/weston_6.0.0.bbappend b/meta-gstrecorder-rcar-gen3/recipes-graphics/wayland/weston_6.0.0.bbappend deleted file mode 100644 index 72723ded..00000000 --- a/meta-gstrecorder-rcar-gen3/recipes-graphics/wayland/weston_6.0.0.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -DEPENDS_append = " gstreamer1.0-plugins-base" - -PACKAGECONFIG_append = " remoting" - -PACKAGECONFIG[remoting] = " --enable-remoting" - -SRC_URI_append = " \ - file://0001-remoting-Fix-remoting-gbm-dependency.patch \ - file://0002-main-change-remoting-initialization-timing.patch \ -" diff --git a/templates/feature/agl-gstrecorder/50_bblayers.conf.inc b/templates/feature/agl-gstrecorder/50_bblayers.conf.inc deleted file mode 100644 index 72160da4..00000000 --- a/templates/feature/agl-gstrecorder/50_bblayers.conf.inc +++ /dev/null @@ -1,5 +0,0 @@ - -BBLAYERS =+ " \ - ${METADIR}/meta-agl-devel/meta-gstrecorder-rcar-gen3 \ - " - diff --git a/templates/feature/agl-gstrecorder/50_local.conf.inc b/templates/feature/agl-gstrecorder/50_local.conf.inc deleted file mode 100644 index 54fedd6c..00000000 --- a/templates/feature/agl-gstrecorder/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -#see meta-agl-devel/meta-gstrecorder-rcar-gen3/conf/include/agl_gstrecorder.inc -require conf/include/agl_gstrecorder.inc - diff --git a/templates/feature/agl-gstrecorder/50_setupwarning.sh b/templates/feature/agl-gstrecorder/50_setupwarning.sh deleted file mode 100755 index ae6b1312..00000000 --- a/templates/feature/agl-gstrecorder/50_setupwarning.sh +++ /dev/null @@ -1,14 +0,0 @@ -#Note to the user! - -echo "##################################" -echo "# ATTENTION: the network between #" -echo "# sender and receiver of the #" -echo "# gstrecorder feed needs to be #" -echo "# configured or #" -echo "# WESTON WILL FAIL TO START ! #" -echo "# #" -echo "# (hint: 192.168.20.x) #" -echo "##################################" - -sleep 2 - diff --git a/templates/feature/agl-gstrecorder/README_feature_agl-gstrecorder.md b/templates/feature/agl-gstrecorder/README_feature_agl-gstrecorder.md deleted file mode 100644 index 39617bb9..00000000 --- a/templates/feature/agl-gstrecorder/README_feature_agl-gstrecorder.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Feature agl-gstrecorder -authors: Harunobu Kurokawa , Jan-Simon Möller , Scott Murray , Stephane Desneux ---- - -### Feature agl-gstrecorder - -*Description is missing - please complete file meta-agl-devel/templates/feature/agl-gstrecorder/README_feature_agl-gstrecorder.md* - -- cgit 1.2.3-korg