Author: sergiomb Update of /cvs/free/rpms/VirtualBox/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28050 Modified Files: .cvsignore VirtualBox-OSE-4.0.0-32bit.patch VirtualBox-OSE-4.0.0-makeself.patch VirtualBox.spec sources Added Files: VirtualBox-4.1.20-x113.patch VirtualBox-4.2.0-libcxx.patch VirtualBox-4.2.0-xorg17.patch Removed Files: VirtualBox-4.1.20-libcxx.patch VirtualBox-OSE-3.2.0-visibility.patch VirtualBox-OSE-4.1.2-testmangle.patch VirtualBox-OSE-4.1.2-usblib.patch VirtualBox-OSE-4.1.4-xorg17.patch Log Message: * Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.5.RC3 - not drop 32-bit patch, on x86_64 as quick resolution of not have glic-devel.i686 on x86_64. * Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.4.RC3 - Also Compile guest drives vboxvideo_drv and vboxmouse_drv with X11 sources from system. - Fix ABI/API breakages in X11 1.13. * Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.3.RC3 - fix requires kmod, with version with prerealeses. * Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.2.RC3 - vim :retab, reformat all tabs. - add BR # libstdc++.i686 and libc-devel.i686 for 32-bits BuildRequires: /usr/lib/libc.so BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6 - drop 32-bit patch and testmangle patch, no fails. - rename and remove some patches cvs diff: VirtualBox-4.1.20-libcxx.patch was removed, no comparison available cvs diff: VirtualBox-4.1.20-x113.patch is a new entry, no comparison available cvs diff: VirtualBox-4.2.0-libcxx.patch is a new entry, no comparison available cvs diff: VirtualBox-4.2.0-xorg17.patch is a new entry, no comparison available cvs diff: VirtualBox-OSE-3.2.0-visibility.patch was removed, no comparison available cvs diff: VirtualBox-OSE-4.0.0-32bit.patch was removed, no comparison available cvs diff: VirtualBox-OSE-4.1.2-testmangle.patch was removed, no comparison available cvs diff: VirtualBox-OSE-4.1.2-usblib.patch was removed, no comparison available cvs diff: VirtualBox-OSE-4.1.4-xorg17.patch was removed, no comparison available * Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.1.RC3 - New major release, devel release of rpms . - rebase patches VirtualBox-4.1.20-libcxx.patch, VirtualBox-OSE-4.1.4-xorg17.patch and VirtualBox-OSE-4.0.0-32bit.patch VirtualBox-4.1.20-x113.patch: vboxvideo.c | 55 +++++++++++++++++++++++-------------------------------- vboxvideo.h | 2 +- vboxvideo_dri.c | 4 ++-- 3 files changed, 26 insertions(+), 35 deletions(-) --- NEW FILE VirtualBox-4.1.20-x113.patch --- X.org 1.13 patch Reference: http://www.mail-archive.com/xorg-devel@lists.x.org/msg30282.html [PATCH 01/19] xserver: remove index from CloseScreen (API/ABI breakage) Dave Airlie [PATCH 02/19] xserver: convert block/wakeup handlers to passing ScreenPtr (ABI/API break) Dave Airlie [PATCH 04/19] xf86: modify FreeScreen callback to take pScrn instead of index. (ABI/API) Dave Airlie [PATCH 03/19] xf86: change EnterVT/LeaveVT to take a ScrnInfoPtr (ABI/API break) Dave Airlie [PATCH 07/19] xf86: migrate ValidMode callback to ScrnInfoPtr (ABI/API) Dave Airlie [PATCH 05/19] xf86: move AdjustFrame to passing ScrnInfoPtr (ABI/API) Dave Airlie [PATCH 06/19] xf86: migrate SwitchMode to taking ScrnInfoPtr (ABI/API) Dave Airlie etc... --- VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c.x113 2012-08-29 20:10:30.000000000 +0100 +++ VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c 2012-09-06 23:18:39.671510033 +0100 @@ -156,11 +156,11 @@ VBOXDoBlockHandler(int screenNum, pointe } #endif -Bool VBOXDRIScreenInit(int scrnIndex, ScreenPtr pScreen, VBOXPtr pVBox) +Bool VBOXDRIScreenInit(ScreenPtr pScreen, VBOXPtr pVBox) { DRIInfoPtr pDRIInfo = NULL; Bool rc = TRUE; - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); TRACE_ENTRY(); pVBox->drmFD = -1; --- VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxvideo/vboxvideo.h.x113 2012-09-06 23:42:36.010456357 +0100 +++ VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxvideo/vboxvideo.h 2012-09-06 23:42:49.903562273 +0100 @@ -234,7 +234,7 @@ extern void vboxAddModes(ScrnInfoPtr pSc uint32_t cyInit); /* DRI stuff */ -extern Bool VBOXDRIScreenInit(int scrnIndex, ScreenPtr pScreen, VBOXPtr pVBox); +extern Bool VBOXDRIScreenInit(ScreenPtr pScreen, VBOXPtr pVBox); extern Bool VBOXDRIFinishScreenInit(ScreenPtr pScreen); extern void VBOXDRIUpdateStride(ScrnInfoPtr pScrn, VBOXPtr pVBox); extern void VBOXDRICloseScreen(ScreenPtr pScreen, VBOXPtr pVBox); --- VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxvideo/vboxvideo.c.x113 2012-08-29 20:10:30.000000000 +0100 +++ VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxvideo/vboxvideo.c 2012-09-06 23:56:40.481894812 +0100 @@ -108,15 +108,15 @@ static Bool VBOXPciProbe(DriverPtr drv, struct pci_device *dev, intptr_t match_data); #endif static Bool VBOXPreInit(ScrnInfoPtr pScrn, int flags); -static Bool VBOXScreenInit(int Index, ScreenPtr pScreen, int argc, +static Bool VBOXScreenInit(ScreenPtr pScrn, int argc, char **argv); -static Bool VBOXEnterVT(int scrnIndex, int flags); -static void VBOXLeaveVT(int scrnIndex, int flags); +static Bool VBOXEnterVT(ScrnInfoPtr pScrn, int flags); +static void VBOXLeaveVT(ScrnInfoPtr pScrn, int flags); static Bool VBOXCloseScreen(int scrnIndex, ScreenPtr pScreen); static Bool VBOXSaveScreen(ScreenPtr pScreen, int mode); -static Bool VBOXSwitchMode(int scrnIndex, DisplayModePtr pMode, int flags); -static void VBOXAdjustFrame(int scrnIndex, int x, int y, int flags); -static void VBOXFreeScreen(int scrnIndex, int flags); +static Bool VBOXSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr pMode, int flags); +static void VBOXAdjustFrame(ScrnInfoPtr pScrn, int x, int y, int flags); +static void VBOXFreeScreen(ScrnInfoPtr pScrn, int flags); static void VBOXDisplayPowerManagementSet(ScrnInfoPtr pScrn, int mode, int flags); @@ -700,16 +700,14 @@ VBOXProbe(DriverPtr drv, int flags) * restore it or not afterwards. */ static void -vboxEnableDisableFBAccess(int scrnIndex, Bool enable) +vboxEnableDisableFBAccess(ScrnInfoPtr pScrn, Bool enable) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; - VBOXPtr pVBox = VBOXGetRec(pScrn); TRACE_LOG("enable=%s\n", enable ? "TRUE" : "FALSE"); VBOXSetRec(pScrn); pVBox->accessEnabled = enable; - pVBox->EnableDisableFBAccess(scrnIndex, enable); + pVBox->EnableDisableFBAccess(pScrn, enable); TRACE_EXIT(); } @@ -936,9 +934,9 @@ vboxLoadPalette(ScrnInfoPtr pScrn, int n * End QUOTE. */ static Bool -VBOXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +VBOXScreenInit(ScreenPtr pScreen, int argc, char **argv) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); VBOXPtr pVBox = VBOXGetRec(pScrn); VisualPtr visual; unsigned flags; @@ -960,7 +958,7 @@ VBOXScreenInit(int scrnIndex, ScreenPtr return (FALSE); #ifdef VBOX_DRI - pVBox->useDRI = VBOXDRIScreenInit(scrnIndex, pScreen, pVBox); + pVBox->useDRI = VBOXDRIScreenInit(pScreen, pVBox); #endif if (!fbScreenInit(pScreen, pVBox->base, @@ -1113,7 +1111,7 @@ VBOXScreenInit(int scrnIndex, ScreenPtr xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options); if (vbox_cursor_init(pScreen) != TRUE) - xf86DrvMsg(scrnIndex, X_ERROR, + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unable to start the VirtualBox mouse pointer integration with the host system.\n"); #ifdef VBOX_DRI @@ -1124,9 +1122,8 @@ VBOXScreenInit(int scrnIndex, ScreenPtr } static Bool -VBOXEnterVT(int scrnIndex, int flags) +VBOXEnterVT(ScrnInfoPtr pScrn, int flags) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; VBOXPtr pVBox = VBOXGetRec(pScrn); TRACE_ENTRY(); @@ -1136,7 +1133,7 @@ VBOXEnterVT(int scrnIndex, int flags) pVBox->vtSwitch = FALSE; #ifdef VBOX_DRI if (pVBox->useDRI) - DRIUnlock(screenInfo.screens[scrnIndex]); + DRIUnlock(xf86ScrnToScreen(pScrn)); #endif #ifdef VBOXVIDEO_13 if (!xf86SetDesiredModes(pScrn)) @@ -1151,9 +1148,8 @@ VBOXEnterVT(int scrnIndex, int flags) } static void -VBOXLeaveVT(int scrnIndex, int flags) +VBOXLeaveVT(ScrnInfoPtr pScrn, int flags) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; VBOXPtr pVBox = VBOXGetRec(pScrn); TRACE_ENTRY(); @@ -1165,7 +1161,7 @@ VBOXLeaveVT(int scrnIndex, int flags) vboxDisableGraphicsCap(pVBox); #ifdef VBOX_DRI if (pVBox->useDRI) - DRILock(screenInfo.screens[scrnIndex], 0); + DRILock(xf86ScrnToScreen(pScrn), 0); #endif TRACE_EXIT(); } @@ -1198,23 +1194,21 @@ VBOXCloseScreen(int scrnIndex, ScreenPtr /* Remove our observer functions from the X server call chains. */ pScrn->EnableDisableFBAccess = pVBox->EnableDisableFBAccess; pScreen->CloseScreen = pVBox->CloseScreen; - return pScreen->CloseScreen(scrnIndex, pScreen); + return pScreen->CloseScreen(pScreen); } static Bool -VBOXSwitchMode(int scrnIndex, DisplayModePtr pMode, int flags) +VBOXSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr pMode, int flags) { - ScrnInfoPtr pScrn; VBOXPtr pVBox; Bool rc; TRACE_LOG("HDisplay=%d, VDisplay=%d\n", pMode->HDisplay, pMode->VDisplay); - pScrn = xf86Screens[scrnIndex]; /* Why does X have three ways of referring to the screen? */ pVBox = VBOXGetRec(pScrn); /* We want to disable access to the framebuffer before switching mode. * After doing the switch, we allow access if it was allowed before. */ if (pVBox->accessEnabled) - pVBox->EnableDisableFBAccess(scrnIndex, FALSE); + pVBox->EnableDisableFBAccess(pScrn, FALSE); #ifdef VBOXVIDEO_13 rc = xf86SetSingleMode(pScrn, pMode, 0); #else @@ -1231,16 +1225,15 @@ VBOXSwitchMode(int scrnIndex, DisplayMod pScrn->bitsPerPixel); #endif if (pVBox->accessEnabled) - pVBox->EnableDisableFBAccess(scrnIndex, TRUE); + pVBox->EnableDisableFBAccess(pScrn, TRUE); TRACE_LOG("returning %s\n", rc ? "TRUE" : "FALSE"); return rc; } static void -VBOXAdjustFrame(int scrnIndex, int x, int y, int flags) +VBOXAdjustFrame(ScrnInfoPtr pScrn, int x, int y, int flags) { - VBOXPtr pVBox = VBOXGetRec(xf86Screens[scrnIndex]); - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + VBOXPtr pVBox = VBOXGetRec(pScrn); TRACE_ENTRY(); /* Don't fiddle with the hardware if we are switched @@ -1251,10 +1244,8 @@ VBOXAdjustFrame(int scrnIndex, int x, in } static void -VBOXFreeScreen(int scrnIndex, int flags) +VBOXFreeScreen(ScrnInfoPtr pScrn, int flags) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; - /* Destroy the VGA hardware record */ vgaHWFreeHWRec(pScrn); /* And our private record */ VirtualBox-4.2.0-libcxx.patch: Config.kmk | 4 ++-- configure | 2 +- src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 4 +--- src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +- src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ src/VBox/HostDrivers/win/Makefile.kmk | 2 +- src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/VBox/Storage/testcase/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- src/libs/zlib-1.2.6/Makefile.kmk | 3 +-- 14 files changed, 20 insertions(+), 23 deletions(-) --- NEW FILE VirtualBox-4.2.0-libcxx.patch --- From: Lubomir Rintel <lkundrak(a)v3.sk&gt; Date: Fri, 18 Jun 2010 10:58:14 +0200 Subject: [PATCH 2/3] Do not include statically linked libstdc++ Not a good idea if we don't need to be binary-compatible across exotic distribution. Doesn't work with trunk glibc heading towards 2.11 anyways. Static linking is not really supported anyways. --- Config.kmk | 4 ++-- configure | 2 +- .../WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 5 +---- src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +- src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ src/VBox/HostDrivers/win/Makefile.kmk | 2 +- src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/VBox/Storage/testcase/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- src/libs/zlib-1.2.1/Makefile.kmk | 2 +- 17 files changed, 23 insertions(+), 26 deletions(-) diff --git a/Config.kmk b/Config.kmk index 0ea34d8..2ec388c 100644 --- a/Config.kmk +++ b/Config.kmk @@ -3163,7 +3163,7 @@ TEMPLATE_VBOXR3EXE_LIBS = pthread m rt dl TEMPLATE_VBOXR3EXE_LIBS = \ $(L4_LIBDIR)/libvboxserver.s.so \ $(L4_LIBDIR)/libuc++.0.s.so \ - supc++ gcc_eh gcc \ + stdc++ \ $(L4_LIBDIR)/libdl.s.so \ $(L4_LIBDIR)/libuc.0.s.so else ifeq ($(KBUILD_TARGET),os2) @@ -3311,7 +3311,7 @@ endif # Temporary: Renaming the template and warnings will be errors (soon). # TEMPLATE_VBoxR3Static = New name for VBOXR3STATIC -TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3STATIC +TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3EXE TEMPLATE_VBoxR3Static_EXTENDS_BY = appending ifeq ($(KBUILD_TARGET),win) TEMPLATE_VBoxR3Static_CFLAGS += $(VBOX_VCC_WERR) diff --git a/configure b/configure index 987cf1b..75d556c 100755 --- a/configure +++ b/configure @@ -2582,7 +2582,7 @@ fi if [ "$OS" = "linux" ]; then # don't check for the static libstdc++ in the PUEL version as we build the # additions at a dedicated box - [ $OSE -ge 1 ] && check_staticlibstdcxx + #[ $OSE -ge 1 ] && check_staticlibstdcxx if [ $WITH_KMODS -eq 1 ]; then check_linux else --- a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk.libcxx 2012-08-03 13:28:42.000000000 +0100 +++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk 2012-09-02 02:55:41.970453638 +0100 @@ -195,7 +195,7 @@ endif #ifdef VBOX_WITH_WDDM ifdef VBOXVIDEOWINDBG DLLS += vbvdbg -vbvdbg_TEMPLATE = VBOXR3STATIC +vbvdbg_TEMPLATE = VBOXR3EXE vbvdbg_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH) vbvdbg_DEFS = UNICODE _UNICODE vbvdbg_SOURCES = \ --- a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk.libcxx 2012-08-03 13:28:42.000000000 +0100 +++ b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2012-09-02 03:13:43.602348048 +0100 @@ -49,9 +49,7 @@ VBoxClient_LIBS = \ Xt # Xtst # These are static replacements for gcc-specific parts of libstdc++ -VBoxClient_LIBS += \ - supc++ \ - gcc_eh +VBoxClient_LIBS += stdc++ ifdef VBOX_X11_SEAMLESS_GUEST VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE VBoxClient_SOURCES += \ diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk index ed0163b..2ee8418 100644 --- a/src/VBox/Frontends/VirtualBox/Makefile.kmk +++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk @@ -957,7 +957,7 @@ endif # darwin if defined(VBOX_WITH_VIDEOHWACCEL) if1of ($(KBUILD_TARGET), win linux freebsd) LIBRARIES += VBoxOGL2D - VBoxOGL2D_TEMPLATE = VBOXR3STATIC + VBoxOGL2D_TEMPLATE = VBOXR3EXE VBoxOGL2D_USES = qt4 VBoxOGL2D_SDKS = QT4 VBoxOGL2D_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS) VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL --- a/src/VBox/HostDrivers/Support/Makefile.kmk.orig 2012-09-02 03:06:50.648190033 +0100 +++ b/src/VBox/HostDrivers/Support/Makefile.kmk 2012-09-02 03:04:52.703001504 +0100 @@ -94,7 +94,7 @@ SUPR3_SOURCES = \ # # Static version of SUPR3. # -SUPR3Static_TEMPLATE = VBOXR3STATIC +SUPR3Static_TEMPLATE = VBOXR3EXE SUPR3Static_EXTENDS = SUPR3 # diff --git a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk --- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk.libcxx 2012-08-29 15:13:46.000000000 +0100 +++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk 2012-09-02 02:49:31.198721147 +0100 @@ -143,7 +143,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # WinNetConfig - static library with host network interface config API # LIBRARIES.win += WinNetConfig - WinNetConfig_TEMPLATE = VBOXR3STATIC + WinNetConfig_TEMPLATE = VBOXR3EXE WinNetConfig_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE WinNetConfig_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) WinNetConfig_SOURCES = \ @@ -154,7 +154,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # NetFltInstall # PROGRAMS.win += NetFltInstall - NetFltInstall_TEMPLATE = VBOXR3STATIC + NetFltInstall_TEMPLATE = VBOXR3EXE NetFltInstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL NetFltInstall_SOURCES = win/tools/VBoxNetFltInstall.cpp NetFltInstall_LIBS = \ @@ -169,7 +169,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # NetFltUninstall # PROGRAMS.win += NetFltUninstall - NetFltUninstall_TEMPLATE = VBOXR3STATIC + NetFltUninstall_TEMPLATE = VBOXR3EXE NetFltUninstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL NetFltUninstall_SOURCES = win/tools/VBoxNetFltUninstall.cpp NetFltUninstall_LIBS = \ @@ -183,7 +183,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # NetAdpInstall # PROGRAMS.win += NetAdpInstall - NetAdpInstall_TEMPLATE = VBOXR3STATIC + NetAdpInstall_TEMPLATE = VBOXR3EXE NetAdpInstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL NetAdpInstall_SOURCES = win/tools/VBoxNetAdpInstall.cpp NetAdpInstall_LIBS = \ @@ -198,7 +198,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # NetAdpUninstall # PROGRAMS.win += NetAdpUninstall - NetAdpUninstall_TEMPLATE = VBOXR3STATIC + NetAdpUninstall_TEMPLATE = VBOXR3EXE NetAdpUninstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL NetAdpUninstall_SOURCES = win/tools/VBoxNetAdpUninstall.cpp NetAdpUninstall_LIBS = \ @@ -212,7 +212,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # VBoxNetFltNobj # DLLS.win += VBoxNetFltNobj - VBoxNetFltNobj_TEMPLATE = VBOXR3STATIC + VBoxNetFltNobj_TEMPLATE = VBOXR3EXE if defined(VBOX_SIGNING_MODE) VBoxNetFltNobj_INSTTYPE = none VBoxNetFltNobj_DEBUG_INSTTYPE = both --- a/src/VBox/HostDrivers/win/Makefile.kmk.libcxx 2012-07-18 09:58:10.000000000 +0100 +++ b/src/VBox/HostDrivers/win/Makefile.kmk 2012-09-02 02:39:16.639533050 +0100 @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../.. include $(KBUILD_PATH)/subheader.kmk LIBRARIES += VBoxDrvCfg -VBoxDrvCfg_TEMPLATE = VBOXR3STATIC +VBoxDrvCfg_TEMPLATE = VBOXR3EXE VBoxDrvCfg_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBoxDrvCfg_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE VBoxDrvCfg_SOURCES = cfg/VBoxDrvCfg.cpp --- a/src/VBox/Installer/win/InstallHelper/Makefile.kmk.libcxx 2012-08-03 13:28:30.000000000 +0100 +++ b/src/VBox/Installer/win/InstallHelper/Makefile.kmk 2012-09-02 02:59:34.062788499 +0100 @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../.. include $(KBUILD_PATH)/subheader.kmk DLLS += VBoxInstallHelper -VBoxInstallHelper_TEMPLATE = VBOXR3STATIC +VBoxInstallHelper_TEMPLATE = VBOXR3EXE VBoxInstallHelper_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE VBoxInstallHelper_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV) VBoxInstallHelper_DEPS = $(VBOX_SVN_REV_KMK) --- a/src/VBox/Installer/win/Resources/Makefile.kmk.libcxx 2012-05-30 11:38:23.000000000 +0100 +++ b/src/VBox/Installer/win/Resources/Makefile.kmk 2012-09-02 02:57:56.559807746 +0100 @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../.. include $(KBUILD_PATH)/subheader.kmk DLLS += VBoxRes -VBoxRes_TEMPLATE = VBOXR3STATIC +VBoxRes_TEMPLATE = VBOXR3EXE VBoxRes_DEPS = $(VBOX_SVN_REV_KMK) VBoxRes_SOURCES = \ dummy.cpp \ diff --git a/src/VBox/Installer/win/Stub/Makefile.kmk b/src/VBox/Installer/win/Stub/Makefile.kmk index a8f89eb..6cf55cc 100644 --- a/src/VBox/Installer/win/Stub/Makefile.kmk +++ b/src/VBox/Installer/win/Stub/Makefile.kmk @@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk if "$(KBUILD_TARGET_ARCH)" == "x86" TEMPLATE_VBOXSTUB = Drop the signing, we will sign it later. -TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3STATIC +TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3EXE TEMPLATE_VBOXSTUB_POST_CMDS = $(NO_SUCH_VARIABLE) PROGRAMS.x86 += VBoxStub diff --git a/src/VBox/Storage/testcase/Makefile.kmk b/src/VBox/Storage/testcase/Makefile.kmk index f935b05..40f6bf2 100644 --- a/src/VBox/Storage/testcase/Makefile.kmk +++ b/src/VBox/Storage/testcase/Makefile.kmk @@ -68,7 +68,7 @@ ifdef VBOX_WITH_TESTCASES # # vbox-img - static because it migth be used as at standalone tool. # - vbox-img_TEMPLATE = VBOXR3STATIC + vbox-img_TEMPLATE = VBOXR3EXE vbox-img_DEFS += IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS IN_RT_R3 vbox-img_SOURCES = \ vbox-img.cpp \ diff --git a/src/libs/liblzf-3.4/Makefile.kmk b/src/libs/liblzf-3.4/Makefile.kmk index 44088fa..0afe89a 100644 --- a/src/libs/liblzf-3.4/Makefile.kmk +++ b/src/libs/liblzf-3.4/Makefile.kmk @@ -33,7 +33,7 @@ VBox-liblzf_SOURCES = \ lzf_c.c \ lzf_d.c -VBox-liblzf-static_TEMPLATE = VBOXR3STATIC +VBox-liblzf-static_TEMPLATE = VBOXR3EXE VBox-liblzf-static_BLD_TYPE = $(VBox-liblzf_BLD_TYPE) VBox-liblzf-static_DEFS = $(VBox-liblzf_DEFS) VBox-liblzf-static_DEFS.x86 = $(VBox-liblzf_DEFS.x86) diff --git a/src/libs/zlib-1.2.1/Makefile.kmk b/src/libs/zlib-1.2.1/Makefile.kmk index fde8b7c..405d354 100644 --- a/src/libs/zlib-1.2.6/Makefile.kmk +++ b/src/libs/zlib-1.2.6/Makefile.kmk @@ -39,7 +39,7 @@ VBox-zlib_SOURCES = \ inftrees.c \ inffast.c -VBox-zlib-static_TEMPLATE = VBOXR3STATIC +VBox-zlib-static_TEMPLATE = VBOXR3EXE VBox-zlib-static_DEFS = $(VBox-zlib_DEFS) VBox-zlib-static_SOURCES = $(VBox-zlib_SOURCES) -- 1.7.1 VirtualBox-4.2.0-xorg17.patch: VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 40 +-- VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/vboxmouse.c | 10 VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 108 ++++++---- b/src/VBox/Additions/common/crOpenGL/Makefile.kmk | 14 - src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk | 4 5 files changed, 98 insertions(+), 78 deletions(-) --- NEW FILE VirtualBox-4.2.0-xorg17.patch --- Build the X.Org driver only for the selected system X Server version. Author: Sérgio Basto <sergio(a)serjux.com&gt; Based on scripts by Michael Meskes <meskes(a)debian.org&gt;, Felix Geyer <debfx-pkg(a)fobos.de&gt; diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk --- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk +++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk @@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL VBoxOGL_INCS = . if1of ($(KBUILD_TARGET), linux solaris freebsd) VBoxOGL_INCS += \ - $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ - $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ - $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \ - $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \ - $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \ - $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \ - $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \ - $(VBOX_PATH_X11_ROOT)/1.3/xorg \ + /usr/include/x11 \ + /usr/include/xorg \ + /usr/include/pixman-1 \ $(VBOX_MESA_INCS) \ - $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 + /usr/include/drm \ + /usr/include/libdrm VBoxOGL_DEFS += VBOX_NO_NATIVEGL endif --- a/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 19:57:53.762613198 +0000 +++ b/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 20:01:17.296596446 +0000 @@ -36,11 +36,11 @@ endif # !VBOX_ONLY_SDK # tstSetModeXOrg_TEMPLATE = VBOXR3TSTEXE tstSetModeXOrg_CFLAGS += -std=c99 -tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_15_DEFS)) TESTCASE +tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_17_DEFS)) TESTCASE tstSetModeXOrg_SOURCES = \ tstSetModeXOrg.c \ ../setmode.c -tstSetModeXOrg_INCS = $(vboxvideo_drv_15_INCS) +tstSetModeXOrg_INCS = $(vboxvideo_drv_17_INCS) # generate rules. --- VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/vboxmouse.c.xorg17 2012-09-07 02:38:56.473777159 +0100 +++ VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/vboxmouse.c 2012-09-07 02:39:11.025882086 +0100 @@ -52,13 +52,9 @@ #include <xf86Module.h> -#ifdef VBOX_GUESTR3XF86MOD -# define _X_EXPORT -#else -# include <errno.h> -# include <fcntl.h> -# include <unistd.h> -#endif +#include <errno.h> +#include <fcntl.h> +#include <unistd.h> #include "product-generated.h" --- VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100 +++ VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2012-09-07 03:18:17.460463185 +0100 @@ -30,25 +30,12 @@ if1of ($(KBUILD_TARGET), linux) # This one has to be defined when building server code on systems where # unsigned long is 64bits vboxmouse_drv_DEFS.amd64 += _XSERVER64 - vboxmouse_drv_DEFS += \ - _POSIX_C_SOURCE=199309L _POSIX_SOURCE _XOPEN_SOURCE \ - _BSD_SOURCE _SVID_SOURCE _GNU_SOURCE SHAPE XINPUT XKB LBX XAPPGROUP \ - XCSECURITY TOGCUP XF86BIGFONT DPMSExtension PIXPRIV PANORAMIX RENDER \ - GCCUSESGAS AVOID_GLYPHBLT PIXPRIV SINGLEDEPTH XFreeXDGA XvExtension \ - XFree86LOADER XFree86Server XF86VIDMODE XvMCExtension SMART_SCHEDULE \ - BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \ - IN_MODULE XFree86Module PNP_MOUSE IN_XF86_MODULE - vboxmouse_drv_INCS := \ - $(VBOX_PATH_X11_XFREE_4_3)/include \ - $(VBOX_PATH_X11_XFREE_4_3)/include/extensions \ - $(VBOX_PATH_X11_XFREE_4_3)/include/X11 \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86 \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support/bus \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/mi \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \ - $(PATH_SUB_CURRENT) +vboxmouse_drv_DEFS += XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X \ + IN_XF86_MODULE DONT_DEFINE_WRAPPERS NO_ANSIC +vboxmouse_drv_INCS := \ + /usr/include/x11 \ + /usr/include/xorg \ + /usr/include/pixman-1 vboxmouse_drv_SOURCES = \ vboxmouse.c # Any global symbols in the driver object files will be added to XFree86's @@ -57,9 +44,18 @@ if1of ($(KBUILD_TARGET), linux) vboxmouse_drv_POST_CMDS = \ objcopy --keep-global-symbol vboxmouseModuleData $(out) $(out)-objcopy$$(NLTAB) \ $(MV) -f $(out)-objcopy $(out) -endif - +DLLS += vboxmouse_drv_17 +vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD +vboxmouse_drv_17_DEFS = XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE \ + DONT_DEFINE_WRAPPERS NO_ANSIC +vboxmouse_drv_17_INCS := \ + /usr/include/x11 \ + /usr/include/xorg \ + /usr/include/pixman-1 +vboxmouse_drv_17_SOURCES = \ + vboxmouse.c +else # # vboxmouse_drv_70 # @@ -391,5 +387,7 @@ endif # neq ($(KBUILD_TARGET),linux) # endif # ! VBOX_ONLY_ADDITIONS endif # VBOX_WITH_TESTCASES +endif # neq ($(KBUILD_TARGET),linux) + include $(FILE_KBUILD_SUB_FOOTER) --- VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxvideo/Makefile.kmk.xorg17 2012-05-30 11:39:29.000000000 +0100 +++ VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2012-09-07 03:24:32.187238932 +0100 @@ -35,45 +35,35 @@ vboxvideo_drv_DEFS.x86 = __i386__ # This one has to be defined when building server code on systems where # unsigned long is 64bits vboxvideo_drv_DEFS.amd64 += _XSERVER64 -vboxvideo_drv_DEFS = \ - _POSIX_C_SOURCE=199309L _POSIX_SOURCE _XOPEN_SOURCE \ - _BSD_SOURCE _SVID_SOURCE _GNU_SOURCE SHAPE XINPUT XKB LBX XAPPGROUP \ - XCSECURITY TOGCUP XF86BIGFONT DPMSExtension PIXPRIV PANORAMIX RENDER \ - GCCUSESGAS AVOID_GLYPHBLT PIXPRIV SINGLEDEPTH XFreeXDGA XvExtension \ - XFree86LOADER XFree86Server XF86VIDMODE XvMCExtension SMART_SCHEDULE \ - BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \ - IN_MODULE XFree86Module IN_XF86_MODULE IN_RT_STATIC -vboxvideo_drv_DEFS += memset=xf86memset memcpy=xf86memcpy +vboxvideo_drv_DEFS := XFree86Server IN_MODULE XFree86Module XFree86LOADER IN_XF86_MODULE XORG_7X RENDER=1 \ + IN_RT_STATIC VBOXVIDEO_13 NO_ANSIC PCIACCESS VBOX_NO_LOW_COLOUR VBOX_DRI vboxvideo_drv_INCS = \ - $(VBOX_PATH_X11_XFREE_4_3)/include \ - $(VBOX_PATH_X11_XFREE_4_3)/include/X11 \ - $(VBOX_PATH_X11_XFREE_4_3)/include/X11/extensions \ - $(VBOX_PATH_X11_XFREE_4_3)/include/extensions \ - $(VBOX_PATH_X11_XFREE_4_3)/include/fonts \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/afb \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/fb \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86 \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/ddc \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/int10 \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/i2c \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/vbe \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support/bus \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/rac \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/ramdac \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/shadowfb \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/vgahw \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/xf1bpp \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/xf24_32bpp \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/xf4bpp \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/mfb \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/mi \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/miext/shadow \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/render \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/randr \ - $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/Xext + /usr/include/drm \ + /usr/include/X11/dri \ + /usr/include/pixman-1 \ + /usr/share/xorg-x11-server-source \ + /usr/share/xorg-x11-server-source/fb \ + /usr/share/xorg-x11-server-source/hw/xfree86/common \ + /usr/share/xorg-x11-server-source/hw/xfree86/ddc \ + /usr/share/xorg-x11-server-source/hw/xfree86/dixmods/extmod \ + /usr/share/xorg-x11-server-source/hw/xfree86/dri \ + /usr/share/xorg-x11-server-source/hw/xfree86/i2c \ + /usr/share/xorg-x11-server-source/hw/xfree86/int10 \ + /usr/share/xorg-x11-server-source/hw/xfree86/modes \ + /usr/share/xorg-x11-server-source/hw/xfree86/os-support \ + /usr/share/xorg-x11-server-source/hw/xfree86/os-support/bus \ + /usr/share/xorg-x11-server-source/hw/xfree86/ramdac \ + /usr/share/xorg-x11-server-source/hw/xfree86/shadowfb \ + /usr/share/xorg-x11-server-source/hw/xfree86/vbe \ + /usr/share/xorg-x11-server-source/hw/xfree86/vgahw \ + /usr/share/xorg-x11-server-source/hw/xquartz/xpr \ + /usr/share/xorg-x11-server-source/include \ + /usr/share/xorg-x11-server-source/mi \ + /usr/share/xorg-x11-server-source/miext/damage \ + /usr/share/xorg-x11-server-source/randr \ + /usr/share/xorg-x11-server-source/Xext \ + /usr/share/xorg-x11-server-source/render \ + /usr/share/xorg-x11-server-source/hw/xfree86/parser vboxvideo_drv_INCS += $(PATH_ROOT)/src/VBox/Runtime/include vboxvideo_drv_SOURCES = \ pointer.c \ @@ -86,7 +76,7 @@ vboxvideo_drv_SOURCES = \ $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp \ $(PATH_ROOT)/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp \ $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapsimple.cpp \ - $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp + $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp edid.c vboxvideo_dri.c # Any global symbols in the driver object files will be added to XFree86's # symbol table, which can cause problems if we e.g. define a symbol in two # modules. @@ -94,6 +84,44 @@ vboxvideo_drv_SOURCES = \ objcopy --keep-global-symbol vboxvideoModuleData $(out) $(out)-objcopy$$(NLTAB) \ $(MV) -f $(out)-objcopy $(out) +DLLS += vboxvideo_drv_17 +vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD +vboxvideo_drv_17_CFLAGS += -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros) # template? +vboxvideo_drv_17_DEFS := XFree86Server IN_MODULE XFree86Module XFree86LOADER XORG_7X RENDER=1 \ + IN_XF86_MODULE IN_RT_STATIC VBOXVIDEO_13 NO_ANSIC PCIACCESS VBOX_NO_LOW_COLOUR VBOX_DRI +vboxvideo_drv_17_INCS = \ + /usr/include/drm \ + /usr/include/X11/dri \ + /usr/include/pixman-1 \ + /usr/share/xorg-x11-server-source \ + /usr/share/xorg-x11-server-source/fb \ + /usr/share/xorg-x11-server-source/hw/xfree86/common \ + /usr/share/xorg-x11-server-source/hw/xfree86/ddc \ + /usr/share/xorg-x11-server-source/hw/xfree86/dixmods/extmod \ + /usr/share/xorg-x11-server-source/hw/xfree86/dri \ + /usr/share/xorg-x11-server-source/hw/xfree86/i2c \ + /usr/share/xorg-x11-server-source/hw/xfree86/int10 \ + /usr/share/xorg-x11-server-source/hw/xfree86/modes \ + /usr/share/xorg-x11-server-source/hw/xfree86/os-support \ + /usr/share/xorg-x11-server-source/hw/xfree86/os-support/bus \ + /usr/share/xorg-x11-server-source/hw/xfree86/ramdac \ + /usr/share/xorg-x11-server-source/hw/xfree86/shadowfb \ + /usr/share/xorg-x11-server-source/hw/xfree86/vbe \ + /usr/share/xorg-x11-server-source/hw/xfree86/vgahw \ + /usr/share/xorg-x11-server-source/hw/xquartz/xpr \ + /usr/share/xorg-x11-server-source/include \ + /usr/share/xorg-x11-server-source/mi \ + /usr/share/xorg-x11-server-source/miext/damage \ + /usr/share/xorg-x11-server-source/randr \ + /usr/share/xorg-x11-server-source/Xext \ + /usr/share/xorg-x11-server-source/render \ + /usr/share/xorg-x11-server-source/hw/xfree86/parser +vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include +vboxvideo_drv_17_SOURCES = $(vboxvideo_drv_SOURCES) + +ifdef NOT_FEDORA + + # # vboxvideo_drv_70 # @@ -505,4 +533,6 @@ $$(vboxvideo_drv_112_0_OUTDIR)/tstvboxvi # endif # ! VBOX_ONLY_ADDITIONS endif # VBOX_WITH_TESTCASES +endif # NOT_FEDORA + include $(FILE_KBUILD_SUB_FOOTER) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-18/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 1 Sep 2012 20:47:44 -0000 1.37 +++ .cvsignore 8 Sep 2012 02:08:19 -0000 1.38 @@ -1 +1 @@ -VirtualBox-4.1.20.tar.bz2 +VirtualBox-4.2.0_RC3.tar.bz2 VirtualBox-OSE-4.0.0-32bit.patch: configure | 2 +- src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++ src/VBox/VMM/testcase/Makefile.kmk | 13 ++++++++++--- 3 files changed, 19 insertions(+), 4 deletions(-) Index: VirtualBox-OSE-4.0.0-32bit.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox-OSE-4.0.0-32bit.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- VirtualBox-OSE-4.0.0-32bit.patch 3 Feb 2011 23:25:21 -0000 1.1 +++ VirtualBox-OSE-4.0.0-32bit.patch 8 Sep 2012 02:08:19 -0000 1.2 @@ -22,7 +22,7 @@ - [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit + #[ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit # tools/common/makeself* - [ $OSE -ge 1 ] && check_makeself + #[ $OSE -ge 1 ] && check_makeself fi diff --git a/src/VBox/Devices/testcase/Makefile.kmk b/src/VBox/Devices/testcase/Makefile.kmk index 4debf81..59dae0d 100644 @@ -67,26 +67,24 @@ tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST tstDeviceStructSize_DEFS = $(VBOX_DEVICES_TESTS_FEATURES) tstDeviceStructSize_INCS = \ -diff --git a/src/VBox/VMM/testcase/Makefile.kmk b/src/VBox/VMM/testcase/Makefile.kmk -index f947789..95882f1 100644 ---- a/src/VBox/VMM/testcase/Makefile.kmk -+++ b/src/VBox/VMM/testcase/Makefile.kmk -@@ -21,10 +21,14 @@ include $(KBUILD_PATH)/subheader.kmk +--- a/src/VBox/VMM/testcase/Makefile.kmk.32bit 2012-07-18 09:58:08.000000000 +0100 ++++ b/src/VBox/VMM/testcase/Makefile.kmk 2012-09-02 04:04:34.551296386 +0100 +@@ -21,9 +21,11 @@ include $(KBUILD_PATH)/subheader.kmk # # Target lists. # -+ifneq ($(KBUILD_HOST_ARCH),amd64) - PROGRAMS += tstVMStructSize tstAsmStructs -+endif - ifdef VBOX_WITH_RAW_MODE -+ifneq ($(KBUILD_HOST_ARCH),amd64) - PROGRAMS += tstVMStructRC tstAsmStructsRC +-PROGRAMS += tstVMStructSize tstAsmStructs +-ifdef VBOX_WITH_RAW_MODE +- PROGRAMS += tstVMStructRC tstAsmStructsRC ++ifneq ($(KBUILD_HOST_ARCH),amd64) ++ PROGRAMS += tstVMStructSize tstAsmStructs ++ ifdef VBOX_WITH_RAW_MODE ++ PROGRAMS += tstVMStructRC tstAsmStructsRC ++ endif endif -+endif - ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS - PROGRAMS += tstGlobalConfig tstInstrEmul - ifdef VBOX_WITH_RAW_MODE -@@ -67,16 +71,21 @@ BLDDIRS += $(VBOX_VMM_TESTCASE_OUT_DIR) + if !defined(VBOX_ONLY_EXTPACKS) \ + && ( defined(VBOX_WITH_DTRACE_R3) \ +@@ -77,16 +79,21 @@ BLDDIRS += $(VBOX_VMM_TESTCASE_OUT_DIR) # ifeq ($(KBUILD_TARGET),$(KBUILD_HOST)) ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),) @@ -108,6 +106,3 @@ ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS TESTING += \ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run --- -1.7.3.4 - VirtualBox-OSE-4.0.0-makeself.patch: configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Index: VirtualBox-OSE-4.0.0-makeself.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox-OSE-4.0.0-makeself.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- VirtualBox-OSE-4.0.0-makeself.patch 3 Feb 2011 23:25:21 -0000 1.1 +++ VirtualBox-OSE-4.0.0-makeself.patch 8 Sep 2012 02:08:19 -0000 1.2 @@ -14,7 +14,7 @@ +++ b/configure @@ -2527,7 +2527,7 @@ if [ "$OS" = "linux" ]; then check_compiler_h - #[ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit + [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit # tools/common/makeself* - [ $OSE -ge 1 ] && check_makeself + #[ $OSE -ge 1 ] && check_makeself Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- VirtualBox.spec 1 Sep 2012 20:47:44 -0000 1.15 +++ VirtualBox.spec 8 Sep 2012 02:08:19 -0000 1.16 @@ -1,7 +1,7 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} # Standard compiler flags, without: -# -Wall -- VirtualBox takes care of reasonable warnings very well +# -Wall -- VirtualBox takes care of reasonable warnings very well # -m32, -m64 -- 32bit code is built besides 64bit on x86_64 # -fexceptions -- R0 code doesn't link against C++ library, no __gxx_personality_v0 %global optflags %(rpm --eval %%optflags |sed 's/-Wall//;s/-m[0-9][0-9]//;s/-fexceptions//') @@ -10,73 +10,76 @@ # major version number, while the kernel module abi is not guarranteed # to be stable. This is so that we force the module update in sync with # userspace. -#global prerel beta3 +%global prerel RC3 %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} -Name: VirtualBox -Version: 4.1.20 -Release: 1%{?prerel:.%{prerel}}%{?dist} -Summary: A general-purpose full virtualizer for PC hardware - -Group: Development/Tools -License: GPLv2 or (GPLv2 and CDDL) -URL: http://www.virtualbox.org/wiki/VirtualBox -Source0: http://dlc.sun.com.edgesuite.net/virtualbox/%{version}%{?prereltag}/Virtu... -Source3: VirtualBox-90-vboxdrv.rules -Source5: VirtualBox-60-vboxguest.rules -Source6: VirtualBox.modules -Source7: VirtualBox-guest.modules -Source8: VirtualBox-vboxresize.desktop -Source9: VirtualBox-00-vboxvideo.conf -Source10: vboxweb.service -Source11: vboxservice.service -Patch1: VirtualBox-OSE-4.1.4-noupdate.patch -Patch2: VirtualBox-4.1.18-strings.patch -Patch3: VirtualBox-4.1.20-libcxx.patch -Patch5: VirtualBox-OSE-4.1.4-xorg17.patch +Name: VirtualBox +Version: 4.2.0 +Release: 0.5%{?prerel:.%{prerel}}%{?dist} +Summary: A general-purpose full virtualizer for PC hardware + +Group: Development/Tools +License: GPLv2 or (GPLv2 and CDDL) +URL: http://www.virtualbox.org/wiki/VirtualBox +Source0: http://dlc.sun.com.edgesuite.net/virtualbox/%{version}%{?prereltag}/Virtu... +Source3: VirtualBox-90-vboxdrv.rules +Source5: VirtualBox-60-vboxguest.rules +Source6: VirtualBox.modules +Source7: VirtualBox-guest.modules +Source8: VirtualBox-vboxresize.desktop +Source9: VirtualBox-00-vboxvideo.conf +Source10: vboxweb.service +Source11: vboxservice.service +Patch1: VirtualBox-OSE-4.1.4-noupdate.patch +Patch2: VirtualBox-4.1.18-strings.patch +Patch3: VirtualBox-4.2.0-libcxx.patch +Patch5: VirtualBox-4.2.0-xorg17.patch +%ifarch x86_64 Patch10: VirtualBox-OSE-4.0.0-32bit.patch -#Patch11: VirtualBox-OSE-3.2.0-visibility.patch -Patch15: VirtualBox-OSE-4.0.0-makeself.patch -Patch16: VirtualBox-OSE-4.1.2-usblib.patch -Patch17: VirtualBox-OSE-4.0.0-beramono.patch -Patch18: VirtualBox-OSE-4.0.2-aiobug.patch -Patch20: VirtualBox-OSE-4.1.2-testmangle.patch -Patch22: VirtualBox-OSE-4.1.12-gsoap.patch -Patch23: VirtualBox-OSE-4.1.10-mesa.patch +%endif +Patch15: VirtualBox-OSE-4.0.0-makeself.patch +Patch17: VirtualBox-OSE-4.0.0-beramono.patch +Patch18: VirtualBox-OSE-4.0.2-aiobug.patch +Patch22: VirtualBox-OSE-4.1.12-gsoap.patch +Patch23: VirtualBox-OSE-4.1.10-mesa.patch +Patch24: VirtualBox-4.1.20-x113.patch -%if 0%{?fedora} < 17 -BuildRequires: kBuild >= 0.1.98 +%if 0%{?fedora} < 16 +BuildRequires: kBuild >= 0.1.98 %endif -BuildRequires: SDL-devel xalan-c-devel -BuildRequires: openssl-devel -BuildRequires: libcurl-devel -BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libIDL-devel -BuildRequires: yasm -BuildRequires: pulseaudio-libs-devel -BuildRequires: python-devel -BuildRequires: desktop-file-utils -BuildRequires: libcap-devel -BuildRequires: qt4-devel -BuildRequires: gsoap-devel -BuildRequires: xz -BuildRequires: pam-devel -BuildRequires: mkisofs -BuildRequires: java-devel >= 1.6 -BuildRequires: /usr/bin/pdflatex -BuildRequires: libpng-devel +BuildRequires: SDL-devel xalan-c-devel +BuildRequires: openssl-devel +BuildRequires: libcurl-devel +BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libIDL-devel +BuildRequires: yasm +BuildRequires: pulseaudio-libs-devel +BuildRequires: python-devel +BuildRequires: desktop-file-utils +BuildRequires: libcap-devel +BuildRequires: qt4-devel +BuildRequires: gsoap-devel +BuildRequires: xz +BuildRequires: pam-devel +BuildRequires: mkisofs +BuildRequires: java-devel >= 1.6 +BuildRequires: /usr/bin/pdflatex +BuildRequires: libpng-devel +#BuildRequires: glibc.i686 glibc-devel.i686 libstdc++.i686 +#BuildRequires: /usr/lib/libc.so +#BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6 # For the X11 module -BuildRequires: libdrm-devel -BuildRequires: libpciaccess-devel -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libOSMesa-devel -BuildRequires: pixman-devel -BuildRequires: xorg-x11-proto-devel -BuildRequires: xorg-x11-server-source -BuildRequires: xorg-x11-server-devel -BuildRequires: libXcursor-devel -BuildRequires: libXcomposite-devel -BuildRequires: libXmu-devel +BuildRequires: libdrm-devel +BuildRequires: libpciaccess-devel +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libOSMesa-devel +BuildRequires: pixman-devel +BuildRequires: xorg-x11-proto-devel +BuildRequires: xorg-x11-server-source +BuildRequires: xorg-x11-server-devel +BuildRequires: libXcursor-devel +BuildRequires: libXcomposite-devel +BuildRequires: libXmu-devel BuildRequires: systemd-units Requires(post): systemd-units @@ -85,20 +88,20 @@ # Plague-specific weirdness %if 0%{?fedora} > 11 || 0%{?rhel} > 5 -ExclusiveArch: i686 x86_64 +ExclusiveArch: i686 x86_64 %else %if 0%{?fedora} > 10 -ExclusiveArch: i586 x86_64 +ExclusiveArch: i586 x86_64 %else -ExclusiveArch: i386 x86_64 +ExclusiveArch: i386 x86_64 %endif -Provides: %{name}-OSE = %{version}-%{release} -Obsoletes: %{name}-OSE < %{version}-%{release} -Requires: %{name}-kmod = %{version}%{?prereltag} -Provides: %{name}-kmod-common = %{version}%{?prereltag} -Provides: %{name}-OSE-kmod-common = %{version}%{?prereltag} -Obsoletes: %{name}-OSE-kmod-common < %{version}%{?prereltag} -Conflicts: %{name}-guest <= %{version}-%{release} +Provides: %{name}-OSE = %{version}-%{release} +Obsoletes: %{name}-OSE < %{version}-%{release} +Requires: %{name}-kmod = %{version} +Provides: %{name}-kmod-common = %{version}-%{release} +Provides: %{name}-OSE-kmod-common = %{version}-%{release} +Obsoletes: %{name}-OSE-kmod-common < %{version}-%{release} +Conflicts: %{name}-guest <= %{version}-%{release} %description A general-purpose full virtualizer and emulator for 32-bit and @@ -106,49 +109,49 @@ %package devel -Summary: %{name} SDK -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: python-%{name} = %{version}-%{release} -Provides: %{name}-OSE-devel = %{version}-%{release} -Obsoletes: %{name}-OSE-devel < %{version}-%{release} +Summary: %{name} SDK +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: python-%{name} = %{version}-%{release} +Provides: %{name}-OSE-devel = %{version}-%{release} +Obsoletes: %{name}-OSE-devel < %{version}-%{release} %description devel %{name} Software Development Kit. %package -n python-%{name} -Summary: Python bindings for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Provides: python-%{name}-OSE = %{version}-%{release} -Obsoletes: python-%{name}-OSE < %{version}-%{release} +Summary: Python bindings for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Provides: python-%{name}-OSE = %{version}-%{release} +Obsoletes: python-%{name}-OSE < %{version}-%{release} %description -n python-%{name} Python XPCOM bindings to %{name}. %package guest -Summary: %{name} Guest Additions -Group: System Environment/Base -Provides: %{name}-OSE-guest = %{version}-%{release} -Obsoletes: %{name}-OSE-guest < %{version}-%{release} -Requires: %{name}-kmod = %{version} -Provides: %{name}-kmod-common = %{version} -Provides: %{name}-OSE-kmod-common = %{version}%{?prereltag} -Obsoletes: %{name}-OSE-kmod-common < %{version}%{?prereltag} -Requires: xorg-x11-server-Xorg -Requires: xorg-x11-xinit -Provides: xorg-x11-drv-VirtualBox = %{version}-%{release} -Obsoletes: xorg-x11-drv-VirtualBox < %{version}-%{release} -Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release} -Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release} +Summary: %{name} Guest Additions +Group: System Environment/Base +Provides: %{name}-OSE-guest = %{version}-%{release} +Obsoletes: %{name}-OSE-guest < %{version}-%{release} +Requires: %{name}-kmod = %{version} +Provides: %{name}-kmod-common = %{version}-%{release} +Provides: %{name}-OSE-kmod-common = %{version}-%{release} +Obsoletes: %{name}-OSE-kmod-common < %{version}-%{release} +Requires: xorg-x11-server-Xorg +Requires: xorg-x11-xinit +Provides: xorg-x11-drv-VirtualBox = %{version}-%{release} +Obsoletes: xorg-x11-drv-VirtualBox < %{version}-%{release} +Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release} +Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release} %if "%(xserver-sdk-abi-requires 2>/dev/null)" -Requires: %(xserver-sdk-abi-requires ansic) -Requires: %(xserver-sdk-abi-requires videodrv) -Requires: %(xserver-sdk-abi-requires xinput) +Requires: %(xserver-sdk-abi-requires ansic) +Requires: %(xserver-sdk-abi-requires videodrv) +Requires: %(xserver-sdk-abi-requires xinput) %endif -Conflicts: %{name} <= %{version}-%{release} +Conflicts: %{name} <= %{version}-%{release} %description guest @@ -159,8 +162,8 @@ %package kmodsrc -Summary: %{name} kernel module source code -Group: System Environment/Kernel +Summary: %{name} kernel module source code +Group: System Environment/Kernel Provides: %{name}-OSE-kmodsrc = %{version}-%{release} Obsoletes: %{name}-OSE-kmodsrc < %{version}-%{release} @@ -170,39 +173,43 @@ %prep -%setup -q +%setup -qn %{name}-%{version}%{prereltag} find -name '*.py[co]' -delete %patch1 -p1 -b .noupdates %patch2 -p1 -b .strings %patch3 -p1 -b .libcxx %patch5 -p1 -b .xorg17 -%patch10 -p1 -b .32bit -#%patch11 -p1 -b .visibility %patch15 -p1 -b .makeself -%patch16 -p1 -b .usblib +%ifarch x86_64 +%patch10 -p1 -b .32bit +%endif %patch17 -p1 -b .beramono %patch18 -p1 -b .aiobug -%patch20 -p1 -b .testmangle %if 0%{?fedora} < 16 %patch22 -p1 -b .gsoap %endif %if 0%{?fedora} > 16 %patch23 -p1 -b .mesa %endif +%if 0%{?fedora} > 17 +%patch24 -p1 -b .x113 +%endif # Remove prebuilt binary tools -%if 0%{?fedora} < 17 +%if 0%{?fedora} < 16 rm -rf kBuild %endif rm -rf tools +#rm -rf src/VBox/Additions/x11/x11include # CRLF->LF sed -i 's/\r//' COPYING %build -./configure --disable-kmods --enable-webservice +./configure --disable-kmods --enable-webservice +#--disable-java . ./env.sh # VirtualBox build system installs and builds in the same step, @@ -211,13 +218,13 @@ # the installation paths, but install the tree with the default # layout under 'obj' and shuffle files around in %%install. kmk %{_smp_mflags} \ - KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_OUT="$PWD/obj" \ - VBOX_PATH_APP_PRIVATE=%{_libdir}/virtualbox \ - VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \ - VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}" \ - VBOX_GCC_R0_OPT="%{optflags}" VBOX_GCC_WERR="" \ - VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \ - VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \ + KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_OUT="$PWD/obj" \ + VBOX_PATH_APP_PRIVATE=%{_libdir}/virtualbox \ + VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \ + VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}" \ + VBOX_GCC_R0_OPT="%{optflags}" VBOX_GCC_WERR="" \ + VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \ + VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \ VBOX_BUILD_PUBLISHER=_%{?vendor:%(echo %{vendor} \ | sed -e 's/ //g' | cut -c 1-9)}%{?!vendor:custom} @@ -261,68 +268,68 @@ ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxbfe install -p -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \ - obj/bin/VBoxTunctl \ + obj/bin/VBoxTunctl \ # Components install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/components \ - obj/bin/components/* + obj/bin/components/* # Lib install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \ - obj/bin/*.so + obj/bin/*.so install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \ - obj/bin/V*.gc \ - obj/bin/V*.r0 \ - obj/bin/VBoxEFI*.fd + obj/bin/V*.gc \ + obj/bin/V*.r0 \ + obj/bin/VBoxEFI*.fd # Documentation install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \ - obj/bin/UserManual.pdf + obj/bin/UserManual.pdf # Executables install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \ - obj/bin/VBoxHeadless \ - obj/bin/VBoxSDL \ - obj/bin/VBoxNetDHCP \ - obj/bin/VBoxNetAdpCtl \ - obj/bin/VirtualBox \ - obj/bin/VBoxManage \ - obj/bin/VBoxSVC \ - obj/bin/VBoxXPCOMIPCD \ - obj/bin/VBoxSysInfo.sh \ - obj/bin/vboxshell.py \ - obj/bin/VBoxTestOGL \ - obj/bin/VBoxExtPackHelperApp \ - obj/bin/vboxwebsrv \ - obj/bin/VBoxBalloonCtrl \ - obj/bin/webtest \ - obj/bin/VBoxBFE + obj/bin/VBoxHeadless \ + obj/bin/VBoxSDL \ + obj/bin/VBoxNetDHCP \ + obj/bin/VBoxNetAdpCtl \ + obj/bin/VirtualBox \ + obj/bin/VBoxManage \ + obj/bin/VBoxSVC \ + obj/bin/VBoxXPCOMIPCD \ + obj/bin/VBoxSysInfo.sh \ + obj/bin/vboxshell.py \ + obj/bin/VBoxTestOGL \ + obj/bin/VBoxExtPackHelperApp \ + obj/bin/vboxwebsrv \ + obj/bin/VBoxBalloonCtrl \ + obj/bin/webtest \ + obj/bin/VBoxBFE # Language files install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \ - obj/bin/nls/* + obj/bin/nls/* # SDK pushd obj/bin/sdk/installer VBOX_INSTALL_PATH=%{_libdir}/virtualbox \ - python vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT + python vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT popd cp -rp obj/bin/sdk/. $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk rm -rf $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk/installer # Icons install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \ - obj/bin/VBox.png + obj/bin/VBox.png #ln -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/{VBox,virtualbox}.png for S in obj/bin/icons/* do - SIZE=$(basename $S) - install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/{mimetypes,apps} - install -p -m 0644 $S/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes - [ -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png ] && mv \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/apps/virtualbox.png + SIZE=$(basename $S) + install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/{mimetypes,apps} + install -p -m 0644 $S/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes + [ -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png ] && mv \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/apps/virtualbox.png done install -p -m 0644 obj/bin/virtualbox.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages @@ -333,51 +340,51 @@ %global x11_api 17 install -m 0755 -D obj/bin/additions/vboxmouse_drv_%{x11_api}.so \ - $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxmouse_drv.so + $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxmouse_drv.so install -m 0755 -D obj/bin/additions/vboxvideo_drv_%{x11_api}.so \ - $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so + $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so # Guest tools -install -m 0755 -t $RPM_BUILD_ROOT%{_sbindir} \ - obj/bin/additions/mount.vboxsf +install -m 0755 -t $RPM_BUILD_ROOT%{_sbindir} \ + obj/bin/additions/mount.vboxsf -install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \ - obj/bin/additions/VBoxService \ - obj/bin/additions/VBoxClient \ - obj/bin/additions/VBoxControl +install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \ + obj/bin/additions/VBoxService \ + obj/bin/additions/VBoxClient \ + obj/bin/additions/VBoxControl # Ideally, Xorg should autodetect this, but for some reason it no longer does install -m 0644 -D %{SOURCE9} \ - $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf + $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf install -m 0644 -D %{SOURCE10} \ - $RPM_BUILD_ROOT%{_unitdir}/vboxweb.service + $RPM_BUILD_ROOT%{_unitdir}/vboxweb.service install -m 0644 -D %{SOURCE11} \ - $RPM_BUILD_ROOT%{_unitdir}/vboxservice.service + $RPM_BUILD_ROOT%{_unitdir}/vboxservice.service install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh \ - $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh + $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \ - $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh + $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh install -m 0644 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \ - $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop + $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop install -m 0644 -D %{SOURCE8} \ - $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop + $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop # Guest libraries -install -m 0755 -t $RPM_BUILD_ROOT%{_libdir} \ - obj/bin/additions/VBoxOGL*.so +install -m 0755 -t $RPM_BUILD_ROOT%{_libdir} \ + obj/bin/additions/VBoxOGL*.so ln -sf ../VBoxOGL.so $RPM_BUILD_ROOT%{_libdir}/dri/vboxvideo_dri.so install -m 0755 -t $RPM_BUILD_ROOT/%{_lib}/security \ - obj/bin/additions/pam_vbox.so + obj/bin/additions/pam_vbox.so # Installation root configuration install -d $RPM_BUILD_ROOT/%{_sysconfdir}/vbox @@ -396,12 +403,12 @@ cp -al obj/bin/src/vbox* obj/bin/additions/src/vbox* %{name}-kmod-%{version} install -d $RPM_BUILD_ROOT%{_datadir}/%{name}-kmod-%{version} tar --use-compress-program xz -cf $RPM_BUILD_ROOT%{_datadir}/%{name}-kmod-%{version}/%{name}-kmod-%{version}.tar.xz \ - %{name}-kmod-%{version} + %{name}-kmod-%{version} # Menu entry desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - --remove-key=DocPath --remove-category=X-MandrivaLinux-System \ - --vendor='' obj/bin/virtualbox.desktop + --remove-key=DocPath --remove-category=X-MandrivaLinux-System \ + --vendor='' obj/bin/virtualbox.desktop %post # Group for USB devices @@ -420,8 +427,8 @@ # Assign USB devices if /sbin/udevadm control --reload-rules >/dev/null 2>&1 then -# /sbin/udevadm trigger --subsystem-match=usb >/dev/null 2>&1 || : -# /sbin/udevadm settle >/dev/null 2>&1 || : +# /sbin/udevadm trigger --subsystem-match=usb >/dev/null 2>&1 || : +# /sbin/udevadm settle >/dev/null 2>&1 || : systemctl restart udev-trigger.service systemctl restart udev-settle.service fi @@ -550,6 +557,38 @@ %changelog +* Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.5.RC3 +- not drop 32-bit patch, on x86_64 as quick resolution of not have glic-devel.i686 on x86_64. + +* Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.4.RC3 +- Also Compile guest drives vboxvideo_drv and vboxmouse_drv with X11 sources from system. +- Fix ABI/API breakages in X11 1.13. + +* Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.3.RC3 +- fix requires kmod, with version with prerealeses. + +* Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.2.RC3 +- vim :retab, reformat all tabs. +- add BR # libstdc++.i686 and libc-devel.i686 for 32-bits +BuildRequires: /usr/lib/libc.so +BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6 +- drop 32-bit patch and testmangle patch, no fails. +- rename and remove some patches +cvs diff: VirtualBox-4.1.20-libcxx.patch was removed, no comparison available +cvs diff: VirtualBox-4.1.20-x113.patch is a new entry, no comparison available +cvs diff: VirtualBox-4.2.0-libcxx.patch is a new entry, no comparison available +cvs diff: VirtualBox-4.2.0-xorg17.patch is a new entry, no comparison available +cvs diff: VirtualBox-OSE-3.2.0-visibility.patch was removed, no comparison available +cvs diff: VirtualBox-OSE-4.0.0-32bit.patch was removed, no comparison available +cvs diff: VirtualBox-OSE-4.1.2-testmangle.patch was removed, no comparison available +cvs diff: VirtualBox-OSE-4.1.2-usblib.patch was removed, no comparison available +cvs diff: VirtualBox-OSE-4.1.4-xorg17.patch was removed, no comparison available + +* Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.1.RC3 +- New major release, devel release of rpms . +- rebase patches VirtualBox-4.1.20-libcxx.patch, VirtualBox-OSE-4.1.4-xorg17.patch + and VirtualBox-OSE-4.0.0-32bit.patch + * Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.20-1 - New upstream release. - Redo VirtualBox-4.1.20-libcxx.patch Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-18/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 1 Sep 2012 20:47:44 -0000 1.37 +++ sources 8 Sep 2012 02:08:19 -0000 1.38 @@ -1 +1 @@ -5784c6dda8a9d53f8f21b2d41eba903c VirtualBox-4.1.20.tar.bz2 +cc019414a29aa021d82952d763541a2c VirtualBox-4.2.0_RC3.tar.bz2 --- VirtualBox-4.1.20-libcxx.patch DELETED --- --- VirtualBox-OSE-3.2.0-visibility.patch DELETED --- --- VirtualBox-OSE-4.1.2-testmangle.patch DELETED --- --- VirtualBox-OSE-4.1.2-usblib.patch DELETED --- --- VirtualBox-OSE-4.1.4-xorg17.patch DELETED ---