xorg, maj 1.9.4-1

7 files changed, 85 insertions, 12 deletions

diff --git a/xorg/xorg/.footprint.i686 b/xorg/xorg/.footprint.i686
index 78643c13a..662f9be59 100644
--- a/xorg/xorg/.footprint.i686
+++ b/xorg/xorg/.footprint.i686
@@ -53,12 +53,16 @@ drwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/nv_drv.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/openchrome_drv.la
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/openchrome_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/qxl_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/qxl_drv.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/radeon_drv.la
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/radeon_drv.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/radeonhd_drv.la
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/radeonhd_drv.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/s3_drv.la
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/s3_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/savage_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/savage_drv.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/vesa_drv.la
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/vesa_drv.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/vmware_drv.la
@@ -118,6 +122,7 @@ drwxr-xr-x	root/root	usr/share/man/man4/
 -rw-r--r--	root/root	usr/share/man/man4/radeon.4.gz
 -rw-r--r--	root/root	usr/share/man/man4/radeonhd.4.gz
 -rw-r--r--	root/root	usr/share/man/man4/s3.4.gz
+-rw-r--r--	root/root	usr/share/man/man4/savage.4.gz
 -rw-r--r--	root/root	usr/share/man/man4/synaptics.4.gz
 -rw-r--r--	root/root	usr/share/man/man4/vesa.4.gz
 -rw-r--r--	root/root	usr/share/man/man4/vmmouse.4.gz
diff --git a/xorg/xorg/.footprint.x86_64 b/xorg/xorg/.footprint.x86_64
index 78643c13a..662f9be59 100644
--- a/xorg/xorg/.footprint.x86_64
+++ b/xorg/xorg/.footprint.x86_64
@@ -53,12 +53,16 @@ drwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/nv_drv.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/openchrome_drv.la
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/openchrome_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/qxl_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/qxl_drv.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/radeon_drv.la
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/radeon_drv.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/radeonhd_drv.la
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/radeonhd_drv.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/s3_drv.la
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/s3_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/savage_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/savage_drv.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/vesa_drv.la
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/vesa_drv.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/vmware_drv.la
@@ -118,6 +122,7 @@ drwxr-xr-x	root/root	usr/share/man/man4/
 -rw-r--r--	root/root	usr/share/man/man4/radeon.4.gz
 -rw-r--r--	root/root	usr/share/man/man4/radeonhd.4.gz
 -rw-r--r--	root/root	usr/share/man/man4/s3.4.gz
+-rw-r--r--	root/root	usr/share/man/man4/savage.4.gz
 -rw-r--r--	root/root	usr/share/man/man4/synaptics.4.gz
 -rw-r--r--	root/root	usr/share/man/man4/vesa.4.gz
 -rw-r--r--	root/root	usr/share/man/man4/vmmouse.4.gz
diff --git a/xorg/xorg/.md5sum.i686 b/xorg/xorg/.md5sum.i686
index f10fd18ab..fe47c0bdf 100644
--- a/xorg/xorg/.md5sum.i686
+++ b/xorg/xorg/.md5sum.i686
@@ -1 +1 @@
-5e7f8430a452379a4ff9f195f0016d23  driver-1.9.3.md5
+d3e3a62ea12fe8383c253a73b60cf949  driver-1.9.4.md5
diff --git a/xorg/xorg/.md5sum.x86_64 b/xorg/xorg/.md5sum.x86_64
index f10fd18ab..fe47c0bdf 100644
--- a/xorg/xorg/.md5sum.x86_64
+++ b/xorg/xorg/.md5sum.x86_64
@@ -1 +1 @@
-5e7f8430a452379a4ff9f195f0016d23  driver-1.9.3.md5
+d3e3a62ea12fe8383c253a73b60cf949  driver-1.9.4.md5
diff --git a/xorg/xorg/Pkgfile b/xorg/xorg/Pkgfile
index 6969fba61..fad2d7ad1 100644
--- a/xorg/xorg/Pkgfile
+++ b/xorg/xorg/Pkgfile
@@ -6,12 +6,13 @@
 # Run on: dejavu-ttf,xorg-xinit,xorg-xauth,xorg-rgb,xkeyboard-config,xorg-twm,xorg-xclock,xorg-xterm,xorg-server
 
 name=xorg
