From 501ba6ec5a386c8034a5be799e177576c8a7a9b2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 19 Mar 2011 00:58:44 +0100 Subject: [PATCH] xf86-video-ati: update to xf86-video-ati-6.14.1 Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-ati/meta | 2 +- ...0-01-fix_build_with_xorg-server-1.10.patch | 33 ------------------- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 packages/x11/driver/xf86-video-ati/patches/xf86-video-ati-6.14.0-01-fix_build_with_xorg-server-1.10.patch diff --git a/packages/x11/driver/xf86-video-ati/meta b/packages/x11/driver/xf86-video-ati/meta index 005c1c721c..76eb96e907 100644 --- a/packages/x11/driver/xf86-video-ati/meta +++ b/packages/x11/driver/xf86-video-ati/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-video-ati" -PKG_VERSION="6.14.0" +PKG_VERSION="6.14.1" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" diff --git a/packages/x11/driver/xf86-video-ati/patches/xf86-video-ati-6.14.0-01-fix_build_with_xorg-server-1.10.patch b/packages/x11/driver/xf86-video-ati/patches/xf86-video-ati-6.14.0-01-fix_build_with_xorg-server-1.10.patch deleted file mode 100644 index 5b47bc05a3..0000000000 --- a/packages/x11/driver/xf86-video-ati/patches/xf86-video-ati-6.14.0-01-fix_build_with_xorg-server-1.10.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ecfdb209afe2aafc378baab8c511f5df7b000270 Mon Sep 17 00:00:00 2001 -From: Sedat Dilek -Date: Fri, 25 Feb 2011 20:48:14 +0000 -Subject: UMS: Fix build against xserver 1.10-rc3 - -This issue was introduced due to last minute backout of RandR-1.4 -in xserver 1.10-rc3. - -Switch to "#ifdef RANDR_14_INTERFACE" as suggested by Keith Packard. -See also . - -Note: -The ddx needs a rebuild as the X video driver ABI changed to version 10.0. - -Reported-by: Alex Deucher -CC: Keith Packard -Signed-off-by: Sedat Dilek ---- -diff --git a/src/radeon_output.c b/src/radeon_output.c -index 15cef06..ccde346 100644 ---- a/src/radeon_output.c -+++ b/src/radeon_output.c -@@ -1622,7 +1622,7 @@ radeon_set_mode_for_property(xf86OutputPtr output) - xf86CrtcPtr crtc = output->crtc; - - if (crtc->enabled) { --#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0) -+#ifdef RANDR_14_INTERFACE - xf86CrtcSetRec crtc_set_rec; - - crtc_set_rec.flags = (XF86CrtcSetMode | --- -cgit v0.8.3-6-g21f6