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/Imakefile | 7 - nx-X11/programs/Xserver/Xext/bigreq.c | 1 - nx-X11/programs/Xserver/Xext/dpms.c | 1 - nx-X11/programs/Xserver/Xext/extmod/Imakefile | 66 ---------- nx-X11/programs/Xserver/Xext/extmod/modinit.c | 182 -------------------------- nx-X11/programs/Xserver/Xext/extmod/modinit.h | 91 ------------- nx-X11/programs/Xserver/Xext/panoramiX.c | 1 - nx-X11/programs/Xserver/Xext/saver.c | 2 - nx-X11/programs/Xserver/Xext/security.c | 2 - nx-X11/programs/Xserver/Xext/shape.c | 1 - nx-X11/programs/Xserver/Xext/shm.c | 2 - nx-X11/programs/Xserver/Xext/sync.c | 2 - nx-X11/programs/Xserver/Xext/xcmisc.c | 1 - nx-X11/programs/Xserver/Xext/xres.c | 1 - nx-X11/programs/Xserver/Xext/xtest.c | 2 - nx-X11/programs/Xserver/Xext/xtest1di.c | 1 - nx-X11/programs/Xserver/xkb/Imakefile | 2 - 17 files changed, 365 deletions(-) delete mode 100644 nx-X11/programs/Xserver/Xext/extmod/Imakefile delete mode 100644 nx-X11/programs/Xserver/Xext/extmod/modinit.c delete mode 100644 nx-X11/programs/Xserver/Xext/extmod/modinit.h diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile index 745ba1788..cf62aa228 100644 --- a/nx-X11/programs/Xserver/Xext/Imakefile +++ b/nx-X11/programs/Xserver/Xext/Imakefile @@ -25,11 +25,6 @@ #include -#if DoLoadableServer -#define IHaveSubdirs -SUBDIRS = extmod -#endif - #if HasShm && (!(defined(NXAgentServer) && NXAgentServer)) SHMSRCS = shm.c SHMOBJS = shm.o @@ -136,8 +131,6 @@ SpecialCObjectRule(security,$(ICONFIGFILES),$(POLICYFILEDEF)) LinkConfDirectory(xserver,.,xserver,.) -LinkSourceFile(modinit.h,extmod) - #if BuildXCSecurity && InstallSecurityConfig InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR)) #endif diff --git a/nx-X11/programs/Xserver/Xext/bigreq.c b/nx-X11/programs/Xserver/Xext/bigreq.c index 00e67c058..be5919328 100644 --- a/nx-X11/programs/Xserver/Xext/bigreq.c +++ b/nx-X11/programs/Xserver/Xext/bigreq.c @@ -38,7 +38,6 @@ from The Open Group. #include "extnsionst.h" #include #include "opaque.h" -#include "modinit.h" #if 0 static unsigned char XBigReqCode; diff --git a/nx-X11/programs/Xserver/Xext/dpms.c b/nx-X11/programs/Xserver/Xext/dpms.c index 3f75918ad..ea9781353 100644 --- a/nx-X11/programs/Xserver/Xext/dpms.c +++ b/nx-X11/programs/Xserver/Xext/dpms.c @@ -48,7 +48,6 @@ Equipment Corporation. #include #include #include "dpmsproc.h" -#include "modinit.h" #if 0 static unsigned char DPMSCode; diff --git a/nx-X11/programs/Xserver/Xext/extmod/Imakefile b/nx-X11/programs/Xserver/Xext/extmod/Imakefile deleted file mode 100644 index 0105cf775..000000000 --- a/nx-X11/programs/Xserver/Xext/extmod/Imakefile +++ /dev/null @@ -1,66 +0,0 @@ -#define IHaveModules -#include - -#if BuildScreenSaverExt - SCRNSAVSRC = saver.c - SCRNSAVOBJ = saver.o -LinkSourceFile(saver.c,..) -#endif - -#if BuildDPMS - DPMSSRCS = dpms.c - DPMSOBJS = dpms.o -LinkSourceFile(dpms.c,..) -#endif - -#if BuildXvExt - XVSRCS = xvmain.c xvdisp.c xvmod.c xvmc.c - XVOBJS = xvmain.o xvdisp.o xvmod.o xvmc.o -LinkSourceFile(xvmain.c,..) -LinkSourceFile(xvdisp.c,..) -LinkSourceFile(xvmod.c,..) -LinkSourceFile(xvmc.c,..) -#endif - -#if BuildXResExt - XRESSRCS = xres.c - XRESOBJS = xres.o -LinkSourceFile(xres.c,..) -#endif - - MODINITSRCS = modinit.c - MODINITOBJS = modinit.o - - SRCS = shape.c \ - bigreq.c sync.c $(SCRNSAVSRC) xcmisc.c \ - $(DPMSSRCS) \ - $(XVSRCS) $(MODINITSRCS) $(XRESSRCS) - - MOBJS = $(MODINITOBJS) shape.o \ - bigreq.o sync.o $(SCRNSAVOBJ) xcmisc.o \ - $(DPMSOBJS) \ - $(XVOBJS) $(XRESOBJS) - - DEFINES = -DEXTMODULE $(EXT_DEFINES) - -XF86INCLUDES = -I$(XF86COMSRC) - INCLUDES = -I.. -I../../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - $(XF86INCLUDES) - LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln - -LinkSourceFile(shape.c,..) -LinkSourceFile(bigreq.c,..) -LinkSourceFile(sync.c,..) -LinkSourceFile(xcmisc.c,..) - -ModuleObjectRule() - -SpecialCObjectRule(modinit,$(ICONFIGFILES),$(EXT_DEFINES)) -LibraryModuleTarget(extmod,$(MOBJS)) -NormalLintTarget($(SRCS)) - -InstallLibraryModule(extmod,$(MODULEDIR),extensions) - -DependTarget() - -InstallDriverSDKLibraryModule(extmod,$(DRIVERSDKMODULEDIR),extensions) 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 */ diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h deleted file mode 100644 index 96ba2da48..000000000 --- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h +++ /dev/null @@ -1,91 +0,0 @@ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#ifdef SHAPE -extern void ShapeExtensionInit(void); -#include -#endif - -#ifdef XTEST -extern void XTestExtensionInit(void); -#define _XTEST_SERVER_ -#include -#include -#endif - -#if 1 -extern void XTestExtension1Init(void); -#endif - -#ifdef BIGREQS -extern void BigReqExtensionInit(void); -#include -#endif - -#ifdef XSYNC -extern void SyncExtensionInit(void); -#define _SYNC_SERVER -#include -#include -#endif - -#ifdef SCREENSAVER -extern void ScreenSaverExtensionInit (void); -#include -#endif - -#ifdef XCMISC -extern void XCMiscExtensionInit(void); -#include -#endif - -#ifdef DPMSExtension -extern void DPMSExtensionInit(void); -#include -#endif - -#ifdef XV -extern void XvExtensionInit(void); -extern void XvMCExtensionInit(void); -extern void XvRegister(void); -#include -#include -#endif - -#ifdef RES -extern void ResExtensionInit(void); -#include -#endif - -#ifdef SHM -extern void ShmExtensionInit(void); -#include -extern void ShmSetPixmapFormat( - ScreenPtr pScreen, - int format); -extern void ShmRegisterFuncs( - ScreenPtr pScreen, - ShmFuncsPtr funcs); -#endif - -#if 1 -extern void SecurityExtensionInit(void); -#endif - -#if 1 -extern void XagExtensionInit(void); -#endif - -#if 1 -extern void XpExtensionInit(void); -#endif - -#if 1 -extern void PanoramiXExtensionInit(int argc, char *argv[]); -#endif - -#if 1 -extern void XkbExtensionInit(void); -#endif diff --git a/nx-X11/programs/Xserver/Xext/panoramiX.c b/nx-X11/programs/Xserver/Xext/panoramiX.c index 206fa5406..3809890bc 100644 --- a/nx-X11/programs/Xserver/Xext/panoramiX.c +++ b/nx-X11/programs/Xserver/Xext/panoramiX.c @@ -55,7 +55,6 @@ Equipment Corporation. #ifdef RENDER #include "picturestr.h" #endif -#include "modinit.h" #include "protocol-versions.h" #ifdef GLXPROXY diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c index 51f18e4e4..0cb71de42 100644 --- a/nx-X11/programs/Xserver/Xext/saver.c +++ b/nx-X11/programs/Xserver/Xext/saver.c @@ -59,8 +59,6 @@ in this Software without prior written authorization from the X Consortium. #include #endif -#include "modinit.h" - #include "protocol-versions.h" #if 0 diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c index c1b7b50a9..6883db5f8 100644 --- a/nx-X11/programs/Xserver/Xext/security.c +++ b/nx-X11/programs/Xserver/Xext/security.c @@ -112,8 +112,6 @@ static char _NXPolicyFilePath[1024]; #endif -#include "modinit.h" - static int SecurityErrorBase; /* first Security error number */ static int SecurityEventBase; /* first Security event number */ diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c index 165bee50c..50a6db119 100644 --- a/nx-X11/programs/Xserver/Xext/shape.c +++ b/nx-X11/programs/Xserver/Xext/shape.c @@ -46,7 +46,6 @@ in this Software without prior written authorization from The Open Group. #ifdef EXTMODULE #include "xf86_ansic.h" #endif -#include "modinit.h" typedef RegionPtr (*CreateDftPtr)( WindowPtr /* pWin */ diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c index a91afdaf0..f27d70ffe 100644 --- a/nx-X11/programs/Xserver/Xext/shm.c +++ b/nx-X11/programs/Xserver/Xext/shm.c @@ -68,8 +68,6 @@ in this Software without prior written authorization from The Open Group. #include "panoramiXsrv.h" #endif -#include "modinit.h" - typedef struct _ShmDesc { struct _ShmDesc *next; int shmid; diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c index 945dec250..0421cd9f9 100644 --- a/nx-X11/programs/Xserver/Xext/sync.c +++ b/nx-X11/programs/Xserver/Xext/sync.c @@ -77,8 +77,6 @@ PERFORMANCE OF THIS SOFTWARE. #endif #endif -#include "modinit.h" - /* * Local Global Variables */ diff --git a/nx-X11/programs/Xserver/Xext/xcmisc.c b/nx-X11/programs/Xserver/Xext/xcmisc.c index b7f55aa6d..bb47df979 100644 --- a/nx-X11/programs/Xserver/Xext/xcmisc.c +++ b/nx-X11/programs/Xserver/Xext/xcmisc.c @@ -38,7 +38,6 @@ from The Open Group. #include "extnsionst.h" #include "swaprep.h" #include -#include "modinit.h" #include diff --git a/nx-X11/programs/Xserver/Xext/xres.c b/nx-X11/programs/Xserver/Xext/xres.c index 243de9c39..426983135 100644 --- a/nx-X11/programs/Xserver/Xext/xres.c +++ b/nx-X11/programs/Xserver/Xext/xres.c @@ -15,7 +15,6 @@ #include "swaprep.h" #include #include "pixmapstr.h" -#include "modinit.h" #include "protocol-versions.h" static int diff --git a/nx-X11/programs/Xserver/Xext/xtest.c b/nx-X11/programs/Xserver/Xext/xtest.c index 6cd7d1111..c410a4955 100644 --- a/nx-X11/programs/Xserver/Xext/xtest.c +++ b/nx-X11/programs/Xserver/Xext/xtest.c @@ -54,8 +54,6 @@ from The Open Group. #include "xf86_ansic.h" #endif -#include "modinit.h" - #if 0 static unsigned char XTestReqCode; #endif diff --git a/nx-X11/programs/Xserver/Xext/xtest1di.c b/nx-X11/programs/Xserver/Xext/xtest1di.c index ac49ba2a3..b1d69ef47 100644 --- a/nx-X11/programs/Xserver/Xext/xtest1di.c +++ b/nx-X11/programs/Xserver/Xext/xtest1di.c @@ -71,7 +71,6 @@ University of California. #include "opaque.h" #define XTestSERVER_SIDE #include -#include "modinit.h" #include "xtest1dd.h" diff --git a/nx-X11/programs/Xserver/xkb/Imakefile b/nx-X11/programs/Xserver/xkb/Imakefile index 1417cbc3f..07d715301 100644 --- a/nx-X11/programs/Xserver/xkb/Imakefile +++ b/nx-X11/programs/Xserver/xkb/Imakefile @@ -65,8 +65,6 @@ AllTarget($(XF86_OBJS)) SpecialCObjectRule(xkbInit,$(ICONFIGFILES),$(XKB_DEFINES)) -LinkSourceFile(modinit.h,../Xext/extmod) - #if BuildLibraries #if UseConfDirForXkb LinkConfDirectory(xkb,.,xkb,.) -- cgit v1.2.3