frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: fix build with xv disabled 

https://bugs.freedesktop.org/show_bug.cgi?id=29111

Signed-off-by: Julien Cristau <jcristau@debian.org>
Tested-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
This commit is contained in:
Julien Cristau 2011-10-09 17:06:14 -07:00 committed by Jeremy Huddleston
parent c53380be80
commit eabd5532fb
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/modes/xf86Crtc.c
View File

@ -3090,6 +3090,7 @@ xf86_crtc_box_area(BoxPtr box)
return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1); 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 * Return the crtc covering 'box'. If two crtcs cover a portion of
* 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc * 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc
@ -3178,6 +3179,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,
return ret; return ret;
} }
#endif
xf86_crtc_notify_proc_ptr xf86_crtc_notify_proc_ptr
xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new) xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)

2
hw/xfree86/modes/xf86Crtc.h
View File

@ -956,6 +956,7 @@ xf86_cursors_fini (ScreenPtr screen);
extern _X_EXPORT void extern _X_EXPORT void
xf86CrtcTransformCursorPos (xf86CrtcPtr crtc, int *x, int *y); xf86CrtcTransformCursorPos (xf86CrtcPtr crtc, int *x, int *y);
#ifdef XV
/* /*
* For overlay video, compute the relevant CRTC and * For overlay video, compute the relevant CRTC and
* clip video to that. * clip video to that.
@ -974,6 +975,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,
RegionPtr reg, RegionPtr reg,
INT32 width, INT32 width,
INT32 height); INT32 height);
#endif
extern _X_EXPORT xf86_crtc_notify_proc_ptr extern _X_EXPORT xf86_crtc_notify_proc_ptr
xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new); xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new);