-version=1.9.3
+version=1.9.4
 release=1
 section="driver"
 source=($section-$version.md5)
 
 build() {
+unset MAKEFLAGS
 for package in $(grep -v '^#' ${section}-${version}.md5 |cut -d " " -f 3)
         do
                 wget http://xorg.freedesktop.org/releases/individual/${section}/$package
@@ -20,7 +21,7 @@ for package in $(grep -v '^#' ${section}-${version}.md5 |cut -d " " -f 3)
                 tar -xf $package
 
                 cd $packagedir
-                ./configure --prefix=/usr
+                ./configure $XORG_CONFIG
                 make
                 make DESTDIR=$PKG install
                 cd ..
diff --git a/xorg/xorg/driver-1.9.4.md5 b/xorg/xorg/driver-1.9.4.md5
new file mode 100644
index 000000000..0ae743cbf
--- /dev/null
+++ b/xorg/xorg/driver-1.9.4.md5
@@ -0,0 +1,70 @@
+# Xorg drivers MD5sum et Paquet
+#
+# Attention 2 espaces entre le MD5sum et le paquet
+#
+# xf86-input-acecad-1.3.0.tar.bz2
+# xf86-input-aiptek-1.2.0.tar.bz2
+# xf86-input-citron-2.2.2.tar.bz2
+# xf86-input-digitaledge-1.1.1.tar.bz2
+# xf86-input-dmc-1.1.2.tar.bz2
+# xf86-input-dynapro-1.1.2.tar.bz2
+# xf86-input-elo2300-1.1.2.tar.bz2
+# xf86-input-elographics-1.2.3.tar.bz2
+f33fe9413bde68936d8909206a13e8a1  xf86-input-evdev-2.6.0.tar.bz2
+# xf86-input-fpit-1.3.0.tar.bz2
+# xf86-input-hyperpen-1.3.0.tar.bz2
+# xf86-input-jamstudio-1.2.0.tar.bz2
+79b20f86d1b2e625ae65e35c3457027f  xf86-input-joystick-1.5.0.tar.bz2
+b74d7162db5ce7899c17927c6cfa9522  xf86-input-keyboard-1.5.0.tar.bz2
+# xf86-input-magellan-1.2.0.tar.bz2
+cef849b1a2743d2e84de98422f372974  xf86-input-mouse-1.6.0.tar.bz2
+# xf86-input-mutouch-1.2.1.tar.bz2
+# xf86-input-palmax-1.2.0.tar.bz2
+# xf86-input-penmount-1.4.0.tar.bz2
+# xf86-input-spaceorb-1.1.1.tar.bz2
+# xf86-input-summa-1.2.0.tar.bz2
+b4e58eba1bdca13f0929a4b03b262135  xf86-input-synaptics-1.3.0.tar.bz2
+# xf86-input-ur98-1.1.0.tar.bz2
+49c6e77851e9f7bc5cb7d85f061992f8  xf86-input-vmmouse-12.6.10.tar.bz2
+3056bc7c57db8c5d56039648c0530c45  xf86-input-void-1.3.1.tar.bz2
+# xf86-video-amd-2.7.7.7.tar.bz2
+a3743a971b3acb7de3d2eefc8b1a4834  xf86-video-apm-1.2.3.tar.bz2
+ff0cb9cb0a7f36cc6f556deed7327798  xf86-video-ark-0.7.3.tar.bz2
+# xf86-video-ast-0.89.0.tar.bz2
+b64bf8939f9f8fb518baf858f8b6ca73  xf86-video-ati-6.14.0.tar.bz2
+# xf86-video-chips-1.2.1.tar.bz2
+# xf86-video-cirrus-1.3.0.tar.bz2
+# xf86-video-dummy-0.3.1.tar.bz2
+# xf86-video-fbdev-0.4.0.tar.bz2
+# a99c521db731c2f1df309057a8465e4c  xf86-video-geode-2.11.12.tar.bz2
+# xf86-video-glint-1.2.2.tar.bz2
+103316abb2dc466219c027afc5a71691  xf86-video-i128-1.3.4.tar.bz2
+# xf86-video-i740-1.3.0.tar.bz2
+05f187582aeabda57fcd6f2782cfbf8e  xf86-video-intel-2.14.0.tar.bz2
+# xf86-video-mach64-6.8.1.tar.bz2
+# xf86-video-mga-1.4.10.tar.bz2
+# xf86-video-neomagic-1.2.2.tar.bz2
+# xf86-video-newport-0.2.2.tar.bz2
+# xf86-video-nsc-2.8.3.tar.bz2
+b12f0b2114849d1a542d8084732573d3  xf86-video-nv-2.1.18.tar.bz2
+f2481d98ef54febf5bffbb88a2a2426d  xf86-video-openchrome-0.2.904.tar.bz2
+c1f177a26ed32f48f68158bf92439ede  xf86-video-qxl-0.0.13.tar.bz2
+# xf86-video-r128-6.8.0.tar.bz2
+7b6641aa9d836f1621b9b220ad6771b8  xf86-video-radeonhd-1.3.0.tar.bz2
+# xf86-video-rendition-4.2.1.tar.bz2
+5eb06d88533fb327d067928faeb20860  xf86-video-s3-0.6.3.tar.bz2
+# xf86-video-s3virge-1.10.2.tar.bz2
+09782fc710a1ce5a81c27d71951234c2  xf86-video-savage-2.3.2.tar.bz2
+# xf86-video-siliconmotion-1.7.1.tar.bz2
+# xf86-video-sis-0.10.1.tar.bz2
+# xf86-video-sisusb-0.9.1.tar.bz2
+# xf86-video-tdfx-1.4.1.tar.bz2
+# xf86-video-tga-1.2.0.tar.bz2
+# xf86-video-trident-1.3.1.tar.bz2
+# xf86-video-tseng-1.2.1.tar.bz2
+# xf86-video-v4l-0.2.0.tar.bz2
+07fa32958aff9b463dd3af5481ef6626  xf86-video-vesa-2.3.0.tar.bz2
+# xf86-video-vga-4.1.0.tar.bz2
+579bee487309b1bdc8329bf627d43413  xf86-video-vmware-11.0.3.tar.bz2
+# xf86-video-voodoo-1.2.1.tar.bz2
+b4ac771ae81b52fca9b6fa68006a258a  xf86-video-xgi-1.6.0.tar.bz2
diff --git a/xorg/xorg/pre-install b/xorg/xorg/pre-install
deleted file mode 100644
index 69b7d5a31..000000000
--- a/xorg/xorg/pre-install
+++ /dev/null
@@ -1,8 +0,0 @@
-for i in xf86-input-evdev xf86-input-joystick xf86-input-keyboard \
-xf86-input-void xf86-input-mouse xf86-input-synaptics xf86-input-vmmouse xf86-video-apm xf86-video-ark \
-xf86-video-ati xf86-video-i128 xf86-video-intel xf86-video-openchrome xf86-video-nv xf86-video-radeonhd \
-xf86-video-vesa xf86-video-vmware xorg-video-s3 xf86-video-xgi driver
-do if ( pkginfo -i| grep xorg-$i > /dev/null); then
-	pkgrm xorg-$i
-	fi
-done