Author: lkundrak Update of /cvs/free/rpms/VirtualBox-OSE/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv3541 Modified Files: .cvsignore VirtualBox-OSE.spec sources Added Files: VirtualBox-OSE-3.0.4-pulse0916.patch VirtualBox-OSE-3.0.4-vblank.patch VirtualBox-OSE-3.0.4-videodrv6.patch Removed Files: VirtualBox-OSE-3.0.2-pulse12.patch Log Message: * Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 3.0.4-1 - Update to later upstream release - Re-enable DRI again, fix drm_release crash VirtualBox-OSE-3.0.4-pulse0916.patch: --- NEW FILE VirtualBox-OSE-3.0.4-pulse0916.patch --- Adjust for newer PulseAudio API. We can not use PA_API_VERSION here, since it did not change (== 12). Lubomir Rintel <lkundrak(a)v3.sk&gt; diff -urp VirtualBox-3.0.2_OSE/src/VBox/Devices/Audio/pulse_stubs.c VirtualBox-3.0.2_OSE.fixed/src/VBox/Devices/Audio/pulse_stubs.c --- VirtualBox-3.0.2_OSE/src/VBox/Devices/Audio/pulse_stubs.c 2009-07-10 11:41:12.000000000 -0400 +++ VirtualBox-3.0.2_OSE.fixed/src/VBox/Devices/Audio/pulse_stubs.c 2009-08-04 11:35:03.036925820 -0400 @@ -41,10 +41,17 @@ void (*function ## _fn)(void); \ void function signature \ { ( (void (*) signature) function ## _fn ) shortsig; } +#if PA_PROTOCOL_VERSION >= 16 +PROXY_STUB (pa_stream_connect_playback, int, + (pa_stream *s, const char *dev, const pa_buffer_attr *attr, + pa_stream_flags_t flags, const pa_cvolume *volume, pa_stream *sync_stream), + (s, dev, attr, flags, volume, sync_stream)) +#else PROXY_STUB (pa_stream_connect_playback, int, (pa_stream *s, const char *dev, const pa_buffer_attr *attr, pa_stream_flags_t flags, pa_cvolume *volume, pa_stream *sync_stream), (s, dev, attr, flags, volume, sync_stream)) +#endif PROXY_STUB (pa_stream_connect_record, int, (pa_stream *s, const char *dev, const pa_buffer_attr *attr, pa_stream_flags_t flags), VirtualBox-OSE-3.0.4-vblank.patch: --- NEW FILE VirtualBox-OSE-3.0.4-vblank.patch --- Call drm_vblank_init() upon initialization, so that we initialize flip list and don't crash on NULL dereference upon drm_release(). Lubomir Rintel <lkundrak(a)v3.sk&gt; diff -up VirtualBox-3.0.4_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c.vblank VirtualBox-3.0.4_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c --- VirtualBox-3.0.4_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c.vblank 2009-08-09 15:13:14.000000000 +0200 +++ VirtualBox-3.0.4_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c 2009-08-09 15:13:20.000000000 +0200 @@ -66,8 +66,14 @@ static struct pci_device_id pciidlist[] vboxvideo_PCI_IDS }; +int vboxvideo_driver_load(struct drm_device * dev, unsigned long flags) +{ + return drm_vblank_init(dev, 1); +} + static struct drm_driver driver = { /* .driver_features = DRIVER_USE_MTRR, */ + .load = vboxvideo_driver_load, .reclaim_buffers = drm_core_reclaim_buffers, .get_map_ofs = drm_core_get_map_ofs, .get_reg_ofs = drm_core_get_reg_ofs, VirtualBox-OSE-3.0.4-videodrv6.patch: --- NEW FILE VirtualBox-OSE-3.0.4-videodrv6.patch --- Update the vboxvideo driver for Fedora 12's X.Org snapshot ABI. Lubomir Rintel <lkundrak(a)v3.sk&gt; diff -up VirtualBox-3.0.4_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c.videodrv6 VirtualBox-3.0.4_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c --- VirtualBox-3.0.4_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c.videodrv6 2009-08-04 19:17:01.000000000 +0200 +++ VirtualBox-3.0.4_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c 2009-08-09 15:33:40.007923255 +0200 @@ -469,6 +469,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 @@ -538,6 +539,7 @@ static const char *driSymbols[] = { NULL }; #endif +#endif #ifdef XFree86LOADER /* Module loader interface */ @@ -580,6 +582,7 @@ vboxSetup(pointer Module, pointer Option #endif xf86Msg(X_CONFIG, "Load address of symbol \"VBOXVIDEO\" is %p\n", (void *)&VBOXVIDEO); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 LoaderRefSymLists(fbSymbols, shadowfbSymbols, vbeSymbols, @@ -588,6 +591,7 @@ vboxSetup(pointer Module, pointer Option drmSymbols, driSymbols, #endif NULL); +#endif return (pointer)TRUE; } @@ -763,7 +767,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 @@ -783,16 +789,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. */ @@ -880,7 +892,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.4_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo.h.videodrv6 VirtualBox-3.0.4_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo.h --- VirtualBox-3.0.4_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo.h.videodrv6 2009-08-04 19:17:02.000000000 +0200 +++ VirtualBox-3.0.4_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo.h 2009-08-09 15:24:27.393923506 +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: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Jul 2009 03:08:43 -0000 1.6 +++ .cvsignore 9 Aug 2009 14:25:32 -0000 1.7 @@ -1,2 +1,2 @@ -VirtualBox-3.0.2-OSE.tar.bz2 +VirtualBox-3.0.4-OSE.tar.bz2 UserManual.pdf Index: VirtualBox-OSE.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- VirtualBox-OSE.spec 8 Aug 2009 15:36:38 -0000 1.16 +++ VirtualBox-OSE.spec 9 Aug 2009 14:25:32 -0000 1.17 @@ -9,8 +9,8 @@ %bcond_without hardening Name: VirtualBox-OSE -Version: 3.0.2 -Release: 4%{?dist} +Version: 3.0.4 +Release: 1%{?dist} Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools @@ -26,11 +26,11 @@ Patch1: VirtualBox-OSE-2.2.0-noupdate.patch Patch2: VirtualBox-OSE-3.0.0-strings.patch Patch3: VirtualBox-OSE-3.0.2-libcxx.patch -Patch4: VirtualBox-OSE-3.0.2-pulse12.patch +Patch4: VirtualBox-OSE-3.0.4-pulse0916.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 +Patch7: VirtualBox-OSE-3.0.4-videodrv6.patch +Patch8: VirtualBox-OSE-3.0.4-vblank.patch Patch10: VirtualBox-OSE-2.2.0-32bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -117,11 +117,11 @@ %patch1 -p1 -b .noupdates %patch2 -p1 -b .strings %patch3 -p1 -b .libcxx -%patch4 -p1 -b .pulse12 +%patch4 -p1 -b .pulse0916 %patch5 -p1 -b .xorg17 %patch6 -p1 -b .xinput2 %patch7 -p1 -b .videodrv6 -%patch8 -p1 -b .dri +%patch8 -p1 -b .vblank %patch10 -p1 -b .32bit # Remove prebuilt binary tools @@ -371,6 +371,10 @@ %changelog +* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 3.0.4-1 +- Update to later upstream release +- Re-enable DRI again, fix drm_release crash + * Tue Aug 04 2009 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 3.0.2-4 - Build for i686 - Fix build with newer PulseAudio Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Jul 2009 03:08:43 -0000 1.6 +++ sources 9 Aug 2009 14:25:32 -0000 1.7 @@ -1,2 +1,2 @@ -68e6658b8b11a509d7dec57835cba267 VirtualBox-3.0.2-OSE.tar.bz2 -4d0b51c0c4759dc34c124083bae73436 UserManual.pdf +70d4c7b1f271120723a16c9d2b3ba46f VirtualBox-3.0.4-OSE.tar.bz2 +e37a6625c9048269112e96cc286aade0 UserManual.pdf --- VirtualBox-OSE-3.0.2-pulse12.patch DELETED ---