rpms/VirtualBox-OSE/devel VirtualBox-OSE-3.0.2-videodrv6.patch, NONE, 1.1 VirtualBox-OSE.spec, 1.15, 1.16 VirtualBox-OSE-3.0.2-video17.patch, 1.1, NONE

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24948

Modified Files:
	VirtualBox-OSE.spec 
Added Files:
	VirtualBox-OSE-3.0.2-videodrv6.patch 
Removed Files:
	VirtualBox-OSE-3.0.2-video17.patch 
Log Message:
Correct the video driver

VirtualBox-OSE-3.0.2-videodrv6.patch:

--- NEW FILE VirtualBox-OSE-3.0.2-videodrv6.patch ---
Update the vboxvideo driver for Fedora 12's X.Org snapshot ABI.

Lubomir Rintel <lkundrak at v3.sk>

diff -up VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c.videodrv6 VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c
--- VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c.videodrv6	2009-08-08 17:11:35.885921752 +0200
+++ VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c	2009-08-08 17:11:35.872922604 +0200
@@ -475,6 +475,7 @@ static const xf86OutputFuncsRec VBOXOutp
     .destroy = vbox_output_stub
 };
 
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 /*
  * 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
@@ -544,6 +545,7 @@ static const char *driSymbols[] = {
     NULL
 };
 #endif
+#endif
 
 #ifdef XFree86LOADER
 /* Module loader interface */
@@ -584,6 +586,7 @@ vboxSetup(pointer Module, pointer Option
 #else
         xf86AddDriver(&VBOXDRV, Module, 0);
 #endif
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
         LoaderRefSymLists(fbSymbols,
                           shadowfbSymbols,
                           vbeSymbols,
@@ -592,6 +595,7 @@ vboxSetup(pointer Module, pointer Option
                           drmSymbols, driSymbols,
 #endif
                           NULL);
+#endif
         return (pointer)TRUE;
     }
 
@@ -767,7 +771,9 @@ VBOXPreInit(ScrnInfoPtr pScrn, int flags
        text mode, in order to keep our code simple. */
     if (!xf86LoadSubModule(pScrn, "vbe"))
         return (FALSE);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
     xf86LoaderReqSymLists(vbeSymbols, NULL);
+#endif
 
     if ((pVBox->pVbe = VBEExtendedInit(NULL, pVBox->pEnt->index,
                                        SET_BIOS_SCRATCH
@@ -787,16 +793,22 @@ VBOXPreInit(ScrnInfoPtr pScrn, int flags
     /* The ramdac module is needed for the hardware cursor. */
     if (!xf86LoadSubModule(pScrn, "ramdac"))
         return FALSE;
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
     xf86LoaderReqSymLists(ramdacSymbols, NULL);
+#endif
 
     /* The framebuffer module. */
     if (xf86LoadSubModule(pScrn, "fb") == NULL)
         return (FALSE);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
     xf86LoaderReqSymLists(fbSymbols, NULL);
+#endif
 
     if (!xf86LoadSubModule(pScrn, "shadowfb"))
         return FALSE;
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
     xf86LoaderReqSymLists(shadowfbSymbols, NULL);
+#endif
 
     /* Set up our ScrnInfoRec structure to describe our virtual
        capabilities to X. */
@@ -906,7 +918,7 @@ VBOXPreInit(ScrnInfoPtr pScrn, int flags
     /* Framebuffer-related setup */
     pScrn->bitmapBitOrder = BITMAP_BIT_ORDER;
 
-#ifdef VBOX_DRI
+#if defined(VBOX_DRI) && GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7
     /* Load the dri module. */
     if (xf86LoadSubModule(pScrn, "dri")) {
         xf86LoaderReqSymLists(driSymbols, drmSymbols, NULL);
diff -up VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo.h.videodrv6 VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
--- VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo.h.videodrv6	2009-08-08 17:12:09.762175503 +0200
+++ VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo.h	2009-08-08 17:11:35.916172873 +0200
@@ -97,7 +97,9 @@ do { \
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
+#endif
 
 #ifndef NO_ANSIC
 /* All drivers need this */
@@ -140,7 +142,9 @@ do { \
 /* Dga definitions */
 #include "dgaproc.h"
 
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86RAC.h"
+#endif
 
 #include "fb.h"
 


Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- VirtualBox-OSE.spec	5 Aug 2009 06:09:44 -0000	1.15
+++ VirtualBox-OSE.spec	8 Aug 2009 15:36:38 -0000	1.16
@@ -27,9 +27,9 @@
 Patch2:         VirtualBox-OSE-3.0.0-strings.patch
 Patch3:         VirtualBox-OSE-3.0.2-libcxx.patch
 Patch4:         VirtualBox-OSE-3.0.2-pulse12.patch
-Patch5:         VirtualBox-OSE-3.0.2-xinput2.patch
-Patch6:         VirtualBox-OSE-3.0.2-xorg17.patch
-Patch7:         VirtualBox-OSE-3.0.2-video17.patch
+Patch5:         VirtualBox-OSE-3.0.2-xorg17.patch
+Patch6:         VirtualBox-OSE-3.0.2-xinput2.patch
+Patch7:         VirtualBox-OSE-3.0.2-videodrv6.patch
 Patch8:         VirtualBox-OSE-3.0.2-dri.patch
 Patch10:        VirtualBox-OSE-2.2.0-32bit.patch
 
@@ -118,9 +118,9 @@
 %patch2 -p1 -b .strings
 %patch3 -p1 -b .libcxx
 %patch4 -p1 -b .pulse12
-%patch5 -p1 -b .xinput2
-%patch6 -p1 -b .xorg17
-%patch7 -p1 -b .video17
+%patch5 -p1 -b .xorg17
+%patch6 -p1 -b .xinput2
+%patch7 -p1 -b .videodrv6
 %patch8 -p1 -b .dri
 %patch10 -p1 -b .32bit
 


--- VirtualBox-OSE-3.0.2-video17.patch DELETED ---