From 127bce062d7f06573365d4e05332fb1477a286d3 Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Sat, 31 Mar 2012 12:09:47 +0200
Subject: xorg 1.12.0-1 màj port (cherry picked from commit
 12e55da124bacdfbfbc601b1aeb450408e297a15)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Conflicts:

	xorg/.md5sum.i686
	xorg/.md5sum.x86_64
	xorg/Pkgfile
	xorg/driver-1.11.4.md5
	xorg/driver-1.12.0.md5
	xorg/driver-1.9.5.md5
---
 xorg/.footprint.i686   |  5 ----
 xorg/.footprint.x86_64 |  5 ----
 xorg/.md5sum.i686      |  3 ++-
 xorg/.md5sum.x86_64    |  3 ++-
 xorg/Pkgfile           | 13 +++++++---
 xorg/driver-1.12.0.md5 | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++
 xorg/driver-1.9.5.md5  | 70 --------------------------------------------------
 7 files changed, 83 insertions(+), 86 deletions(-)
 create mode 100644 xorg/driver-1.12.0.md5
 delete mode 100644 xorg/driver-1.9.5.md5

(limited to 'xorg')

diff --git a/xorg/.footprint.i686 b/xorg/.footprint.i686
index fb54c444c..a581cc419 100644
--- a/xorg/.footprint.i686
+++ b/xorg/.footprint.i686
@@ -51,10 +51,6 @@ drwxr-xr-x	root/root	usr/lib/X11/modules/drivers/
 -rwxr-xr-x	root/root	usr/lib/X11/modules/drivers/vesa_drv.so
 -rwxr-xr-x	root/root	usr/lib/X11/modules/drivers/vmware_drv.la
 -rwxr-xr-x	root/root	usr/lib/X11/modules/drivers/vmware_drv.so
--rwxr-xr-x	root/root	usr/lib/X11/modules/drivers/vmwlegacy_drv.la
--rwxr-xr-x	root/root	usr/lib/X11/modules/drivers/vmwlegacy_drv.so
--rwxr-xr-x	root/root	usr/lib/X11/modules/drivers/xgi_drv.la
--rwxr-xr-x	root/root	usr/lib/X11/modules/drivers/xgi_drv.so
 drwxr-xr-x	root/root	usr/lib/X11/modules/input/
 -rwxr-xr-x	root/root	usr/lib/X11/modules/input/evdev_drv.la
 -rwxr-xr-x	root/root	usr/lib/X11/modules/input/evdev_drv.so
@@ -139,4 +135,3 @@ drwxr-xr-x	root/root	usr/share/man/man4/
 -rw-r--r--	root/root	usr/share/man/man4/vmmouse.4.gz
 -rw-r--r--	root/root	usr/share/man/man4/vmware.4.gz
 -rw-r--r--	root/root	usr/share/man/man4/void.4.gz
--rw-r--r--	root/root	usr/share/man/man4/xgi.4.gz
diff --git a/xorg/.footprint.x86_64 b/xorg/.footprint.x86_64
index fb54c444c..a581cc419 100644
--- a/xorg/.footprint.x86_64
+++ b/xorg/.footprint.x86_64
@@ -51,10 +51,6 @@ drwxr-xr-x	root/root	usr/lib/X11/modules/drivers/
 -rwxr-xr-x	root/root	usr/lib/X11/modules/drivers/vesa_drv.so
 -rwxr-xr-x	root/root	usr/lib/X11/modules/drivers/vmware_drv.la
 -rwxr-xr-x	root/root	usr/lib/X11/modules/drivers/vmware_drv.so
--rwxr-xr-x	root/root	usr/lib/X11/modules/drivers/vmwlegacy_drv.la
--rwxr-xr-x	root/root	usr/lib/X11/modules/drivers/vmwlegacy_drv.so
--rwxr-xr-x	root/root	usr/lib/X11/modules/drivers/xgi_drv.la
--rwxr-xr-x	root/root	usr/lib/X11/modules/drivers/xgi_drv.so
 drwxr-xr-x	root/root	usr/lib/X11/modules/input/
 -rwxr-xr-x	root/root	usr/lib/X11/modules/input/evdev_drv.la
 -rwxr-xr-x	root/root	usr/lib/X11/modules/input/evdev_drv.so
