From 10c814f2273940604d6c3c7853e8475959b6eb5d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 20 Mar 2024 13:22:19 +0000 Subject: gstreamer1.0-plugins-base: Don't always enable viv-fb GStreamer is now 1.22.5 and as commented drop the viv-fb append. i.MX 7ULP has a GPU and should still use viv-fb Signed-off-by: Samuli Piippo --- .../gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend | 3 ++- .../gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend index 761189af8..ca6636b83 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend @@ -6,7 +6,7 @@ PACKAGECONFIG_GL:use-mainline-bsp = \ "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl gbm', '', d)}" # The i.MX8 uses KMS instead of the Vivante specific framebuffer API. -# The i.MX7 does not have a GPU. +# The i.MX7 does not have a GPU, except for ULP. # This leaves the i.MX6 - with the vendor BSP - as the remaining use case for viv-fb. # # (Note that viv-fb is about the _windowing system_. Vivante direct texture support @@ -14,3 +14,4 @@ PACKAGECONFIG_GL:use-mainline-bsp = \ # which was fixed in GStreamer 1.22.5. Since then, the direct texture support is # detected by Meson by checking for direct texture symbols like "glTexDirectVIV".) PACKAGECONFIG_GL:append:mx6-nxp-bsp = " viv-fb " +PACKAGECONFIG_GL:append:mx7ulp-nxp-bsp = " viv-fb " diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb index 366314bdf..29347f219 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb @@ -125,12 +125,6 @@ S = "${WORKDIR}/git" inherit use-imx-headers -# Prior to version 1.22.5, viv-fb is coupled with the Vivante direct texture feature. -# For this reason, in these older versions, viv-fb must be enabled always, even when -# building for SoCs like the i.MX8 that do not support the viv-fb windowing system. -# TODO: Once this .imx recipe is upgraded to 1.22.5 or newer, drop this line. -PACKAGECONFIG_GL:append = " viv-fb " - PACKAGECONFIG_REMOVE ?= "jpeg" PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}" PACKAGECONFIG:append:imxgpu2d = " g2d" -- cgit v1.2.3-54-g00ecf