From e2bf6f7586ffd9cf369a6a7924544004d3e03749 Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Fri, 11 Aug 2017 23:37:00 +0200 Subject: gstreamer1.0-vaapi: upgrade to version 1.12.2 * Remove backported patch: 1. vaapivideobufferpool-create-allocator-if-needed.patch * Add PACKAGECONFIG_GL variable to make it possible for BSP layers to customize what should be the default, EGL or GLX * Set virtual/egl instead of virtual/mesa as egl dependency in case platform specific drivers provide virtual/egl functionality (From OE-Core rev: 42daac1ade210d873aa4761d89d2402fbe80f07b) Signed-off-by: Carlos Rafael Giani Signed-off-by: Richard Purdie --- meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc') diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc index ef0734ba93..abfcc65390 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc @@ -22,12 +22,21 @@ REQUIRED_DISTRO_FEATURES ?= "opengl" PACKAGES =+ "${PN}-tests" +# 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 \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)} \ + ${PACKAGECONFIG_GL} \ ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,udev libdrm" -PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/mesa" +PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" +PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/libgl" PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender" -- cgit v1.2.3-54-g00ecf