mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-04 22:36:10 +00:00
Merge branch 'master' into mpx
Conflicts: Xext/EVI.c Xext/appgroup.c Xext/cup.c Xext/mitmisc.c Xext/sampleEVI.c dix/window.c
This commit is contained in:
Peter Hutterer
commit
8190ef8754
195 changed files with 2129 additions and 36734 deletions
|
|
@ -18,10 +18,6 @@ if AFB
|
|||
AFBMOD = libafb.la
|
||||
endif
|
||||
|
||||
if CFB
|
||||
CFBMOD = libcfb.la libcfb32.la
|
||||
endif
|
||||
|
||||
if MFB
|
||||
MFBMOD = libmfb.la
|
||||
endif
|
||||
|
|
@ -31,7 +27,6 @@ RECORDMOD = librecord.la
|
|||
endif
|
||||
|
||||
module_LTLIBRARIES = $(AFBMOD) \
|
||||
$(CFBMOD) \
|
||||
libfb.la \
|
||||
libwfb.la \
|
||||
$(MFBMOD) \
|
||||
|
|
@ -61,14 +56,6 @@ libafb_la_LDFLAGS = -avoid-version
|
|||
libafb_la_LIBADD = $(top_builddir)/afb/libafb.la
|
||||
libafb_la_SOURCES = afbmodule.c
|
||||
|
||||
libcfb_la_LDFLAGS = -avoid-version
|
||||
libcfb_la_LIBADD = $(top_builddir)/cfb/libcfb.la
|
||||
libcfb_la_SOURCES = cfbmodule.c
|
||||
|
||||
libcfb32_la_LDFLAGS = -avoid-version
|
||||
libcfb32_la_LIBADD = $(top_builddir)/cfb32/libcfb32.la
|
||||
libcfb32_la_SOURCES = cfb32module.c
|
||||
|
||||
libdbe_la_LDFLAGS = -avoid-version
|
||||
libdbe_la_LIBADD = $(top_builddir)/dbe/libdbe.la
|
||||
libdbe_la_SOURCES = dbemodule.c
|
||||
|
|
|
|||
|
|
@ -1,57 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to
|
||||
* deal in the Software without restriction, including without limitation the
|
||||
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
* sell copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
* Except as contained in this notice, the name of the XFree86 Project shall
|
||||
* not be used in advertising or otherwise to promote the sale, use or other
|
||||
* dealings in this Software without prior written authorization from the
|
||||
* XFree86 Project.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_XORG_CONFIG_H
|
||||
#include <xorg-config.h>
|
||||
#endif
|
||||
|
||||
#include "xf86Module.h"
|
||||
|
||||
static MODULESETUPPROTO(cfb32Setup);
|
||||
|
||||
static XF86ModuleVersionInfo VersRec =
|
||||
{
|
||||
"cfb32",
|
||||
MODULEVENDORSTRING,
|
||||
MODINFOSTRING1,
|
||||
MODINFOSTRING2,
|
||||
XORG_VERSION_CURRENT,
|
||||
1, 0, 0,
|
||||
ABI_CLASS_ANSIC, /* Only need the ansic layer */
|
||||
ABI_ANSIC_VERSION,
|
||||
MOD_CLASS_NONE,
|
||||
{0,0,0,0} /* signature, to be patched into the file by a tool */
|
||||
};
|
||||
|
||||
_X_EXPORT XF86ModuleData cfb32ModuleData = { &VersRec, cfb32Setup, NULL };
|
||||
|
||||
static pointer
|
||||
cfb32Setup(pointer module, pointer opts, int *errmaj, int *errmin)
|
||||
{
|
||||
/* This modules requires cfb, so load it */
|
||||
return LoadSubModule(module, "cfb", NULL, NULL, NULL, NULL,
|
||||
errmaj, errmin);
|
||||
}
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to
|
||||
* deal in the Software without restriction, including without limitation the
|
||||
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
* sell copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
* Except as contained in this notice, the name of the XFree86 Project shall
|
||||
* not be used in advertising or otherwise to promote the sale, use or other
|
||||
* dealings in this Software without prior written authorization from the
|
||||
* XFree86 Project.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_XORG_CONFIG_H
|
||||
#include <xorg-config.h>
|
||||
#endif
|
||||
|
||||
#include "xf86Module.h"
|
||||
|
||||
static MODULESETUPPROTO(cfbSetup);
|
||||
|
||||
static XF86ModuleVersionInfo VersRec =
|
||||
{
|
||||
"cfb",
|
||||
MODULEVENDORSTRING,
|
||||
MODINFOSTRING1,
|
||||
MODINFOSTRING2,
|
||||
XORG_VERSION_CURRENT,
|
||||
1, 0, 0,
|
||||
ABI_CLASS_ANSIC, /* Only need the ansic layer */
|
||||
ABI_ANSIC_VERSION,
|
||||
MOD_CLASS_NONE,
|
||||
{0,0,0,0} /* signature, to be patched into the file by a tool */
|
||||
};
|
||||
|
||||
_X_EXPORT XF86ModuleData cfbModuleData = { &VersRec, cfbSetup, NULL };
|
||||
|
||||
static pointer
|
||||
cfbSetup(pointer module, pointer opts, int *errmaj, int *errmin)
|
||||
{
|
||||
/* This modules requires mfb, so load it */
|
||||
return LoadSubModule(module, "mfb", NULL, NULL, NULL, NULL,
|
||||
errmaj, errmin);
|
||||
}
|
||||
|
|
@ -23,7 +23,6 @@ AM_CFLAGS = @DIX_CFLAGS@ @XORG_CFLAGS@
|
|||
INCLUDES = @XORG_INCS@ \
|
||||
-I$(top_srcdir)/afb \
|
||||
-I$(top_srcdir)/mfb \
|
||||
-I$(top_srcdir)/cfb \
|
||||
-I$(top_srcdir)/dbe \
|
||||
-I$(top_srcdir)/hw/xfree86/loader \
|
||||
-I$(top_srcdir)/miext/shadow
|
||||
|
|
|
|||
|
|
@ -65,15 +65,6 @@ static ExtensionModule extensionModules[] = {
|
|||
NULL
|
||||
},
|
||||
#endif
|
||||
#ifdef MITMISC
|
||||
{
|
||||
MITMiscExtensionInit,
|
||||
MITMISCNAME,
|
||||
&noMITMiscExtension,
|
||||
NULL,
|
||||
NULL
|
||||
},
|
||||
#endif
|
||||
#ifdef notyet
|
||||
{
|
||||
XTestExtensionInit,
|
||||
|
|
@ -164,24 +155,6 @@ static ExtensionModule extensionModules[] = {
|
|||
NULL
|
||||
},
|
||||
#endif
|
||||
#ifdef TOGCUP
|
||||
{
|
||||
XcupExtensionInit,
|
||||
XCUPNAME,
|
||||
&noXcupExtension,
|
||||
NULL,
|
||||
NULL
|
||||
},
|
||||
#endif
|
||||
#ifdef EVI
|
||||
{
|
||||
EVIExtensionInit,
|
||||
EVINAME,
|
||||
&noEVIExtension,
|
||||
NULL,
|
||||
NULL
|
||||
},
|
||||
#endif
|
||||
#ifdef XV
|
||||
{
|
||||
XvExtensionInit,
|
||||
|
|
|
|||
|
|
@ -18,12 +18,6 @@ extern void MultibufferExtensionInit(INITARGS);
|
|||
#include <X11/extensions/multibufst.h>
|
||||
#endif
|
||||
|
||||
#ifdef MITMISC
|
||||
extern void MITMiscExtensionInit(INITARGS);
|
||||
#define _MITMISC_SERVER_
|
||||
#include <X11/extensions/mitmiscstr.h>
|
||||
#endif
|
||||
|
||||
#ifdef XTEST
|
||||
extern void XTestExtensionInit(INITARGS);
|
||||
#define _XTEST_SERVER_
|
||||
|
|
@ -89,18 +83,6 @@ extern void FontCacheExtensionInit(INITARGS);
|
|||
#include "fontcachstr.h"
|
||||
#endif
|
||||
|
||||
#ifdef TOGCUP
|
||||
extern void XcupExtensionInit(INITARGS);
|
||||
#define _XCUP_SERVER_
|
||||
#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);
|
||||
|
|
@ -134,14 +116,6 @@ extern void SELinuxExtensionInit(INITARGS);
|
|||
extern void SecurityExtensionInit(INITARGS);
|
||||
#endif
|
||||
|
||||
#if 1
|
||||
extern void XagExtensionInit(INITARGS);
|
||||
#endif
|
||||
|
||||
#if 1
|
||||
extern void XpExtensionInit(INITARGS);
|
||||
#endif
|
||||
|
||||
#if 1
|
||||
extern void PanoramiXExtensionInit(int argc, char *argv[]);
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue