merging trunk

packages/x11/driver/xf86-video-nvidia/url.orig

@@ -1,2 +0,0 @@
-ftp://download.nvidia.com/XFree86/Linux-x86/195.36.08/NVIDIA-Linux-x86-195.36.08-pkg0.run
-ftp://download.nvidia.com/XFree86/Linux-x86_64/195.36.08/NVIDIA-Linux-x86_64-195.36.08-pkg0.run

packages/x11/xserver/xorg-server/build

@@ -8,14 +8,16 @@ get_graphicdrivers
 
 $SCRIPTS/build toolchain
 
-$SCRIPTS/build xf86driproto
+$SCRIPTS/build fontsproto
 $SCRIPTS/build randrproto
 $SCRIPTS/build renderproto
 $SCRIPTS/build scrnsaverproto
 $SCRIPTS/build videoproto
 $SCRIPTS/build inputproto
 $SCRIPTS/build xf86dgaproto
+$SCRIPTS/build xf86driproto
 $SCRIPTS/build xf86miscproto
+$SCRIPTS/build libfontenc
 $SCRIPTS/build libpciaccess
 $SCRIPTS/build libX11
 $SCRIPTS/build libXfont
@@ -24,7 +26,6 @@ $SCRIPTS/build libdrm
 $SCRIPTS/build Mesa
 $SCRIPTS/build openssl
 $SCRIPTS/build freetype
-$SCRIPTS/build libfontenc
 $SCRIPTS/build pixman
 $SCRIPTS/build fontsproto
 $SCRIPTS/build udev
@@ -45,7 +46,6 @@ cd $PKG_BUILD
             --datarootdir=/usr/share \
             --disable-static \
             --enable-shared \
-            --disable-strict-compilation \
             --disable-debug \
             --disable-builddocs \
             --enable-largefile \