From d15c1e8b06bd3299d264ea37d4ac5345c43f4706 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 3 Aug 2023 10:16:20 -0700 Subject: gstreamer1.0-vaapi: Use egl for all i.MX GPU i.MX 6 & 7 with GPU fails to build due to lack of glx support. Move the fix in 1.22.0.imx, which is limited to i.MX 8, to a generic bbappend so the upstream recipe is covered as well. Signed-off-by: Tom Hochstein --- recipes-multimedia/gstreamer/gstreamer1.0-vaapi_%.bbappend | 1 + recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.0.imx.bb | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 recipes-multimedia/gstreamer/gstreamer1.0-vaapi_%.bbappend diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_%.bbappend new file mode 100644 index 000000000..3b23818dd --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG_GL:imxgpu = "egl" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.0.imx.bb index 288de6c50..02dc86e44 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.0.imx.bb @@ -32,8 +32,13 @@ def get_gst_ver(v): PACKAGES =+ "${PN}-tests" -# Use egl for i.MX -PACKAGECONFIG_GL ?= "egl" +# OpenGL packageconfig factored out to make it easy for distros +# and BSP layers to pick either glx, egl, or no GL. By default, +# try detecting X11 first, and if found (with OpenGL), use GLX, +# otherwise try to check if EGL can be used. +PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'glx', \ + bb.utils.contains('DISTRO_FEATURES', 'opengl', 'egl', \ + '', d), d)}" PACKAGECONFIG ??= "drm encoders \ ${PACKAGECONFIG_GL} \ -- cgit v1.2.3-54-g00ecf