From 95cfb2ce88b0a41207e13c2ae60609dcb9ae2004 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 18 Apr 2008 18:28:01 -0400 Subject: [PATCH] Death to Extended Visual Information. (cherry picked from commit f6617b4127125516583f321c961d70f762f728be) --- Xext/Makefile.am | 7 ------- configure.ac | 7 ------- hw/xfree86/dixmods/extmod/modinit.c | 9 --------- hw/xfree86/dixmods/extmod/modinit.h | 6 ------ hw/xfree86/loader/dixsym.c | 3 --- include/dix-config.h.in | 3 --- include/globals.h | 4 ---- mi/miinitext.c | 12 ------------ os/utils.c | 3 --- 9 files changed, 54 deletions(-) diff --git a/Xext/Makefile.am b/Xext/Makefile.am index af4bfc718..a75f0cedd 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -106,12 +106,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 @@ -158,7 +152,6 @@ EXTRA_DIST = \ $(XINERAMA_SRCS) \ $(XEVIE_SRCS) \ $(CUP_SRCS) \ - $(EVI_SRCS) \ $(MULTIBUFFER_SRCS) \ $(EXTRA_MULTIBUFFER_SRCS) \ $(FONTCACHE_SRCS) \ diff --git a/configure.ac b/configure.ac index 7b4957493..68ffd3b46 100644 --- a/configure.ac +++ b/configure.ac @@ -559,7 +559,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]) @@ -966,12 +965,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]) diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c index 8c8a4ceeb..3b6b36a2c 100644 --- a/hw/xfree86/dixmods/extmod/modinit.c +++ b/hw/xfree86/dixmods/extmod/modinit.c @@ -173,15 +173,6 @@ static ExtensionModule extensionModules[] = { NULL }, #endif -#ifdef EVI - { - EVIExtensionInit, - EVINAME, - &noEVIExtension, - NULL, - NULL - }, -#endif #ifdef XV { XvExtensionInit, diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index 857ad3947..32248504c 100644 --- a/hw/xfree86/dixmods/extmod/modinit.h +++ b/hw/xfree86/dixmods/extmod/modinit.h @@ -95,12 +95,6 @@ extern void XcupExtensionInit(INITARGS); #include #endif -#ifdef EVI -extern void EVIExtensionInit(INITARGS); -#define _XEVI_SERVER_ -#include -#endif - #ifdef XV extern void XvExtensionInit(INITARGS); extern void XvMCExtensionInit(INITARGS); diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index 38e3cdb55..c6b657dae 100644 --- a/hw/xfree86/loader/dixsym.c +++ b/hw/xfree86/loader/dixsym.c @@ -356,9 +356,6 @@ _X_HIDDEN void *dixLookupTab[] = { #ifdef DPMSExtension SYMVAR(noDPMSExtension) #endif -#ifdef EVI - SYMVAR(noEVIExtension) -#endif #ifdef FONTCACHE SYMVAR(noFontCacheExtension) #endif diff --git a/include/dix-config.h.in b/include/dix-config.h.in index e71e9e61d..3184497e8 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -431,9 +431,6 @@ /* Build TOG-CUP extension */ #undef TOGCUP -/* Build Extended-Visual-Information extension */ -#undef EVI - /* Build Multibuffer extension */ #undef MULTIBUFFER diff --git a/include/globals.h b/include/globals.h index 19c2190a1..cfb6c2c22 100644 --- a/include/globals.h +++ b/include/globals.h @@ -66,10 +66,6 @@ extern Bool noDbeExtension; extern Bool noDPMSExtension; #endif -#ifdef EVI -extern Bool noEVIExtension; -#endif - #ifdef FONTCACHE extern Bool noFontCacheExtension; #endif diff --git a/mi/miinitext.c b/mi/miinitext.c index 5e0c22953..cecac389f 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -102,9 +102,6 @@ extern Bool noDbeExtension; #ifdef DPMSExtension extern Bool noDPMSExtension; #endif -#ifdef EVI -extern Bool noEVIExtension; -#endif #ifdef FONTCACHE extern Bool noFontCacheExtension; #endif @@ -227,9 +224,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 @@ -369,9 +363,6 @@ static ExtensionToggle ExtensionToggleList[] = #ifdef DPMSExtension { "DPMS", &noDPMSExtension }, #endif -#ifdef EVI - { "Extended-Visual-Information", &noEVIExtension }, -#endif #ifdef FONTCACHE { "FontCache", &noFontCacheExtension }, #endif @@ -501,9 +492,6 @@ InitExtensions(argc, argv) #ifdef MITSHM if (!noMITShmExtension) ShmExtensionInit(); #endif -#ifdef EVI - if (!noEVIExtension) EVIExtensionInit(); -#endif #ifdef MULTIBUFFER if (!noMultibufferExtension) MultibufferExtensionInit(); #endif diff --git a/os/utils.c b/os/utils.c index 9da8fcd94..a38a34d73 100644 --- a/os/utils.c +++ b/os/utils.c @@ -145,9 +145,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