xorg update

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@4682 33e552b5-05e3-0310-8538-816dae2090ed

13 files changed, 15 insertions, 24 deletions

diff --git a/rules/Kconfig b/rules/Kconfig
index 0db49184b..410e581a9 100644
--- a/rules/Kconfig
+++ b/rules/Kconfig
@@ -166,6 +166,7 @@ source "rules/mesa.in"
 source "rules/realvnc.in"
 source "rules/xfree430.in"
 source "rules/xorg-server.in"
+source "rules/xorg-driver.in"
 source "rules/xorg-proto.in"
 source "rules/xorg-lib.in"
 source "rules/xorg-app.in"
diff --git a/rules/xorg-app.in b/rules/xorg-app.in
index 38d48cd3f..2ad46cb8b 100644
--- a/rules/xorg-app.in
+++ b/rules/xorg-app.in
@@ -1,7 +1,7 @@
 # xorg proto configuration
 
 menuconfig XORG_APP
-        bool "xorg applications       "
+        bool "xorg applications     "
 
 source "rules/xorg-app-xdm.in"
 
diff --git a/rules/xorg-driver-input-evdev.in b/rules/xorg-driver-input-evdev.in
index 84f1bf47b..615a1b13c 100644
--- a/rules/xorg-driver-input-evdev.in
+++ b/rules/xorg-driver-input-evdev.in
@@ -1,6 +1,6 @@
 config XORG_DRIVER_INPUT_EVDEV
 	bool
-	depends on XORG_DRIVER
 	prompt "evdev"
+	depends on XORG_DRIVER_INPUT
 	help
 	  FIXME
diff --git a/rules/xorg-driver-input-keyboard.in b/rules/xorg-driver-input-keyboard.in
index 12b3047b9..1a40ba987 100644
--- a/rules/xorg-driver-input-keyboard.in
+++ b/rules/xorg-driver-input-keyboard.in
@@ -1,6 +1,6 @@
 config XORG_DRIVER_INPUT_KEYBOARD
 	bool
-	depends on XORG_DRIVER
 	prompt "Keyboard"
+	depends on XORG_DRIVER_INPUT
 	help
 	  FIXME
diff --git a/rules/xorg-driver-input-mouse.in b/rules/xorg-driver-input-mouse.in
index 743950973..47a6a5d8a 100644
--- a/rules/xorg-driver-input-mouse.in
+++ b/rules/xorg-driver-input-mouse.in
@@ -1,6 +1,6 @@
 config XORG_DRIVER_INPUT_MOUSE
 	bool
-	depends on XORG_DRIVER 
+	depends on XORG_DRIVER_INPUT
 	select XORG_PROTO_X
 	select XORG_SERVER
 	prompt "Mouse"
diff --git a/rules/xorg-driver-input-void.in b/rules/xorg-driver-input-void.in
index cdb403cf3..63a5cd4a7 100644
--- a/rules/xorg-driver-input-void.in
+++ b/rules/xorg-driver-input-void.in
@@ -1,6 +1,6 @@
 config XORG_DRIVER_INPUT_VOID
 	bool
-	depends on XORG_DRIVER
+	depends on XORG_DRIVER_INPUT
 	prompt "void"
 	help
 	  FIXME
diff --git a/rules/xorg-driver-video-apm.in b/rules/xorg-driver-video-apm.in
index 326562d3c..8a2852263 100644
--- a/rules/xorg-driver-video-apm.in
+++ b/rules/xorg-driver-video-apm.in
@@ -1,6 +1,6 @@
 config XORG_DRIVER_VIDEO_APM
 	bool
-	depends on XORG_DRIVER
+	depends on XORG_DRIVER_VIDEO
 	prompt "APM"
 	help
 	  FIXME
diff --git a/rules/xorg-driver-video-ati.in b/rules/xorg-driver-video-ati.in
index 019610102..6f88aa877 100644
--- a/rules/xorg-driver-video-ati.in
+++ b/rules/xorg-driver-video-ati.in
@@ -1,6 +1,6 @@
 config XORG_DRIVER_VIDEO_ATI
 	bool
-	depends on XORG_DRIVER
+	depends on XORG_DRIVER_VIDEO
 	prompt "Ati"
 	help
 	  FIXME
diff --git a/rules/xorg-driver-video-dummy.in b/rules/xorg-driver-video-dummy.in
index 8bfb0e2a0..55d8bfce3 100644
--- a/rules/xorg-driver-video-dummy.in
+++ b/rules/xorg-driver-video-dummy.in
@@ -1,6 +1,6 @@
 config XORG_DRIVER_VIDEO_DUMMY
 	bool
-	depends on XORG_DRIVER
+	depends on XORG_DRIVER_VIDEO
 	prompt "Dummy"
 	help
 	  FIXME
diff --git a/rules/xorg-driver-video-fbdev.in b/rules/xorg-driver-video-fbdev.in
index 63c6809de..9e1c366a1 100644
--- a/rules/xorg-driver-video-fbdev.in
+++ b/rules/xorg-driver-video-fbdev.in
@@ -1,6 +1,6 @@
 config XORG_DRIVER_VIDEO_FBDEV
 	bool
-	depends on XORG_DRIVER
+	depends on XORG_DRIVER_VIDEO
 	prompt "FBDev"
 	help
 	  FIXME
diff --git a/rules/xorg-driver.in b/rules/xorg-driver.in
index 66a9fb4b7..a30e1ecb9 100644
--- a/rules/xorg-driver.in
+++ b/rules/xorg-driver.in
@@ -1,26 +1,18 @@
 # xorg driver configuration
 
-menuconfig XORG_DRIVER                
-	bool "xorg drivers            "
-	depends on XORG_SERVER
-                                  
-menu "Input Drivers               "
-depends on XORG_DRIVER
+menuconfig XORG_DRIVER_INPUT
+        bool "xorg input drivers    "
 
 source "rules/xorg-driver-input-evdev.in"
 source "rules/xorg-driver-input-keyboard.in"
 source "rules/xorg-driver-input-mouse.in"
 source "rules/xorg-driver-input-void.in"
 
-endmenu
-                                  
-menu "Video Drivers               "
-depends on XORG_DRIVER
+menuconfig XORG_DRIVER_VIDEO
+        bool "xorg video drivers    "
 
 source "rules/xorg-driver-video-apm.in"
 source "rules/xorg-driver-video-ati.in"
 source "rules/xorg-driver-video-dummy.in"
 source "rules/xorg-driver-video-fbdev.in"
 
-endmenu
-
diff --git a/rules/xorg-lib-Xfont.in b/rules/xorg-lib-Xfont.in
index 3f39ad99b..92448c853 100644
--- a/rules/xorg-lib-Xfont.in
+++ b/rules/xorg-lib-Xfont.in
@@ -4,6 +4,7 @@ config XORG_LIB_XFONT
 	select FREETYPE
 	select ZLIB
 	select XORG_LIB_FONTENC
+	select XORG_PROTO_FONTCACHE
 	prompt "libXfont"
 	help
 	  FIXME
diff --git a/rules/xorg-server.in b/rules/xorg-server.in
index 43b2ee47e..8bd76f13c 100644
--- a/rules/xorg-server.in
+++ b/rules/xorg-server.in
@@ -95,9 +95,6 @@ config XORG_SERVER_XPRINT
 	prompt "Xprint server and extension"
 	help
 	  --enable-xprint
-# ----------------------------------------------------------------------------
-
-source "rules/xorg-driver.in"
 
 # ----------------------------------------------------------------------------