From e260897f7e6d80026b085627330a9fc9fa3d09dd Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 21 Sep 2019 20:10:47 +0200 Subject: [PATCH] package/mesa3d: add xvmc option "XVMC state tracker requires at least one of the following gallium drivers: r600, nouveau." https://cgit.freedesktop.org/mesa/mesa/commit/?id=22a817af8a89eb3c762fc3e07b443a3ce37d7416 Signed-off-by: Romain Naour [moved Config.in option into Gallium block, fixed comment dependency] Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d/Config.in | 16 ++++++++++++++++ package/mesa3d/mesa3d.mk | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index bfba68f867..9baa82376e 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -193,6 +193,22 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL virgl is the 3D acceleration backend for the virtio-gpu shipping with qemu. +config BR2_PACKAGE_MESA3D_XVMC + bool "Gallium XvMC state tracker" + depends on BR2_i386 || BR2_x86_64 + depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 + select BR2_PACKAGE_XLIB_LIBXVMC + help + XvMC state tracker (needs r600 or nouveau gallium drivers). + +comment "Gallium XvMC state tracker needs X.org and gallium drivers r600 or nouveau" + depends on BR2_i386 || BR2_x86_64 + depends on !BR2_PACKAGE_XORG7 || \ + !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600) + comment "DRI drivers" config BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 107b4dfeb8..1987cb358a 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -219,7 +219,7 @@ else MESA3D_CONF_OPTS += --disable-gles1 --disable-gles2 endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXVMC),y) +ifeq ($(BR2_PACKAGE_MESA3D_XVMC),y) MESA3D_DEPENDENCIES += xlib_libXvMC MESA3D_CONF_OPTS += --enable-xvmc else -- 2.30.2