[Buildroot] [git commit] package/x11r7/xdriver_xf86-video-mga: switch dependency from mesa3d to libgl
Arnout Vandecappelle (Essensium/Mind)
arnout at mind.be
Mon Jun 6 20:36:02 UTC 2022
commit: https://git.buildroot.net/buildroot/commit/?id=1bf8497621bf43570e9fb6e2295a9fdbea9f59db
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
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_MGA=y
and
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_XSERVER_XORG_SERVER=y
BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA=y
Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
---
package/x11r7/xdriver_xf86-video-mga/Config.in | 4 ----
package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk | 4 +++-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/package/x11r7/xdriver_xf86-video-mga/Config.in b/package/x11r7/xdriver_xf86-video-mga/Config.in
index 15fb3b9f87..bac5e62442 100644
--- a/package/x11r7/xdriver_xf86-video-mga/Config.in
+++ b/package/x11r7/xdriver_xf86-video-mga/Config.in
@@ -1,10 +1,6 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA
bool "xf86-video-mga"
- depends on BR2_PACKAGE_MESA3D
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_XORGPROTO
help
Matrox video driver
-
-comment "xf86-video-mga needs mesa3d"
- depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
index 3c668a5c98..24f2da2cce 100644
--- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
+++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
@@ -12,7 +12,9 @@ XDRIVER_XF86_VIDEO_MGA_LICENSE_FILES = COPYING
XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES
XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xorgproto
-ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
+ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
+XDRIVER_XF86_VIDEO_MGA_CONF_OPTS += --enable-dri
+else
XDRIVER_XF86_VIDEO_MGA_CONF_OPTS += --disable-dri
endif
More information about the buildroot
mailing list