From 8dab7c21dde79298274fe73b7a4bbe9c71f006de Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 29 Oct 2016 11:18:41 +0200 Subject: Remove extmod from nx-X11/programs/Xserver/Xext/. This backports (in their essence) these X.org Xserver commits: commit a7a2f9f66ddc27df96557093f3dd266e24eb653b Author: Daniel Stone Date: Tue Jul 10 02:03:13 2012 +0100 Remove the last remnants of extmod extmod was originally a big pointless module. Now it's an empty, pointless module. This commit makes it unexist. Signed-off-by: Daniel Stone Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer Signed-off-by: Keith Packard commit 7a11b817e770cd2196814f1ac6264c6d87b76c6a Author: Tomas Carnecky Date: Tue Jul 10 02:03:06 2012 +0100 Move Xv and XvMC from extmod to built-in Always build these extensions into the core server, rather than letting them languish in extmod. Signed-off-by: Tomas Carnecky Reviewed-by: Daniel Stone Reviewed-by: Jamey Sharp Signed-off-by: Peter Hutterer Signed-off-by: Keith Packard commit 7d859bd87834dd79c7fa3792075496ece698c082 Author: Tomas Carnecky Date: Tue Jul 10 02:03:05 2012 +0100 Move XRes from extmod to built-in Always build XRes support into the core server, rather than letting it languish in extmod. Signed-off-by: Tomas Carnecky Reviewed-by: Daniel Stone Reviewed-by: Jamey Sharp Signed-off-by: Peter Hutterer Signed-off-by: Keith Packard commit ba21fc29587e4f11320b88a70433beb1fe22cdf3 Author: Tomas Carnecky Date: Tue Jul 10 02:03:04 2012 +0100 Move DPMS from extmod to built-in Always build DPMS support into the core server, rather than letting it languish in extmod. Signed-off-by: Tomas Carnecky Reviewed-by: Daniel Stone Reviewed-by: Jamey Sharp Signed-off-by: Peter Hutterer Signed-off-by: Keith Packard commit 3ed2c6e11298c4299042cfe4578f6cc02e441d58 Author: Tomas Carnecky Date: Tue Jul 10 02:03:03 2012 +0100 Move MIT-SCREEN-SAVER from extmod to built-in If we've built MIT-SCREEN-SAVER support, then just build it into the main binary, rather than leaving it in extmod. Signed-off-by: Tomas Carnecky Reviewed-by: Daniel Stone Reviewed-by: Jamey Sharp Signed-off-by: Peter Hutterer Signed-off-by: Keith Packard Backported-to-NX-by: Mike Gabriel Conflicts: nx-X11/programs/Xserver/Xext/extmod/Imakefile --- nx-X11/programs/Xserver/Xext/extmod/modinit.c | 182 -------------------------- 1 file changed, 182 deletions(-) delete mode 100644 nx-X11/programs/Xserver/Xext/extmod/modinit.c (limited to 'nx-X11/programs/Xserver/Xext/extmod/modinit.c') diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.c b/nx-X11/programs/Xserver/Xext/extmod/modinit.c deleted file mode 100644 index 7b5530973..000000000 --- a/nx-X11/programs/Xserver/Xext/extmod/modinit.c +++ /dev/null @@ -1,182 +0,0 @@ - -/* - * - * Copyright (c) 1997 Matthieu Herrb - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Matthieu Herrb not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Matthieu Herrb makes no - * representations about the suitability of this software for any purpose. - * It is provided "as is" without express or implied warranty. - * - * MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL MATTHIEU HERRB BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifdef HAVE_XORG_CONFIG_H -#include -#endif - -#ifdef XFree86LOADER -#include "xf86_ansic.h" - -#include "xf86Module.h" -#include "xf86Opt.h" - -#include - -#include "modinit.h" -#include "globals.h" - -static MODULESETUPPROTO(extmodSetup); - -/* - * Array describing extensions to be initialized - */ -ExtensionModule extensionModules[] = { -#ifdef SHAPE - { - ShapeExtensionInit, - SHAPENAME, - &noShapeExtension, - NULL, - NULL - }, -#endif -#ifdef notyet - { - XTestExtensionInit, - XTestExtensionName, - &noTestExtensions, - NULL, - NULL - }, -#endif -#ifdef BIGREQS - { - BigReqExtensionInit, - XBigReqExtensionName, - &noBigReqExtension, - NULL, - NULL - }, -#endif -#ifdef XSYNC - { - SyncExtensionInit, - SYNC_NAME, - &noSyncExtension, - NULL, - NULL - }, -#endif -#ifdef SCREENSAVER - { - ScreenSaverExtensionInit, - ScreenSaverName, - &noScreenSaverExtension, - NULL, - NULL - }, -#endif -#ifdef DPMSExtension - { - DPMSExtensionInit, - DPMSExtensionName, - &noDPMSExtension, - NULL, - NULL - }, -#endif -#ifdef XV - { - XvExtensionInit, - XvName, - &noXvExtension, - XvRegister, - NULL - }, - { - XvMCExtensionInit, - XvMCName, - &noXvExtension, - NULL, - NULL - }, -#endif -#ifdef RES - { - ResExtensionInit, - XRES_NAME, - &noResExtension, - NULL, - NULL - }, -#endif - { /* DON'T delete this entry ! */ - NULL, - NULL, - NULL, - NULL, - NULL - } -}; - -static XF86ModuleVersionInfo VersRec = -{ - "extmod", - MODULEVENDORSTRING, - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, - 1, 0, 0, - ABI_CLASS_EXTENSION, - ABI_EXTENSION_VERSION, - MOD_CLASS_EXTENSION, - {0,0,0,0} -}; - -/* - * Data for the loader - */ -XF86ModuleData extmodModuleData = { &VersRec, extmodSetup, NULL }; - -static void * -extmodSetup(void * module, void * opts, int *errmaj, int *errmin) -{ - int i; - - /* XXX the option stuff here is largely a sample/test case */ - - for (i = 0; extensionModules[i].name != NULL; i++) { - if (opts) { - char *s; - s = (char *)malloc(strlen(extensionModules[i].name) + 5); - if (s) { - void * o; - strcpy(s, "omit"); - strcat(s, extensionModules[i].name); - o = xf86FindOption(opts, s); - free(s); - if (o) { - xf86MarkOptionUsed(o); - continue; - } - } - } - LoadExtension(&extensionModules[i], FALSE); - } - /* Need a non-NULL return */ - return (void *)1; -} - -#endif /* XFree86LOADER */ -- cgit v1.2.3