Changeset 22149 in vbox

Timestamp:

Aug 11, 2009 9:40:48 AM (15 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: applied patch by Lubomir Rintel to make vboxvideo build on the X.Org 1.7 pre-release

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• vboxvideo.h (modified) (3 diffs)
• vboxvideo_13.c (modified) (5 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

@@ -49 +49 @@
  * Conectiva Linux.
  *
- * Authors: Paulo C�ar Pereira de Andrade <[email protected]>
+ * Authors: Paulo César Pereira de Andrade <[email protected]>
  *
  * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h,v 1.9 2001/05/04 19:05:49 dawes Exp $
@@ -98 +98 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+# include "xf86Resources.h"
+#endif
 
 #ifndef NO_ANSIC
@@ -141 +143 @@
 #include "dgaproc.h"
 
-#include "xf86RAC.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+# include "xf86RAC.h"
+#endif
 
 #include "fb.h"

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_13.c

@@ -470 +470 @@
 };
 
-/*
- * List of symbols from other modules that this module references.  This
- * list is used to tell the loader that it is OK for symbols here to be
- * unresolved providing that it hasn't been told that they are essential
- * via a call to xf86LoaderReqSymbols() or xf86LoaderReqSymLists().  The
- * purpose is this is to avoid warnings about unresolved symbols that are
- * not required.
- */
-static const char *fbSymbols[] = {
-    "fbPictureInit",
-    "fbScreenInit",
-    NULL
-};
-
-static const char *shadowfbSymbols[] = {
-  "ShadowFBInit2",
-  NULL
-};
-
-static const char *vbeSymbols[] = {
-    "VBEExtendedInit",
-    "VBEFindSupportedDepths",
-    "VBEGetModeInfo",
-    "VBEGetVBEInfo",
-    "VBEGetVBEMode",
-    "VBEPrintModes",
-    "VBESaveRestore",
-    "VBESetDisplayStart",
-    "VBESetGetDACPaletteFormat",
-    "VBESetGetLogicalScanlineLength",
-    "VBESetGetPaletteData",
-    "VBESetModeNames",
-    "VBESetModeParameters",
-    "VBESetVBEMode",
-    "VBEValidateModes",
-    "vbeDoEDID",
-    "vbeFree",
-    NULL
-};
-
-static const char *ramdacSymbols[] = {
-    "xf86InitCursor",
-    "xf86CreateCursorInfoRec",
-    NULL
-};
-
-static const char *vgahwSymbols[] = {
-    "vgaHWGetHWRec",
-    "vgaHWHandleColormaps",
-    "vgaHWFreeHWRec",
-    "vgaHWMapMem",
-    "vgaHWUnmapMem",
-    "vgaHWSaveFonts",
-    "vgaHWRestoreFonts",
-    NULL
-};
-
-#ifdef VBOX_DRI
-static const char *drmSymbols[] = {
-    "drmFreeVersion",
-    "drmGetVersion",
-    NULL
-};
-
-static const char *driSymbols[] = {
-    "DRICloseScreen",
-    "DRICreateInfoRec",
-    "DRIDestroyInfoRec",
-    "DRIFinishScreenInit",
-    "DRIGetSAREAPrivate",
-    "DRILock",
-    "DRIMoveBuffersHelper",
-    "DRIQueryVersion",
-    "DRIScreenInit",
-    "DRIUnlock",
-    "GlxSetVisualConfigs",
-    "DRICreatePCIBusID",
-    NULL
-};
-#endif
-
 #ifdef XFree86LOADER
 /* Module loader interface */
@@ -592 +511 @@
         xf86Msg(X_CONFIG, "Load address of symbol \"VBOXVIDEO\" is %p\n",
                 (void *)&VBOXVIDEO);
-        LoaderRefSymLists(fbSymbols,
-                          shadowfbSymbols,
-                          vbeSymbols,
-                          ramdacSymbols,
-#ifdef VBOX_DRI
-                          drmSymbols, driSymbols,
-#endif
-                          NULL);
         return (pointer)TRUE;
     }
@@ -775 +686 @@
     if (!xf86LoadSubModule(pScrn, "vbe"))
         return (FALSE);
-    xf86LoaderReqSymLists(vbeSymbols, NULL);
 
     if ((pVBox->pVbe = VBEExtendedInit(NULL, pVBox->pEnt->index,
@@ -795 +705 @@
     if (!xf86LoadSubModule(pScrn, "ramdac"))
         return FALSE;
-    xf86LoaderReqSymLists(ramdacSymbols, NULL);
 
     /* The framebuffer module. */
     if (xf86LoadSubModule(pScrn, "fb") == NULL)
         return (FALSE);
-    xf86LoaderReqSymLists(fbSymbols, NULL);
 
     if (!xf86LoadSubModule(pScrn, "shadowfb"))
         return FALSE;
-    xf86LoaderReqSymLists(shadowfbSymbols, NULL);
 
     if (!xf86LoadSubModule(pScrn, "vgahw"))
         return FALSE;
-    xf86LoaderReqSymLists(vgahwSymbols, NULL);
 
     /* Set up our ScrnInfoRec structure to describe our virtual
@@ -902 +808 @@
 #ifdef VBOX_DRI
     /* Load the dri module. */
-    if (xf86LoadSubModule(pScrn, "dri")) {
-        xf86LoaderReqSymLists(driSymbols, drmSymbols, NULL);
-    }
+    if (!xf86LoadSubModule(pScrn, "dri"))
+        return FALSE;
 #endif
     return (TRUE);