← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/xserver-xorg-video-ati/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/101_fix_build_aginst_1.10rc3.diff

  • Committer: Bazaar Package Importer
  • Author(s): Christopher James Halse Rogers
  • Date: 2011-03-09 18:45:43 UTC
  • Revision ID: james.westby@ubuntu.com-20110309184543-mw21kvqtktmtqadl
Tags: 1:6.14.0-0ubuntu3
* Rebuild against final Xserver 1.10 ABI
* debian/patches/101_fix_build_aginst_1.10rc3.diff:
  - Cherry-pick build-fix against xserver 1.10rc3 and later.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/101_fix_build_aginst_1.10rc3.diff
 
1
commit ecfdb209afe2aafc378baab8c511f5df7b000270
 
2
Author: Sedat Dilek <sedat.dilek@googlemail.com>
 
3
Date:   Fri Feb 25 21:48:14 2011 +0100
 
4
 
 
5
    UMS: Fix build against xserver 1.10-rc3
 
6
    
 
7
    This issue was introduced due to last minute backout of RandR-1.4
 
8
    in xserver 1.10-rc3.
 
9
    
 
10
    Switch to "#ifdef RANDR_14_INTERFACE" as suggested by Keith Packard.
 
11
    See also <http://lists.x.org/archives/xorg-devel/2011-February/019643.html>.
 
12
    
 
13
    Note:
 
14
    The ddx needs a rebuild as the X video driver ABI changed to version 10.0.
 
15
    
 
16
    Reported-by: Alex Deucher <alexdeucher@gmail.com>
 
17
    CC: Keith Packard <keithp@keithp.com>
 
18
    Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com>
 
19
 
 
20
diff --git a/src/radeon_output.c b/src/radeon_output.c
 
21
index 15cef06..ccde346 100644
 
22
--- a/src/radeon_output.c
 
23
+++ b/src/radeon_output.c
 
24
@@ -1622,7 +1622,7 @@ radeon_set_mode_for_property(xf86OutputPtr output)
 
25
        xf86CrtcPtr crtc = output->crtc;
 
26
 
 
27
        if (crtc->enabled) {
 
28
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0)
 
29
+#ifdef RANDR_14_INTERFACE
 
30
            xf86CrtcSetRec crtc_set_rec;
 
31
 
 
32
            crtc_set_rec.flags = (XF86CrtcSetMode |