From f54138fb4bdb79154ad3dc450c30fc9be765d6a5 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 10 Feb 2021 13:58:29 -0500 Subject: Update to YP dunfell 3.1.5 Changes include: - Backport gstreamer 1.16.2 vs 1.16.3 workaround for rcar3 (originally for SPEC-3706 in master, now updated per SPEC-3803). - Add 1.16.% wildcard version of meta-rcar-gen3-adas Kingfisher support layer gstreamer1.0-plugins-bad bbappend. The issue is the same as with the main meta-rcar-gen3 BSP layer bbappends mentioned above, but this particular bbappend has been disabled in the newer BSP in master/koi, so they did not need a fix. - Add override of PREFERRED_VERSION_libdrm for rcar3 to quiet warnings about 2.4.100 not being available, which are caused by dunfell 3.1.5 bringing an update to 2.4.101. - Pin Raspberry Pi kernel version to 4.19. meta-raspberrypi upstream has switched their default kernel to 5.4 on their dunfell branch, but that significant of a change is not desirable in a AGL point release. - Remove now upstreamed systemd patch. Bug-AGL: SPEC-3793, SPEC-3803 Signed-off-by: Scott Murray Change-Id: Ia678b8f56f35026a62a9f6ab40f9727b10756ad6 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26042 Tested-by: Jan-Simon Moeller Reviewed-by: Jan-Simon Moeller --- .../cogent-symlinks/recipes-multimedia/gstreamer | 1 - .../gstreamer/gstreamer1.0-omx_%.bbappend | 1 + .../0001-install-wayland.h-header.patch | 33 ++++++++++++++++++++++ .../0002-pkgconfig-libgstwayland.patch | 32 +++++++++++++++++++++ ...003-gstkmssink-add-rcar-du-to-driver-list.patch | 25 ++++++++++++++++ .../gstreamer1.0-plugins-bad_1.16.%.bbappend | 13 +++++++++ 6 files changed, 104 insertions(+), 1 deletion(-) delete mode 120000 meta-agl-bsp/meta-rcar-gen3-adas/cogent-symlinks/recipes-multimedia/gstreamer create mode 120000 meta-agl-bsp/meta-rcar-gen3-adas/cogent-symlinks/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend create mode 100644 meta-agl-bsp/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-install-wayland.h-header.patch create mode 100644 meta-agl-bsp/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-pkgconfig-libgstwayland.patch create mode 100644 meta-agl-bsp/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-gstkmssink-add-rcar-du-to-driver-list.patch create mode 100644 meta-agl-bsp/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend (limited to 'meta-agl-bsp/meta-rcar-gen3-adas') diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/cogent-symlinks/recipes-multimedia/gstreamer b/meta-agl-bsp/meta-rcar-gen3-adas/cogent-symlinks/recipes-multimedia/gstreamer deleted file mode 120000 index ef3ed76fd..000000000 --- a/meta-agl-bsp/meta-rcar-gen3-adas/cogent-symlinks/recipes-multimedia/gstreamer +++ /dev/null @@ -1 +0,0 @@ -../../../../../bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/ \ No newline at end of file diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/cogent-symlinks/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend b/meta-agl-bsp/meta-rcar-gen3-adas/cogent-symlinks/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend new file mode 120000 index 000000000..2175b25e6 --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3-adas/cogent-symlinks/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend @@ -0,0 +1 @@ +../../../../../../bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend \ No newline at end of file diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-install-wayland.h-header.patch b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-install-wayland.h-header.patch new file mode 100644 index 000000000..d98ca26d5 --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-install-wayland.h-header.patch @@ -0,0 +1,33 @@ +From 688a7bfe44a3ca9029fccdb1f7bfdd405927dade Mon Sep 17 00:00:00 2001 +From: Grigory Kletsko +Date: Thu, 5 May 2016 15:55:55 +0300 +Subject: [PATCH] install wayland.h header + +--- + gst-libs/gst/wayland/Makefile.am | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/gst-libs/gst/wayland/Makefile.am b/gst-libs/gst/wayland/Makefile.am +index a9f3f7b..7281a6e 100644 +--- a/gst-libs/gst/wayland/Makefile.am ++++ b/gst-libs/gst/wayland/Makefile.am +@@ -5,6 +5,8 @@ libgstwayland_@GST_API_VERSION@_la_SOURCES = wayland.c + libgstwayland_@GST_API_VERSION@includedir = \ + $(includedir)/gstreamer-@GST_API_VERSION@/gst/wayland + ++libgstwayland_@GST_API_VERSION@include_HEADERS = wayland.h ++ + libgstwayland_@GST_API_VERSION@_la_CFLAGS = \ + $(GST_PLUGINS_BAD_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) \ +@@ -22,7 +24,3 @@ libgstwayland_@GST_API_VERSION@_la_LDFLAGS = \ + $(GST_LIB_LDFLAGS) \ + $(GST_ALL_LDFLAGS) \ + $(GST_LT_LDFLAGS) +- +-noinst_HEADERS = \ +- wayland.h +- +-- +2.5.0 + diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-pkgconfig-libgstwayland.patch b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-pkgconfig-libgstwayland.patch new file mode 100644 index 000000000..f677b432b --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-pkgconfig-libgstwayland.patch @@ -0,0 +1,32 @@ +From 96044f1d3773ba2783e3956729cd9c85b04733da Mon Sep 17 00:00:00 2001 +From: Grigory Kletsko +Date: Thu, 12 May 2016 21:24:38 +0300 +Subject: [PATCH] fix + +--- + pkgconfig/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am +index 8e74a8e..f641285 100644 +--- a/pkgconfig/Makefile.am ++++ b/pkgconfig/Makefile.am +@@ -1,6 +1,7 @@ + + ### all of the standard pc files we need to generate + pcverfiles = \ ++ gstreamer-wayland-@GST_API_VERSION@.pc \ + gstreamer-plugins-bad-@GST_API_VERSION@.pc \ + gstreamer-codecparsers-@GST_API_VERSION@.pc \ + gstreamer-insertbin-@GST_API_VERSION@.pc \ +@@ -11,6 +12,7 @@ pcverfiles = \ + gstreamer-bad-audio-@GST_API_VERSION@.pc + + pcverfiles_uninstalled = \ ++ gstreamer-wayland-@GST_API_VERSION@-uninstalled.pc \ + gstreamer-plugins-bad-@GST_API_VERSION@-uninstalled.pc \ + gstreamer-codecparsers-@GST_API_VERSION@-uninstalled.pc \ + gstreamer-insertbin-@GST_API_VERSION@-uninstalled.pc \ +-- +2.5.0 + diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-gstkmssink-add-rcar-du-to-driver-list.patch b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-gstkmssink-add-rcar-du-to-driver-list.patch new file mode 100644 index 000000000..6b421ac67 --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-gstkmssink-add-rcar-du-to-driver-list.patch @@ -0,0 +1,25 @@ +From 300a679bd033d9b3fcf6873b1cd0385f0e0435ae Mon Sep 17 00:00:00 2001 +From: Sergey Nazaryev +Date: Tue, 26 Feb 2019 17:55:54 +0300 +Subject: [PATCH] gstkmssink: add rcar-du to driver list + +--- + sys/kms/gstkmssink.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sys/kms/gstkmssink.c b/sys/kms/gstkmssink.c +index cdecbf6..0b11233 100644 +--- a/sys/kms/gstkmssink.c ++++ b/sys/kms/gstkmssink.c +@@ -177,7 +177,7 @@ kms_open (gchar ** driver) + { + static const char *drivers[] = { "i915", "radeon", "nouveau", "vmwgfx", + "exynos", "amdgpu", "imx-drm", "rockchip", "atmel-hlcdc", "msm", +- "xlnx", "vc4", "meson", "sun4i-drm", "mxsfb-drm", ++ "xlnx", "vc4", "meson", "sun4i-drm", "mxsfb-drm", "rcar-du", + "xilinx_drm", /* DEPRECATED. Replaced by xlnx */ + }; + int i, fd = -1; +-- +2.7.4 + diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend new file mode 100644 index 000000000..3d910304c --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend @@ -0,0 +1,13 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" + +SRC_URI_append = " \ + file://0001-install-wayland.h-header.patch \ + file://0002-pkgconfig-libgstwayland.patch \ + file://0003-gstkmssink-add-rcar-du-to-driver-list.patch \ +" + +PACKAGECONFIG_append = " kms" + +PACKAGECONFIG_remove = '${@ "vulkan" if not ('opengl' in '${DISTRO_FEATURES}') else ""}' +DEPENDS_remove = '${@ "weston" if not ('wayland' in '${DISTRO_FEATURES}') else ""}' +RDEPENDS_gstreamer1.0-plugins-bad_remove = '${@bb.utils.contains("DISTRO_FEATURES", "wayland opengl", "", "libwayland-egl", d)}' -- cgit 1.2.3-korg