Update xorg, clean it and separate xserver stuff from libx11 stuff

component/xorg/buildout.cfg

@@ -124,6 +124,16 @@ download-only = true
 filename = 700c7896b832d6e4fb0185f0d5382b01f94e7141.patch
 md5sum = 52635ef694ee6f1acb642a77ee8eb010
 
+[inputproto]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/everything/inputproto-2.0.1.tar.bz2
+md5sum = da9bf9e5d174163f597d2d72757d9038
+
+[kbproto]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/everything/kbproto-1.0.5.tar.bz2
+md5sum = e7edb59a3f54af15f749e8f3e314ee62
+
 [libX11]
 recipe = hexagonit.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libX11-1.4.0.tar.bz2
@@ -143,15 +153,9 @@ environment =
   LD_RUN_PATH=${xproto:location}/lib:${xextproto:location}/lib:${libxcb:location}/lib
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
-[inputproto]
-recipe = hexagonit.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/inputproto-2.0.1.tar.bz2
-md5sum = da9bf9e5d174163f597d2d72757d9038
 
-[kbproto]
-recipe = hexagonit.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/kbproto-1.0.5.tar.bz2
-md5sum = e7edb59a3f54af15f749e8f3e314ee62
+# Below is stuff for xserver
+
 
 [libXdmcp]
 recipe = hexagonit.recipe.cmmi
@@ -165,28 +169,6 @@ configure-options =
   --without-xmlto
   --without-fop
 
