From fe7575e929d65e8c798104ec2f72b879051694d3 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Mon, 8 Feb 2010 02:04:33 +0100
Subject: [PATCH] xfree86: fix build with xv disabled

---
 hw/xfree86/modes/xf86Crtc.c |    2 ++
 hw/xfree86/modes/xf86Crtc.h |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

Index: xorg-server/hw/xfree86/modes/xf86Crtc.c
===================================================================
--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.c	2010-07-05 16:58:09.758394001 +1000
+++ xorg-server/hw/xfree86/modes/xf86Crtc.c	2010-07-05 16:59:15.268394002 +1000
@@ -3084,6 +3084,7 @@
     return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1);
 }
 
+#ifdef XV
 /*
  * Return the crtc covering 'box'. If two crtcs cover a portion of
  * 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc
@@ -3172,6 +3173,7 @@
 
     return ret;
 }
+#endif
 
 xf86_crtc_notify_proc_ptr
 xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
Index: xorg-server/hw/xfree86/modes/xf86Crtc.h
===================================================================
--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.h	2010-07-05 16:58:09.778394001 +1000
+++ xorg-server/hw/xfree86/modes/xf86Crtc.h	2010-07-05 16:59:15.268394002 +1000
@@ -934,6 +934,7 @@
 extern _X_EXPORT void
 xf86_cursors_fini (ScreenPtr screen);
 
+#ifdef XV
 /*
  * For overlay video, compute the relevant CRTC and
  * clip video to that.
@@ -952,6 +953,7 @@
 			    RegionPtr   reg,
 			    INT32	width,
 			    INT32	height);
+#endif
     
 extern _X_EXPORT xf86_crtc_notify_proc_ptr
 xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new);