Commit f6617b41 authored by Adam Jackson's avatar Adam Jackson

Death to Extended Visual Information.

parent c14f5dc2
......@@ -118,12 +118,6 @@ if CUP
MODULE_SRCS += $(CUP_SRCS)
endif
# Extended Visual Information
EVI_SRCS = EVI.c sampleEVI.c EVIstruct.h
if EVI
MODULE_SRCS += $(EVI_SRCS)
endif
# Multi-buffering extension
MULTIBUFFER_SRCS = mbuf.c
EXTRA_MULTIBUFFER_SRCS = mbufbf.c mbufpx.c
......@@ -172,7 +166,6 @@ EXTRA_DIST = \
$(XPRINT_SRCS) \
$(APPGROUP_SRCS) \
$(CUP_SRCS) \
$(EVI_SRCS) \
$(MULTIBUFFER_SRCS) \
$(EXTRA_MULTIBUFFER_SRCS) \
$(FONTCACHE_SRCS) \
......
......@@ -549,7 +549,6 @@ AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--enable-xcalibrate], [Build XCali
AC_ARG_ENABLE(tslib, AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no])
AC_ARG_ENABLE(xevie, AS_HELP_STRING([--disable-xevie], [Build XEvIE extension (default: enabled)]), [XEVIE=$enableval], [XEVIE=yes])
AC_ARG_ENABLE(cup, AS_HELP_STRING([--disable-cup], [Build TOG-CUP extension (default: enabled)]), [CUP=$enableval], [CUP=yes])
AC_ARG_ENABLE(evi, AS_HELP_STRING([--disable-evi], [Build Extended-Visual-Information extension (default: enabled)]), [EVI=$enableval], [EVI=yes])
AC_ARG_ENABLE(multibuffer, AS_HELP_STRING([--enable-multibuffer], [Build Multibuffer extension (default: disabled)]), [MULTIBUFFER=$enableval], [MULTIBUFFER=no])
AC_ARG_ENABLE(fontcache, AS_HELP_STRING([--enable-fontcache], [Build FontCache extension (default: disabled)]), [FONTCACHE=$enableval], [FONTCACHE=no])
AC_ARG_ENABLE(dbe, AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes])
......@@ -945,12 +944,6 @@ if test "x$CUP" = xyes; then
# Requires xextproto which is always required
fi
AM_CONDITIONAL(EVI, [test "x$EVI" = xyes])
if test "x$EVI" = xyes; then
AC_DEFINE(EVI, 1, [Build Extended-Visual-Information extension])
# Requires xextproto which is always required
fi
AM_CONDITIONAL(MULTIBUFFER, [test "x$MULTIBUFFER" = xyes])
if test "x$MULTIBUFFER" = xyes; then
AC_DEFINE(MULTIBUFFER, 1, [Build Multibuffer extension])
......
......@@ -173,15 +173,6 @@ static ExtensionModule extensionModules[] = {
NULL
},
#endif
#ifdef EVI
{
EVIExtensionInit,
EVINAME,
&noEVIExtension,
NULL,
NULL
},
#endif
#ifdef XV
{
XvExtensionInit,
......
......@@ -95,12 +95,6 @@ extern void XcupExtensionInit(INITARGS);
#include <X11/extensions/Xcupstr.h>
#endif
#ifdef EVI
extern void EVIExtensionInit(INITARGS);
#define _XEVI_SERVER_
#include <X11/extensions/XEVIstr.h>
#endif
#ifdef XV
extern void XvExtensionInit(INITARGS);
extern void XvMCExtensionInit(INITARGS);
......
......@@ -358,9 +358,6 @@ _X_HIDDEN void *dixLookupTab[] = {
#ifdef DPMSExtension
SYMVAR(noDPMSExtension)
#endif
#ifdef EVI
SYMVAR(noEVIExtension)
#endif
#ifdef FONTCACHE
SYMVAR(noFontCacheExtension)
#endif
......
......@@ -422,9 +422,6 @@
/* Build TOG-CUP extension */
#undef TOGCUP
/* Build Extended-Visual-Information extension */
#undef EVI
/* Build Multibuffer extension */
#undef MULTIBUFFER
......
......@@ -66,10 +66,6 @@ extern Bool noDbeExtension;
extern Bool noDPMSExtension;
#endif
#ifdef EVI
extern Bool noEVIExtension;
#endif
#ifdef FONTCACHE
extern Bool noFontCacheExtension;
#endif
......
......@@ -130,9 +130,6 @@ extern Bool noDbeExtension;
#ifdef DPMSExtension
extern Bool noDPMSExtension;
#endif
#ifdef EVI
extern Bool noEVIExtension;
#endif
#ifdef FONTCACHE
extern Bool noFontCacheExtension;
#endif
......@@ -265,9 +262,6 @@ typedef void (*InitExtension)(INITARGS);
#endif
/* FIXME: this whole block of externs should be from the appropriate headers */
#ifdef EVI
extern void EVIExtensionInit(INITARGS);
#endif
#ifdef MITSHM
extern void ShmExtensionInit(INITARGS);
#endif
......@@ -413,9 +407,6 @@ static ExtensionToggle ExtensionToggleList[] =
#ifdef DPMSExtension
{ "DPMS", &noDPMSExtension },
#endif
#ifdef EVI
{ "Extended-Visual-Information", &noEVIExtension },
#endif
#ifdef FONTCACHE
{ "FontCache", &noFontCacheExtension },
#endif
......@@ -548,9 +539,6 @@ InitExtensions(argc, argv)
#ifdef MITSHM
if (!noMITShmExtension) ShmExtensionInit();
#endif
#ifdef EVI
if (!noEVIExtension) EVIExtensionInit();
#endif
#ifdef MULTIBUFFER
if (!noMultibufferExtension) MultibufferExtensionInit();
#endif
......
......@@ -149,9 +149,6 @@ _X_EXPORT Bool noDbeExtension = FALSE;
#ifdef DPMSExtension
_X_EXPORT Bool noDPMSExtension = FALSE;
#endif
#ifdef EVI
_X_EXPORT Bool noEVIExtension = FALSE;
#endif
#ifdef FONTCACHE
_X_EXPORT Bool noFontCacheExtension = FALSE;
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment