xorg 1.12.2-1 màj driver ati&synaptics

5 files changed, 60 insertions, 6 deletions

diff --git a/xorg/.md5sum.i686 b/xorg/.md5sum.i686
index ec2ca83ee..5856beda3 100644
--- a/xorg/.md5sum.i686
+++ b/xorg/.md5sum.i686
@@ -1 +1,2 @@
-b606c143ef4be9bac5c2ed586be431c8  driver-1.12.2.md5
+5e0cfadf8850589a17819e6bfab720cf  ati-fix-crtc-dpms-state-check.patch
+45ac5250d695c92c0d96a9f06291dc1f  driver-1.12.2.md5
diff --git a/xorg/.md5sum.x86_64 b/xorg/.md5sum.x86_64
index ec2ca83ee..5856beda3 100644
--- a/xorg/.md5sum.x86_64
+++ b/xorg/.md5sum.x86_64
@@ -1 +1,2 @@
-b606c143ef4be9bac5c2ed586be431c8  driver-1.12.2.md5
+5e0cfadf8850589a17819e6bfab720cf  ati-fix-crtc-dpms-state-check.patch
+45ac5250d695c92c0d96a9f06291dc1f  driver-1.12.2.md5
diff --git a/xorg/Pkgfile b/xorg/Pkgfile
index 244bfd908..ca49d4225 100644
--- a/xorg/Pkgfile
+++ b/xorg/Pkgfile
@@ -9,10 +9,11 @@ name=xorg
 version=1.12.2
 release=1
 section="driver"
-source=($section-$version.md5)
+source=($section-$version.md5
+	ati-fix-crtc-dpms-state-check.patch)
 
 build() {
-	unset MAKEFLAGS
+#	unset MAKEFLAGS
 	for package in $(grep -v '^#' ${section}-${version}.md5 |cut -d " " -f 3)
 	do
 		[[ -r $PKGMK_SOURCE_DIR/$package ]] || wget http://xorg.freedesktop.org/releases/individual/${section}/$package -O $PKGMK_SOURCE_DIR/$package
@@ -22,6 +23,10 @@ build() {
 		tar -xf $package
 
 		pushd $packagedir
+		if [ "${packagedir}" == "xf86-video-ati-6.14.5" ]; then
+			patch -p1 < $SRC/ati-fix-crtc-dpms-state-check.patch
+		fi
+
 		./configure $XORG_CONFIG \
 			--with-xorg-module-dir=$XORG_PREFIX/lib/X11/modules
 		make
diff --git a/xorg/ati-fix-crtc-dpms-state-check.patch b/xorg/ati-fix-crtc-dpms-state-check.patch
new file mode 100644
index 000000000..9fc44ab26
--- /dev/null
+++ b/xorg/ati-fix-crtc-dpms-state-check.patch
@@ -0,0 +1,47 @@
+From 248e912c487636d7352cfad43c03fc9f19fc2215 Mon Sep 17 00:00:00 2001
+From: Michel Dänzer <michel.daenzer@amd.com>
+Date: Fri, 08 Jun 2012 10:18:48 +0000
+Subject: UMS: Fix CRTC DPMS state check.
+
+Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+---
+diff --git a/src/radeon_video.c b/src/radeon_video.c
+index 01703a0..fcca507 100644
+--- a/src/radeon_video.c
++++ b/src/radeon_video.c
+@@ -143,6 +143,22 @@ radeon_box_area(BoxPtr box)
+     return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1);
+ }
+ 
++static Bool
++radeon_crtc_is_enabled(xf86CrtcPtr crtc)
++{
++    RADEONCrtcPrivatePtr radeon_crtc;
++
++#ifdef XF86DRM_MODE
++    if (RADEONPTR(crtc->scrn)->cs) {
++	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
++	return drmmode_crtc->dpms_mode == DPMSModeOn;
++    }
++#endif
++
++    radeon_crtc = crtc->driver_private;
++    return radeon_crtc->enabled;
++}
++
+ xf86CrtcPtr
+ radeon_pick_best_crtc(ScrnInfoPtr pScrn,
+ 		      int x1, int x2, int y1, int y2)
+@@ -171,9 +187,8 @@ radeon_pick_best_crtc(ScrnInfoPtr pScrn,
+ 
+     for (c = 0; c < xf86_config->num_crtc; c++) {
+ 	xf86CrtcPtr crtc = xf86_config->crtc[c];
+-	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ 
+-	if (drmmode_crtc->dpms_mode == DPMSModeOff)
++	if (!radeon_crtc_is_enabled(crtc))
+ 	    continue;
+ 
+ 	radeon_crtc_box(crtc, &crtc_box);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/xorg/driver-1.12.2.md5 b/xorg/driver-1.12.2.md5
index 32c99423a..b42161363 100644
--- a/xorg/driver-1.12.2.md5
+++ b/xorg/driver-1.12.2.md5
@@ -23,7 +23,7 @@
 # xf86-input-penmount-1.4.0.tar.bz2
 # xf86-input-spaceorb-1.1.1.tar.bz2
 # xf86-input-summa-1.2.0.tar.bz2
-d10a7ee362d015975fbef11c6beaac97  xf86-input-synaptics-1.6.1.tar.bz2
+9914022a173e3f0ccfe7137ab84f6133  xf86-input-synaptics-1.6.2.tar.bz2
 # xf86-input-ur98-1.1.0.tar.bz2
 2b3bfea9ba1f73d9d68bddd0d6b20112  xf86-input-vmmouse-12.9.0.tar.bz2
 93821f21e807260b05431c62437a8b32  xf86-input-void-1.4.0.tar.bz2
@@ -31,7 +31,7 @@ d10a7ee362d015975fbef11c6beaac97  xf86-input-synaptics-1.6.1.tar.bz2
 7692dac140c15172935872a77417bed2  xf86-video-apm-1.2.4.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
+5ea726eed9cd5a9cc5132cbee18ad686  xf86-video-ati-6.14.5.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