~ubuntu-branches/ubuntu/precise/xorg-server/precise-updates

« back to all changes in this revision

Viewing changes to debian/patches/07-xfree86-fix-build-with-xv-disabled.diff

Tags: 2:1.10.1-2
* Build xserver-xorg-core-udeb on hurd-i386.  Thanks, Samuel Thibault!
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
10
10
 
11
11
--- a/hw/xfree86/modes/xf86Crtc.c
12
12
+++ b/hw/xfree86/modes/xf86Crtc.c
13
 
@@ -3084,6 +3084,7 @@ xf86_crtc_box_area(BoxPtr box)
 
13
@@ -3094,6 +3094,7 @@ xf86_crtc_box_area(BoxPtr box)
14
14
     return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1);
15
15
 }
16
16
 
18
18
 /*
19
19
  * Return the crtc covering 'box'. If two crtcs cover a portion of
20
20
  * 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc
21
 
@@ -3172,6 +3173,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr
 
21
@@ -3182,6 +3183,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr
22
22
 
23
23
     return ret;
24
24
 }