@@ -139,4 +135,3 @@ drwxr-xr-x	root/root	usr/share/man/man4/
 -rw-r--r--	root/root	usr/share/man/man4/vmmouse.4.gz
 -rw-r--r--	root/root	usr/share/man/man4/vmware.4.gz
 -rw-r--r--	root/root	usr/share/man/man4/void.4.gz
--rw-r--r--	root/root	usr/share/man/man4/xgi.4.gz
diff --git a/xorg/.md5sum.i686 b/xorg/.md5sum.i686
index de216df92..70d119261 100644
--- a/xorg/.md5sum.i686
+++ b/xorg/.md5sum.i686
@@ -1 +1,2 @@
-45f86fbf02297560d2939fbb4fe4acdd  driver-1.9.5.md5
+6dc2f57e178884d093867adc08d6863d  apm-1.2.3-git.patch
+26828d0a1b2c2a88a01628be7758438b  driver-1.12.0.md5
diff --git a/xorg/.md5sum.x86_64 b/xorg/.md5sum.x86_64
index de216df92..70d119261 100644
--- a/xorg/.md5sum.x86_64
+++ b/xorg/.md5sum.x86_64
@@ -1 +1,2 @@
-45f86fbf02297560d2939fbb4fe4acdd  driver-1.9.5.md5
+6dc2f57e178884d093867adc08d6863d  apm-1.2.3-git.patch
+26828d0a1b2c2a88a01628be7758438b  driver-1.12.0.md5
diff --git a/xorg/Pkgfile b/xorg/Pkgfile
index bb8f14253..c8cbc8fb1 100644
--- a/xorg/Pkgfile
+++ b/xorg/Pkgfile
@@ -6,21 +6,26 @@
 # 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.5
-release=2
+version=1.12.0
+release=1
 section="driver"
-source=($section-$version.md5)
+source=($section-$version.md5
+	apm-1.2.3-git.patch)
 
 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
+		[[ -r $PKGMK_SOURCE_DIR/$package ]] || wget http://xorg.freedesktop.org/releases/individual/${section}/$package -O $PKGMK_SOURCE_DIR/$package
+		cp $PKGMK_SOURCE_DIR/$package ./
 		grep $package driver-$version.md5 |md5sum -c -
 		packagedir=$(echo $package | sed 's/.tar.bz2//')
 		tar -xf $package
 
 		pushd $packagedir
+		if [ "${packagedir}" == "xf86-video-apm-1.2.3" ]; then
+			patch -p1 < $SRC/apm-1.2.3-git.patch
+		fi
 		./configure $XORG_CONFIG \
 			--with-xorg-module-dir=$XORG_PREFIX/lib/X11/modules
 		make
