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

require xf86vidmodeproto 2.2.99.1 or newer.

This commit is contained in:
Peter Hutterer 2009-09-04 10:57:33 +10:00
parent 2122fedb2c
commit 6fb01c8286
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -1523,11 +1523,11 @@ if test "x$XORG" = xyes; then
fi fi
if test "x$XF86VIDMODE" = xauto; then if test "x$XF86VIDMODE" = xauto; then
PKG_CHECK_MODULES(XF86VIDMODE, xf86vidmodeproto, [XF86VIDMODE=yes], [XF86VIDMODE=no]) PKG_CHECK_MODULES(XF86VIDMODE, [xf86vidmodeproto >= 2.2.99.1], [XF86VIDMODE=yes], [XF86VIDMODE=no])
fi fi
if test "x$XF86VIDMODE" = xyes; then if test "x$XF86VIDMODE" = xyes; then
XORG_MODULES="$XORG_MODULES xf86vidmodeproto" XORG_MODULES="$XORG_MODULES xf86vidmodeproto"
PKG_CHECK_MODULES(XF86VIDMODE, xf86vidmodeproto) PKG_CHECK_MODULES(XF86VIDMODE, [xf86vidmodeproto >= 2.2.99.1])
AC_DEFINE(XF86VIDMODE, 1, [Support XFree86 Video Mode extension]) AC_DEFINE(XF86VIDMODE, 1, [Support XFree86 Video Mode extension])
fi fi

3
hw/xfree86/dixmods/extmod/modinit.h
View File

@ -30,8 +30,7 @@ extern void ScreenSaverExtensionInit (INITARGS);
#ifdef XF86VIDMODE #ifdef XF86VIDMODE
extern void XFree86VidModeExtensionInit(INITARGS); extern void XFree86VidModeExtensionInit(INITARGS);
#define _XF86VIDMODE_SERVER_ #include <X11/extensions/xf86vmproto.h>
#include <X11/extensions/xf86vmstr.h>
#endif #endif
#ifdef XFreeXDGA #ifdef XFreeXDGA

3
hw/xfree86/dixmods/extmod/xf86vmode.c
View File

@ -41,8 +41,7 @@ from Kaleb S. KEITHLEY
#include "extnsionst.h" #include "extnsionst.h"
#include "scrnintstr.h" #include "scrnintstr.h"
#include "servermd.h" #include "servermd.h"
#define _XF86VIDMODE_SERVER_ #include <X11/extensions/xf86vmproto.h>
#include <X11/extensions/xf86vmstr.h>
#include "swaprep.h" #include "swaprep.h"
#include "xf86.h" #include "xf86.h"
#include "vidmodeproc.h" #include "vidmodeproc.h"