enhanced 3D graphics support

The previous configuration would result in intel-only 3D being available since nouveau and radeon kernel modules are packaged separately with most kernel-images; getting NVIDIA/AMD drivers in is more tricky due to availability of both proprietary and free implementations with the choice being rather a tradeoff in each case (somewhat less so with ATI/AMD drivers). So this is a first shot at the problem: FlightGear would freeze on me with today's nouveau.

enhanced 3D graphics support
9555f1f6 · Michael Shigorin · 87502d2a · 9555f1f6
Commit 9555f1f6 authored Mar 28, 2012 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletion

config.mk features.in/x11/config.mk +12 -1

No files found.
--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -4,11 +4,22 @@

 use/x11/xorg:
 	@$(call add,THE_LISTS,xorg)
-	@$(call add,THE_KMODULES,drm)

 use/x11/wacom: use/x11/xorg
 	@$(call add,THE_PACKAGES,xorg-drv-wacom)

+use/x11/drm: use/x11/xorg
+	@$(call add,THE_KMODULES,drm drm-radeon)
+
+use/x11/3d-free: use/x11/drm
+	@$(call add,THE_KMODULES,drm-nouveau)
+
+### fglrx is broken with xorg-1.12 so far
+use/x11/3d-proprietary: use/x11/xorg
+	@$(call add,THE_KMODULES,fglrx nvidia)
+	@$(call add,THE_PACKAGES,nvidia-settings nvidia-xconfig)
+	@$(call add,THE_PACKAGES,fglrx_glx fglrx-tools)
+
 ### strictly speaking, runlevel5 should require a *dm, not vice versa
 use/x11/runlevel5: use/x11/xorg
 	@$(call add,THE_PACKAGES,installer-feature-runlevel5-stage3)