mirror of
https://github.com/X11Libre/xf86-video-vmware.git
synced 2026-03-24 01:24:37 +00:00
drop compat with really ancient Xserver versions
The oldest one we support is 25.0.0.1 Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
20
configure.ac
20
configure.ac
@@ -73,26 +73,6 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
|
||||
|
||||
# Obtain compiler/linker options for the driver dependencies
|
||||
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.18 xproto fontsproto $REQUIRED_MODULES])
|
||||
PKG_CHECK_EXISTS([xorg-server >= 1.1.0],
|
||||
[AC_DEFINE([HAVE_XORG_SERVER_1_1_0], 1,
|
||||
[Has version 1.1.0 or greater of the Xserver])])
|
||||
|
||||
PKG_CHECK_EXISTS([xorg-server >= 1.2.0],
|
||||
[AC_DEFINE([HAVE_XORG_SERVER_1_2_0], 1,
|
||||
[Has version 1.2.0 or greater of the Xserver])])
|
||||
|
||||
PKG_CHECK_EXISTS([xorg-server >= 1.4.99],
|
||||
[AC_DEFINE([HAVE_XORG_SERVER_1_5_0], 1,
|
||||
[Has version 1.5.0 or greater of the Xserver])])
|
||||
|
||||
PKG_CHECK_EXISTS([xorg-server >= 1.7.0],
|
||||
[AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1,
|
||||
[Has version 1.7.0 or greater of the Xserver])
|
||||
BUILD_VMWGFX=yes],[BUILD_VMWGFX=no])
|
||||
|
||||
PKG_CHECK_EXISTS([xorg-server >= 1.12.0],
|
||||
[AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1,
|
||||
[Has version 1.12.0 or greater of the Xserver])])
|
||||
|
||||
# Obtain compiler/linker options for the vmwarectrl client tool
|
||||
PKG_CHECK_MODULES(X11, x11 xext)
|
||||
|
||||
@@ -36,11 +36,6 @@ char rcsId_vmware[] =
|
||||
#include "vmware_common.h"
|
||||
#include "common_compat.h"
|
||||
|
||||
#ifndef HAVE_XORG_SERVER_1_5_0
|
||||
#include <xf86_ansic.h>
|
||||
#include <xf86_libc.h>
|
||||
#endif
|
||||
|
||||
#define xf86LoaderReqSymLists(...) do {} while (0)
|
||||
#define LoaderRefSymLists(...) do {} while (0)
|
||||
|
||||
@@ -316,9 +311,7 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#ifdef HAVE_XORG_SERVER_1_12_0
|
||||
vgaHWSetStdFuncs(VGAHWPTR(pScrn));
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Save the current video state. Do it here before VMXGetVMwareSvgaId
|
||||
|
||||
@@ -8,9 +8,7 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#ifdef HAVE_XORG_SERVER_1_1_0
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
@@ -34,11 +34,6 @@
|
||||
#include "vmware_bootstrap.h"
|
||||
#include <stdint.h>
|
||||
|
||||
#ifndef HAVE_XORG_SERVER_1_5_0
|
||||
#include <xf86_ansic.h>
|
||||
#include <xf86_libc.h>
|
||||
#endif
|
||||
|
||||
#ifdef XSERVER_PLATFORM_BUS
|
||||
#include "xf86platformBus.h"
|
||||
#endif
|
||||
|
||||
@@ -29,11 +29,6 @@
|
||||
#include <xf86.h>
|
||||
#include "vmware_common.h"
|
||||
|
||||
#ifndef HAVE_XORG_SERVER_1_5_0
|
||||
#include <xf86_ansic.h>
|
||||
#include <xf86_libc.h>
|
||||
#endif
|
||||
|
||||
static int
|
||||
VMWAREParseTopologyElement(ScrnInfoPtr pScrn,
|
||||
unsigned int output,
|
||||
|
||||
@@ -42,11 +42,6 @@
|
||||
#include "vmware.h"
|
||||
#include "vmwarectrlproto.h"
|
||||
|
||||
#ifndef HAVE_XORG_SERVER_1_5_0
|
||||
#include <xf86_ansic.h>
|
||||
#include <xf86_libc.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------------
|
||||
*
|
||||
@@ -306,9 +301,7 @@ VMwareCtrlDoSetTopology(ScrnInfoPtr pScrn,
|
||||
*/
|
||||
|
||||
vmwareNextXineramaState(pVMWARE);
|
||||
#ifdef HAVE_XORG_SERVER_1_2_0
|
||||
RRSendConfigNotify(pScrn->pScreen);
|
||||
#endif
|
||||
vmwareSendSVGACmdUpdateFullScreen(pVMWARE);
|
||||
|
||||
return TRUE;
|
||||
|
||||
@@ -34,9 +34,7 @@
|
||||
#include "config.h"
|
||||
|
||||
#include "xf86.h"
|
||||
#ifdef HAVE_XORG_SERVER_1_2_0
|
||||
#include <xf86Modes.h>
|
||||
#endif
|
||||
#include "vm_basic_types.h"
|
||||
#include "vmware.h"
|
||||
#include "common_compat.h"
|
||||
@@ -76,7 +74,6 @@ vmwareAddDefaultMode(ScrnInfoPtr pScrn, uint32 dwidth, uint32 dheight)
|
||||
goto out_err;
|
||||
}
|
||||
|
||||
#ifdef HAVE_XORG_SERVER_1_2_0
|
||||
if (dwidth && dheight) {
|
||||
MonPtr monitor = pScrn->monitor;
|
||||
DisplayModePtr mode = NULL;
|
||||
@@ -156,9 +153,6 @@ vmwareAddDefaultMode(ScrnInfoPtr pScrn, uint32 dwidth, uint32 dheight)
|
||||
}
|
||||
|
||||
*monitorModes = xf86ModesAdd(*monitorModes, modes);
|
||||
#else
|
||||
(void) modes;
|
||||
#endif
|
||||
return;
|
||||
out_err:
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to add default mode.");
|
||||
|
||||
@@ -44,11 +44,6 @@
|
||||
|
||||
#include <X11/extensions/Xv.h>
|
||||
|
||||
#ifndef HAVE_XORG_SERVER_1_5_0
|
||||
#include <xf86_ansic.h>
|
||||
#include <xf86_libc.h>
|
||||
#endif
|
||||
|
||||
static const char xv_adapt_name[] = "VMWare Overlay Video Engine";
|
||||
static const char xv_image_name[] = "XV_IMAGE";
|
||||
|
||||
|
||||
@@ -42,11 +42,6 @@
|
||||
|
||||
#include "vmware.h"
|
||||
|
||||
#ifndef HAVE_XORG_SERVER_1_5_0
|
||||
#include <xf86_ansic.h>
|
||||
#include <xf86_libc.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------------
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user