From 9bb105fc19662fbe6b35f69c3d537d5a3906cb50 Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Mon, 2 Jul 2012 18:43:21 +0200
Subject: xorg 1.12.2-2 màj drivers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xorg/.md5sum.i686                        |  2 +-
 xorg/.md5sum.x86_64                      |  2 +-
 xorg/Pkgfile                             |  9 ++----
 xorg/ati-fix-crtc-dpms-state-check.patch | 47 --------------------------------
 xorg/driver-1.12.2.md5                   |  4 +--
 5 files changed, 6 insertions(+), 58 deletions(-)
 delete mode 100644 xorg/ati-fix-crtc-dpms-state-check.patch

(limited to 'xorg')

diff --git a/xorg/.md5sum.i686 b/xorg/.md5sum.i686
index 5856beda3..c97f6f8bf 100644
--- a/xorg/.md5sum.i686
+++ b/xorg/.md5sum.i686
@@ -1,2 +1,2 @@
 5e0cfadf8850589a17819e6bfab720cf  ati-fix-crtc-dpms-state-check.patch
-45ac5250d695c92c0d96a9f06291dc1f  driver-1.12.2.md5
+4db1ae039bb91f7bfcacd429da773141  driver-1.12.2.md5
diff --git a/xorg/.md5sum.x86_64 b/xorg/.md5sum.x86_64
index 5856beda3..c97f6f8bf 100644
--- a/xorg/.md5sum.x86_64
+++ b/xorg/.md5sum.x86_64
@@ -1,2 +1,2 @@
 5e0cfadf8850589a17819e6bfab720cf  ati-fix-crtc-dpms-state-check.patch
-45ac5250d695c92c0d96a9f06291dc1f  driver-1.12.2.md5
+4db1ae039bb91f7bfcacd429da773141  driver-1.12.2.md5
diff --git a/xorg/Pkgfile b/xorg/Pkgfile
index ca49d4225..a6fe1e188 100644
--- a/xorg/Pkgfile
+++ b/xorg/Pkgfile
@@ -7,10 +7,9 @@
 
 name=xorg
 version=1.12.2
-release=1
+release=2
 section="driver"
-source=($section-$version.md5
-	ati-fix-crtc-dpms-state-check.patch)
+source=($section-$version.md5)
 
 build() {
 #	unset MAKEFLAGS
@@ -23,10 +22,6 @@ 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
deleted file mode 100644
index 9fc44ab26..000000000
--- a/xorg/ati-fix-crtc-dpms-state-check.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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 b42161363..481db4c87 100644
--- a/xorg/driver-1.12.2.md5
+++ b/xorg/driver-1.12.2.md5
@@ -31,7 +31,7 @@
 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
-5ea726eed9cd5a9cc5132cbee18ad686  xf86-video-ati-6.14.5.tar.bz2
+3e945273edd3b8beb96bd40f7929d450  xf86-video-ati-6.14.6.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
@@ -43,7 +43,7 @@ c4edb998485020debffeafc491ea759e  xf86-video-glint-1.2.7.tar.bz2
 f397bddfc88d4c9b30b56526c1e02e8e  xf86-video-intel-2.19.0.tar.bz2
 # xf86-video-mach64-6.8.1.tar.bz2
 # xf86-video-mga-1.4.10.tar.bz2
-5d24106c566d4f7401fc4467a435af68  xf86-video-modesetting-0.3.0.tar.bz2
+b70291aed67cec7b602fb55e104b6318  xf86-video-modesetting-0.4.0.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
-- 
cgit v1.2.3-54-g00ecf