From 110033aadecf327ce8706f08d15e2fec8d6defd8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:56:11 +0200 Subject: [PATCH] package/x11r7/xdriver_xf86-video-tdfx: switch dependency from mesa3d to libgl DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Build-tested using these defconfigs: BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX=y and BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX=y Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/x11r7/xdriver_xf86-video-tdfx/Config.in | 4 ---- .../x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-tdfx/Config.in b/package/x11r7/xdriver_xf86-video-tdfx/Config.in index 959dc31049..14b8f0ad9e 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/Config.in +++ b/package/x11r7/xdriver_xf86-video-tdfx/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX bool "xf86-video-tdfx" - depends on BR2_PACKAGE_MESA3D select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XORGPROTO help 3Dfx video driver - -comment "xf86-video-tdfx needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk index 14c40e4d89..e687876843 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk @@ -15,7 +15,9 @@ XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = \ xorgproto \ xserver_xorg-server -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS += --disable-dri endif