-[xserver]
-# Adds Xvfb functionnality
-recipe = hexagonit.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/xserver/xorg-server-1.9.3.tar.bz2
-md5sum = 5bef6839a76d029204ab31aa2fcb5201
-configure-options =
-  --enable-xvfb
-  --disable-aiglx
-  --disable-composite
-  --disable-screensaver
-  --disable-glx
-  --disable-dri
-  --disable-dri2
-  --disable-xorg
-  --with-xkb-bin-directory=${xkbcomp:location}/bin
-  --with-xkb-path=${xkeyboard-config:location}/share/X11/xkb
-environment =
-  PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${fixesproto:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig
-  CPPFLAGS=-I${xproto:location}/include -I${pixman:location}/include/pixman-1 -I${xextproto:location}/include -I${inputproto:location}/include -I${fontsproto:location}/include -I${kbproto:location}/include -I${xineramaproto:location}/include -I${renderproto:location}/include -I${bigreqsproto:location}/include -I${videoproto:location}/include -I${resourceproto:location}/include -I${xcmiscproto:location}/include -I${xtrans:location}/include -I${libXau:location}/include -I${randrproto:location}/include -I${libxkbfile:location}/include -I${recordproto:location}/include -I${fixesproto:location}/include -I${damageproto:location}/include
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  LDFLAGS=-Wl,-rpath,${openssl:location}/lib
-
 [fixesproto]
 recipe = hexagonit.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2
@@ -247,15 +229,15 @@ recipe = hexagonit.recipe.cmmi
 url = http://xorg.freedesktop.org/archive/individual/lib/pixman-0.23.2.tar.bz2 
 md5sum = 2e2805f5ca02edeb15a7862779670069
 
-[libxkbfile]
+[libfontenc]
 recipe = hexagonit.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2
-md5sum = 59b4fe0bdf8d9b05e45b59e8fe9e7516
+url = http://www.x.org/releases/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2
+md5sum = 11d3c292f05a90f6f67840a9e9c3d9b8
 environment =
-  PKG_CONFIG_PATH=${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
-  LD_LIBRARY_PATH=${kbproto:location}/lib:${libX11:location}/lib:${xproto:location}/lib/
-  LD_RUN_PATH=${kbproto:location}/lib:${libX11:location}/lib:${xproto:location}/lib/
-  CPPFLAGS=-I${xproto:location}/include/ -I${libX11:location}/include/ -I${kbproto:location}/include
+  PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig
+  LD_LIBRARY_PATH=${xproto:location}/lib/
+  LD_RUN_PATH=${xproto:location}/lib/
+  CPPFLAGS=-I${xproto:location}/include/ -I${zlib:location}/include
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [libXfont]
@@ -269,16 +251,16 @@ environment =
   LDFLAGS=-L${zlib:location}/lib
   CPPFLAGS=-I${zlib:location}/include
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  
-[libfontenc]
+
+[libxkbfile]
 recipe = hexagonit.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2
-md5sum = 11d3c292f05a90f6f67840a9e9c3d9b8
+url = http://www.x.org/releases/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2
+md5sum = 59b4fe0bdf8d9b05e45b59e8fe9e7516
 environment =
-  PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig
-  LD_LIBRARY_PATH=${xproto:location}/lib/
-  LD_RUN_PATH=${xproto:location}/lib/
-  CPPFLAGS=-I${xproto:location}/include/ -I${zlib:location}/include
+  PKG_CONFIG_PATH=${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  LD_LIBRARY_PATH=${kbproto:location}/lib:${libX11:location}/lib:${xproto:location}/lib/
+  LD_RUN_PATH=${kbproto:location}/lib:${libX11:location}/lib:${xproto:location}/lib/
+  CPPFLAGS=-I${xproto:location}/include/ -I${libX11:location}/include/ -I${kbproto:location}/include
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [xkeyboard-config]
@@ -288,18 +270,23 @@ md5sum = 57ecc78bacd8ecc398d8ed6588f4d04b
 depends =
   ${perl:version}
   ${perl-XML-Parser:location}
-configure-options = 
-  --disable-nls
+configure-options =
+  --disable-static
+  --enable-shared
+  --enable-compat-rules
+  --with-xkb-rules-symlink=xfree86
 environment =
   PATH=${gettext:location}/bin:${intltool:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xkbcomp:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
 
 [xkbcomp]
 recipe = hexagonit.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/app/xkbcomp-1.2.0.tar.bz2
 md5sum = 0f55995cd8da9b2d88553e1a2e17cd0a
+# Hardcoded location for xkeyboard-config, needed during compile time
+xkeyboard-config-location = ${libxkbfile:location}/../xkeyboard-config/share/X11/xkb
 configure-options =
-  --with-xkb-config-root=/root/slapos/softwares/9e0fe1c5183d11f92119922c7834042b/parts/xkeyboard-config/share/X11/xkb
+  --with-xkb-config-root=${:xkeyboard-config-location}
 environment =
   PKG_CONFIG_PATH=${libxkbfile:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
   LD_LIBRARY_PATH=${libxkbfile:location}/lib/:${libX11:location}/lib
@@ -422,3 +409,30 @@ environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${damageproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig
   CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${fixesproto:location}/include -I${xextproto:location}/include -I${damageproto:location}/include -I${xfixes:location}/include 
+
+[xserver]
+# Adds Xvfb functionnality
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/xserver/xorg-server-1.9.3.tar.bz2
+md5sum = 5bef6839a76d029204ab31aa2fcb5201
+configure-options =
+  --enable-xvfb
+  --disable-aiglx
+  --disable-composite
+  --disable-screensaver
+  --disable-glx
+  --disable-dri
+  --disable-dri2
+  --disable-xorg
+  --disable-xprint
+  --disable-config-hal
+  --with-xkb-bin-directory=${xkbcomp:location}/bin
+  --with-xkb-path=${xkeyboard-config:location}/share/X11/xkb
+#XXX-Cedric : The following can be safely removed as soon as Xvfb is known as working
+#  --with-default-font-path="${xfree86-fonts:location}/share/fonts/X11/Type1,${fontutil:location}/share/fonts/X11/75dpi,${cursor-fonts:location}/share/fonts/X11/misc"
+#depends = ${adobe-75dpi-fonts:location}
+environment =
+  PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${fixesproto:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig
+  CPPFLAGS=-I${xproto:location}/include -I${pixman:location}/include/pixman-1 -I${xextproto:location}/include -I${inputproto:location}/include -I${fontsproto:location}/include -I${kbproto:location}/include -I${xineramaproto:location}/include -I${renderproto:location}/include -I${bigreqsproto:location}/include -I${videoproto:location}/include -I${resourceproto:location}/include -I${xcmiscproto:location}/include -I${xtrans:location}/include -I${libXau:location}/include -I${randrproto:location}/include -I${libxkbfile:location}/include -I${recordproto:location}/include -I${fixesproto:location}/include -I${damageproto:location}/include
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  LDFLAGS=-Wl,-rpath,${openssl:location}/lib