diff --git a/xorg/driver-1.12.0.md5 b/xorg/driver-1.12.0.md5
new file mode 100644
index 000000000..d41d963a0
--- /dev/null
+++ b/xorg/driver-1.12.0.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
+8231f6ce1c477eac653c9deb527fa3c xf86-input-aiptek-1.4.1.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
+4449b2e94900e98d2f41c2f46dd0397e  xf86-input-evdev-2.7.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
+01f416753016f01e328b1098157a5266  xf86-input-joystick-1.6.1.tar.bz2
+09744e8dc9a1fe5e61927c1073cd3428  xf86-input-keyboard-1.6.1.tar.bz2
+# xf86-input-magellan-1.2.0.tar.bz2
+871c828b88e9c973f1457724b35576fb  xf86-input-mouse-1.7.2.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
+f064477ef3a553634f3dcf6696d0f538  xf86-input-synaptics-1.5.2.tar.bz2
+# xf86-input-ur98-1.1.0.tar.bz2
+15fce165117706cd5e774a8aa58122ce  xf86-input-vmmouse-12.8.0.tar.bz2
+93821f21e807260b05431c62437a8b32  xf86-input-void-1.4.0.tar.bz2
+# xf86-video-amd-2.7.7.7.tar.bz2
+a3743a971b3acb7de3d2eefc8b1a4834  xf86-video-apm-1.2.3.tar.bz2
+21f5db0beca2d3d99aae739174d5b44f  xf86-video-ark-0.7.4.tar.bz2
+# xf86-video-ast-0.89.0.tar.bz2
+17dd4f0bf4dbe9839e5f7d1161994222  xf86-video-ati-6.14.4.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
+53a533d9e0c2da50962282526bace074  xf86-video-fbdev-0.4.2.tar.bz2
+# a99c521db731c2f1df309057a8465e4c  xf86-video-geode-2.11.12.tar.bz2
+c4edb998485020debffeafc491ea759e  xf86-video-glint-1.2.7.tar.bz2
+392c4ffd3c752af6f92e71e1efd68c66  xf86-video-i128-1.3.5.tar.bz2
+# xf86-video-i740-1.3.0.tar.bz2
+34f3987ffe86e30c57abc33b7f8030e9  xf86-video-intel-2.18.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
+51871431a4a9204ab8ec79335c0cc041  xf86-video-openchrome-0.2.905.tar.bz2
+c0ee45ce06654b9f2e6ddac478d5fbd6  xf86-video-qxl-0.0.17.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
+664c7d9c93049ebe96af262ec448451f  xf86-video-savage-2.3.4.tar.bz2
+b5acd392d799e2bb67ea702a83feb4a0  xf86-video-siliconmotion-1.7.6.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
+02e6eacc2d1e07ac893b62481905d6f0  xf86-video-vesa-2.3.1.tar.bz2
+# xf86-video-vga-4.1.0.tar.bz2
+0743ec7c479603fba60d118858fd5783  xf86-video-vmware-12.0.2.tar.bz2
+# xf86-video-voodoo-1.2.1.tar.bz2
+# b4ac771ae81b52fca9b6fa68006a258a  xf86-video-xgi-1.6.0.tar.bz2 → Ne compile pas avec xorg-server 1.12.0
diff --git a/xorg/driver-1.9.5.md5 b/xorg/driver-1.9.5.md5
deleted file mode 100644
index 139344a6d..000000000
--- a/xorg/driver-1.9.5.md5
+++ /dev/null
@@ -1,70 +0,0 @@
-# Xorg drivers MD5sum et Paquet
-#
-# Attention 2 espaces entre le MD5sum et le paquet
-#
-# xf86-input-acecad-1.3.0.tar.bz2
-8231f6ce1c477eac653c9deb527fa3c xf86-input-aiptek-1.4.1.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
-e2abe9f13e526a73cb68a7d257546eba  xf86-input-keyboard-1.6.0.tar.bz2
-# xf86-input-magellan-1.2.0.tar.bz2
-13276d780b8ef3a82088f009185bf42b  xf86-input-mouse-1.7.1.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
-41ee749ecbfef98f7fba708cb2afae87  xf86-input-synaptics-1.5.0.tar.bz2
-# xf86-input-ur98-1.1.0.tar.bz2
-dc77181330f983c7d0ec1ea1592c2ca7  xf86-input-vmmouse-12.7.0.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
-19126c8421a05d9605883dcf7498d876  xf86-video-ati-6.14.3.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
-53a533d9e0c2da50962282526bace074  xf86-video-fbdev-0.4.2.tar.bz2
-# a99c521db731c2f1df309057a8465e4c  xf86-video-geode-2.11.12.tar.bz2
-a8458d1b6331c142c8377298c6fecddd  xf86-video-glint-1.2.6.tar.bz2
-103316abb2dc466219c027afc5a71691  xf86-video-i128-1.3.4.tar.bz2
-# xf86-video-i740-1.3.0.tar.bz2
-e0406c50a747c358654b93cb23bf7375  xf86-video-intel-2.16.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
-21108fae53c14eb2c65413b55a3c8778  xf86-video-qxl-0.0.16.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
-4dfb647b1ebeaa42a235362643f5b085  xf86-video-savage-2.3.3.tar.bz2
-9ca392e16028a2f7c3ebc57f0aa4c1aa  xf86-video-siliconmotion-1.7.5.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
-233213eaff0b2382e9ff95b8feefc4fc  xf86-video-vmware-11.0.99.901.tar.bz2
-# xf86-video-voodoo-1.2.1.tar.bz2
-b4ac771ae81b52fca9b6fa68006a258a  xf86-video-xgi-1.6.0.tar.bz2
-- 
cgit v1.2.3-54-g00ecf