File xf86-video-newport-commit-48f48e5.diff of Package xorg-x11-driver-video
commit 48f48e585bf542be48d7d34dc66d430d6843268f
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 23 14:46:46 2010 +0100
newport: stop using obsolete loader functions
The loader symbol list functions have been removed from the server in
1.7.
Reported-and-tested-by: Bernhard R. Link <brlink@debian.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Index: xf86-video-newport-0.2.3/src/newport_driver.c
===================================================================
--- xf86-video-newport-0.2.3.orig/src/newport_driver.c
+++ xf86-video-newport-0.2.3/src/newport_driver.c
@@ -102,36 +102,6 @@ static SymTabRec NewportChipsets[] = {
{-1, NULL }
};
-/* List of Symbols from other modules that this module references */
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAGetFallbackOps",
- "XAAInit",
- NULL
-};
-
-
-#ifdef XFree86LOADER
-
static MODULESETUPPROTO(newportSetup);
static XF86ModuleVersionInfo newportVersRec =
@@ -172,14 +142,6 @@ newportSetup(pointer module, pointer opt
xf86AddDriver(&NEWPORT, module, 0);
/*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- *
- */
- LoaderRefSymLists( fbSymbols, ramdacSymbols, shadowSymbols, xaaSymbols, NULL);
-
-
- /*
* The return value must be non-NULL on success even though
* there is no TearDownProc.
*/
@@ -190,8 +152,6 @@ newportSetup(pointer module, pointer opt
}
}
-#endif /* XFree86LOADER */
-
typedef enum {
OPTION_BITPLANES,
OPTION_BUS_ID,
@@ -486,7 +446,6 @@ NewportPreInit(ScrnInfoPtr pScrn, int fl
NewportFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists( fbSymbols, NULL);
/* Load ramdac modules */
if (pNewport->hwCursor) {
@@ -494,7 +453,6 @@ NewportPreInit(ScrnInfoPtr pScrn, int fl
NewportFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
/* Load ShadowFB module */
@@ -502,7 +460,6 @@ NewportPreInit(ScrnInfoPtr pScrn, int fl
NewportFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
return TRUE;
}
@@ -596,8 +553,6 @@ NewportScreenInit(int index, ScreenPtr p
if (!pNewport->NoAccel) {
if (!xf86LoadSubModule(pScrn, "xaa"))
pNewport->NoAccel = TRUE;
- else
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
#if 0
if (pScrn->bitsPerPixel < 24)