Don't bother building RAC as a module, that's just absurd.
This commit is contained in:
parent
76aaf7eae7
commit
98a602fab1
|
@ -38,6 +38,7 @@ XORG_LIBS = \
|
||||||
common/libinit.a \
|
common/libinit.a \
|
||||||
loader/libloader.a \
|
loader/libloader.a \
|
||||||
libosandcommon.la \
|
libosandcommon.la \
|
||||||
|
rac/librac.a \
|
||||||
parser/libxf86config.a \
|
parser/libxf86config.a \
|
||||||
dummylib/libdummy.a \
|
dummylib/libdummy.a \
|
||||||
dixmods/libdixmods.la \
|
dixmods/libdixmods.la \
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.c,v 1.80 2004/02/05 18:24:59 eich Exp $ */
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
|
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
|
||||||
*
|
*
|
||||||
|
@ -2571,17 +2570,13 @@ xf86PostPreInit()
|
||||||
if (xf86NumScreens > 1)
|
if (xf86NumScreens > 1)
|
||||||
needRAC = TRUE;
|
needRAC = TRUE;
|
||||||
|
|
||||||
#ifdef XFree86LOADER
|
|
||||||
xf86MsgVerb(X_INFO, 3, "do I need RAC?");
|
xf86MsgVerb(X_INFO, 3, "do I need RAC?");
|
||||||
|
|
||||||
if (needRAC) {
|
if (needRAC) {
|
||||||
xf86ErrorFVerb(3, " Yes, I do.\n");
|
xf86ErrorFVerb(3, " Yes, I do.\n");
|
||||||
|
} else {
|
||||||
if (!xf86LoadOneModule("rac",NULL))
|
|
||||||
FatalError("Cannot load RAC module\n");
|
|
||||||
} else
|
|
||||||
xf86ErrorFVerb(3, " No, I don't.\n");
|
xf86ErrorFVerb(3, " No, I don't.\n");
|
||||||
#endif
|
}
|
||||||
|
|
||||||
xf86MsgVerb(X_INFO, 3, "resource ranges after preInit:\n");
|
xf86MsgVerb(X_INFO, 3, "resource ranges after preInit:\n");
|
||||||
xf86PrintResList(3, Acc);
|
xf86PrintResList(3, Acc);
|
||||||
|
@ -2594,22 +2589,12 @@ xf86PostScreenInit(void)
|
||||||
ScreenPtr pScreen;
|
ScreenPtr pScreen;
|
||||||
unsigned int flags;
|
unsigned int flags;
|
||||||
int nummem = 0, numio = 0;
|
int nummem = 0, numio = 0;
|
||||||
#ifdef XFree86LOADER
|
|
||||||
pointer xf86RACInit = NULL;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (doFramebufferMode) {
|
if (doFramebufferMode) {
|
||||||
SetSIGIOForState(OPERATING);
|
SetSIGIOForState(OPERATING);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef XFree86LOADER
|
|
||||||
if (needRAC) {
|
|
||||||
xf86RACInit = LoaderSymbol("xf86RACInit");
|
|
||||||
if (!xf86RACInit)
|
|
||||||
FatalError("Cannot resolve symbol \"xf86RACInit\"\n");
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
ErrorF("PostScreenInit generation: %i\n",serverGeneration);
|
ErrorF("PostScreenInit generation: %i\n",serverGeneration);
|
||||||
#endif
|
#endif
|
||||||
|
@ -2688,12 +2673,7 @@ xf86PostScreenInit(void)
|
||||||
xf86ErrorFVerb(3, "Screen %d is using RAC for io\n", i);
|
xf86ErrorFVerb(3, "Screen %d is using RAC for io\n", i);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef XFree86LOADER
|
|
||||||
((Bool(*)(ScreenPtr,unsigned int))xf86RACInit)
|
|
||||||
(pScreen,flags);
|
|
||||||
#else
|
|
||||||
xf86RACInit(pScreen,flags);
|
xf86RACInit(pScreen,flags);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
module_LTLIBRARIES = librac.la
|
module_LIBRARIES = librac.a
|
||||||
librac_la_LDFLAGS = -avoid-version
|
librac_a_SOURCES = xf86RAC.c
|
||||||
librac_la_SOURCES = xf86RACmodule.c xf86RAC.c
|
|
||||||
|
|
||||||
sdk_HEADERS = xf86RAC.h
|
sdk_HEADERS = xf86RAC.h
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.c,v 1.5 1999/06/12 17:30:21 dawes Exp $ */
|
|
||||||
|
|
||||||
#ifdef HAVE_XORG_CONFIG_H
|
#ifdef HAVE_XORG_CONFIG_H
|
||||||
#include <xorg-config.h>
|
#include <xorg-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -243,12 +241,12 @@ static void RACCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor *color,
|
||||||
int nRect, xRectangle *rects);
|
int nRect, xRectangle *rects);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
GCFuncs RACGCFuncs = {
|
static GCFuncs RACGCFuncs = {
|
||||||
RACValidateGC, RACChangeGC, RACCopyGC, RACDestroyGC,
|
RACValidateGC, RACChangeGC, RACCopyGC, RACDestroyGC,
|
||||||
RACChangeClip, RACDestroyClip, RACCopyClip
|
RACChangeClip, RACDestroyClip, RACCopyClip
|
||||||
};
|
};
|
||||||
|
|
||||||
GCOps RACGCOps = {
|
static GCOps RACGCOps = {
|
||||||
RACFillSpans, RACSetSpans, RACPutImage, RACCopyArea,
|
RACFillSpans, RACSetSpans, RACPutImage, RACCopyArea,
|
||||||
RACCopyPlane, RACPolyPoint, RACPolylines, RACPolySegment,
|
RACCopyPlane, RACPolyPoint, RACPolylines, RACPolySegment,
|
||||||
RACPolyRectangle, RACPolyArc, RACFillPolygon, RACPolyFillRect,
|
RACPolyRectangle, RACPolyArc, RACFillPolygon, RACPolyFillRect,
|
||||||
|
@ -257,13 +255,13 @@ GCOps RACGCOps = {
|
||||||
{NULL} /* devPrivate */
|
{NULL} /* devPrivate */
|
||||||
};
|
};
|
||||||
|
|
||||||
miPointerSpriteFuncRec RACSpriteFuncs = {
|
static miPointerSpriteFuncRec RACSpriteFuncs = {
|
||||||
RACSpriteRealizeCursor, RACSpriteUnrealizeCursor, RACSpriteSetCursor,
|
RACSpriteRealizeCursor, RACSpriteUnrealizeCursor, RACSpriteSetCursor,
|
||||||
RACSpriteMoveCursor
|
RACSpriteMoveCursor
|
||||||
};
|
};
|
||||||
|
|
||||||
int RACScreenIndex = -1;
|
static int RACScreenIndex = -1;
|
||||||
int RACGCIndex = -1;
|
static int RACGCIndex = -1;
|
||||||
static unsigned long RACGeneration = 0;
|
static unsigned long RACGeneration = 0;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
#ifdef HAVE_XORG_CONFIG_H
|
|
||||||
#include <xorg-config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "xf86Module.h"
|
|
||||||
|
|
||||||
static XF86ModuleVersionInfo racVersRec =
|
|
||||||
{
|
|
||||||
"rac",
|
|
||||||
MODULEVENDORSTRING,
|
|
||||||
MODINFOSTRING1,
|
|
||||||
MODINFOSTRING2,
|
|
||||||
XORG_VERSION_CURRENT,
|
|
||||||
1, 0, 0,
|
|
||||||
ABI_CLASS_VIDEODRV, /* requires the video driver ABI */
|
|
||||||
ABI_VIDEODRV_VERSION,
|
|
||||||
MOD_CLASS_NONE,
|
|
||||||
{0,0,0,0}
|
|
||||||
};
|
|
||||||
|
|
||||||
_X_EXPORT XF86ModuleData racModuleData = { &racVersRec, NULL, NULL };
|
|
Loading…
Reference in New Issue
Block a user