xorg-server, correction dossiers

3 files changed, 110 insertions, 108 deletions

diff --git a/xorg/xorg-server/.footprint.i686 b/xorg/xorg-server/.footprint.i686
index 0da66b248..2306bb4e8 100644
--- a/xorg/xorg-server/.footprint.i686
+++ b/xorg/xorg-server/.footprint.i686
@@ -190,60 +190,61 @@ drwxr-xr-x	root/root	usr/include/xorg/
 -rw-r--r--	root/root	usr/include/xorg/xvdix.h
 -rw-r--r--	root/root	usr/include/xorg/xvmcext.h
 drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/X11/
+drwxr-xr-x	root/root	usr/lib/X11/modules/
+drwxr-xr-x	root/root	usr/lib/X11/modules/extensions/
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libdbe.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libdbe.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libdri.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libdri.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libdri2.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libdri2.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libextmod.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libextmod.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libglx.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libglx.xorg
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/librecord.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/librecord.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libexa.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libexa.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libfb.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libfb.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libfbdevhw.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libfbdevhw.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libint10.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libint10.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libshadow.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libshadow.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libshadowfb.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libshadowfb.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libvbe.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libvbe.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libvgahw.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libvgahw.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libwfb.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libwfb.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libxaa.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libxaa.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libxf8_16bpp.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libxf8_16bpp.so
+drwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/bt829_drv.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/bt829_drv.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/fi1236_drv.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/fi1236_drv.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/msp3430_drv.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/msp3430_drv.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/tda8425_drv.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/tda8425_drv.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/tda9850_drv.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/tda9850_drv.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/tda9885_drv.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/tda9885_drv.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/uda1380_drv.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/uda1380_drv.so
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/xorg-server.pc
 drwxr-xr-x	root/root	usr/lib/xorg/
-drwxr-xr-x	root/root	usr/lib/xorg/modules/
-drwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libdbe.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libdbe.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libdri.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libdri.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libdri2.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libdri2.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libextmod.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libextmod.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.xorg
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/librecord.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/librecord.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libexa.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libexa.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libfb.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libfb.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libfbdevhw.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libfbdevhw.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libint10.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libint10.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libshadow.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libshadow.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libshadowfb.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libshadowfb.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libvbe.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libvbe.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libvgahw.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libvgahw.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libwfb.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libwfb.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libxaa.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libxaa.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libxf8_16bpp.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libxf8_16bpp.so
-drwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/bt829_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/bt829_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/fi1236_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/fi1236_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/msp3430_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/msp3430_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/tda8425_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/tda8425_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/tda9850_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/tda9850_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/tda9885_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/tda9885_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/uda1380_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/uda1380_drv.so
 -rw-r--r--	root/root	usr/lib/xorg/protocol.txt
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
diff --git a/xorg/xorg-server/.footprint.x86_64 b/xorg/xorg-server/.footprint.x86_64
index 0da66b248..2306bb4e8 100644
--- a/xorg/xorg-server/.footprint.x86_64
+++ b/xorg/xorg-server/.footprint.x86_64
@@ -190,60 +190,61 @@ drwxr-xr-x	root/root	usr/include/xorg/
 -rw-r--r--	root/root	usr/include/xorg/xvdix.h
 -rw-r--r--	root/root	usr/include/xorg/xvmcext.h
 drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/X11/
+drwxr-xr-x	root/root	usr/lib/X11/modules/
+drwxr-xr-x	root/root	usr/lib/X11/modules/extensions/
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libdbe.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libdbe.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libdri.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libdri.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libdri2.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libdri2.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libextmod.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libextmod.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libglx.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libglx.xorg
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/librecord.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/librecord.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libexa.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libexa.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libfb.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libfb.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libfbdevhw.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libfbdevhw.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libint10.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libint10.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libshadow.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libshadow.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libshadowfb.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libshadowfb.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libvbe.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libvbe.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libvgahw.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libvgahw.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libwfb.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libwfb.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libxaa.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libxaa.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libxf8_16bpp.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libxf8_16bpp.so
+drwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/bt829_drv.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/bt829_drv.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/fi1236_drv.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/fi1236_drv.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/msp3430_drv.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/msp3430_drv.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/tda8425_drv.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/tda8425_drv.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/tda9850_drv.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/tda9850_drv.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/tda9885_drv.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/tda9885_drv.so
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/uda1380_drv.la
+-rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/uda1380_drv.so
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/xorg-server.pc
 drwxr-xr-x	root/root	usr/lib/xorg/
-drwxr-xr-x	root/root	usr/lib/xorg/modules/
-drwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libdbe.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libdbe.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libdri.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libdri.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libdri2.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libdri2.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libextmod.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libextmod.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.xorg
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/librecord.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/librecord.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libexa.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libexa.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libfb.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libfb.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libfbdevhw.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libfbdevhw.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libint10.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libint10.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libshadow.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libshadow.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libshadowfb.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libshadowfb.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libvbe.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libvbe.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libvgahw.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libvgahw.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libwfb.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libwfb.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libxaa.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libxaa.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libxf8_16bpp.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libxf8_16bpp.so
-drwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/bt829_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/bt829_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/fi1236_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/fi1236_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/msp3430_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/msp3430_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/tda8425_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/tda8425_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/tda9850_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/tda9850_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/tda9885_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/tda9885_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/uda1380_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/uda1380_drv.so
 -rw-r--r--	root/root	usr/lib/xorg/protocol.txt
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
diff --git a/xorg/xorg-server/Pkgfile b/xorg/xorg-server/Pkgfile
index c7ecf9fd2..909f33afe 100755
--- a/xorg/xorg-server/Pkgfile
+++ b/xorg/xorg-server/Pkgfile
@@ -14,16 +14,16 @@ source=(http://xorg.freedesktop.org/releases/individual/xserver/$name-$version.t
 build() {
 	cd $name-$version
 
-	./configure --prefix=/usr --enable-dri \
-		--disable-config-hal \
-	            --localstatedir=/var \
-		--sysconfdir=/etc/X11 \
-	            --with-xkb-output=/var/lib/xkb
+	./configure $XORG_CONFIG \
+    --with-module-dir=$XORG_PREFIX/lib/X11/modules \
+    --with-xkb-output=/var/lib/xkb \
+    --enable-install-setuid \
+    --disable-config-hal
 	sed -i 's|xorgconfddir = $(datadir)|xorgconfddir = /etc|' config/Makefile
 	make
 	make DESTDIR=$PKG install
 	rmdir $PKG/var/log
 	rm -r $PKG/usr/share/doc
-	mv $PKG/usr/lib/xorg/modules/extensions/libglx.{so,xorg}
+	mv $PKG/$XORG_PREFIX/lib/X11/modules/extensions/libglx.{so,xorg}
 	install -m644 ../15-quirks.conf $PKG/etc/X11/xorg.conf.d/15-quirks.conf
 }