Author: sergiomb Update of /cvs/free/rpms/VirtualBox/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5729 Modified Files: VirtualBox-OSE-4.0.0-makeself.patch VirtualBox.spec 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.0.0-32bit.patch VirtualBox-OSE-4.1.2-testmangle.patch VirtualBox-OSE-4.1.2-usblib.patch VirtualBox-OSE-4.1.4-xorg17.patch Log Message: * 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 VirtualBox-4.1.20-x113.patch: VirtualBox-4.2.0_RC3/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk | 6 + b/Config.kmk | 32 +++++----- b/src/VBox/Additions/x11/vboxvideo/vboxvideo.c | 8 +- b/src/VBox/Runtime/Makefile.kmk | 2 src/VBox/Main/Makefile.kmk | 2 5 files changed, 28 insertions(+), 22 deletions(-) --- NEW FILE VirtualBox-4.1.20-x113.patch --- X.org 1.13 patch --- a/src/VBox/Additions/x11/vboxvideo/vboxvideo.c.orig 2012-09-02 05:45:06.134994216 +0100 +++ b/src/VBox/Additions/x11/vboxvideo/vboxvideo.c 2012-09-02 05:45:20.136137244 +0100 @@ -709,7 +709,7 @@ vboxEnableDisableFBAccess(int scrnIndex, TRACE_LOG("enable=%s\n", enable ? "TRUE" : "FALSE"); VBOXSetRec(pScrn); pVBox->accessEnabled = enable; - pVBox->EnableDisableFBAccess(scrnIndex, enable); + pVBox->EnableDisableFBAccess(pScrn, enable); TRACE_EXIT(); } @@ -1198,7 +1198,7 @@ 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 @@ -1214,7 +1214,7 @@ VBOXSwitchMode(int scrnIndex, DisplayMod /* 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,7 +1231,7 @@ 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; } --- a/Config.kmk.x113 2012-09-02 17:55:59.642186269 +0100 +++ b/Config.kmk 2012-09-02 18:30:18.743236550 +0100 @@ -546,9 +546,9 @@ VBOX_WITH_MULTIVERSION_PYTHON ?= 1 # Enable the kchmviewer. VBOX_WITH_KCHMVIEWER = 1 # Build the testsuite. -VBOX_WITH_TESTSUITE = 1 +VBOX_WITH_TESTSUITE = 0 # Build the testcases. -VBOX_WITH_TESTCASES = 1 +VBOX_WITH_TESTCASES = 0 # Enables the ffmpeg module for recording test runs. # TODO: Enable this for normal build server builds? #if1of ($(KBUILD_TARGET), linux) @@ -4977,30 +4977,30 @@ endif # Guest additions libraries (all static). # The _MINI and _SHARED are both compiled as PIC and intended for linking into a .so/.dll/.dylib. # -VBOX_LIB_IPRT_GUEST_R3 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3$(VBOX_SUFF_LIB) -VBOX_LIB_IPRT_GUEST_R3_MINI = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Mini$(VBOX_SUFF_LIB) -VBOX_LIB_IPRT_GUEST_R3_SHARED = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Shared$(VBOX_SUFF_LIB) -VBOX_LIB_IPRT_GUEST_R0 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0$(VBOX_SUFF_LIB) +VBOX_LIB_IPRT_GUEST_R3 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3$(VBOX_SUFF_LIB) +VBOX_LIB_IPRT_GUEST_R3_MINI = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Mini$(VBOX_SUFF_LIB) +VBOX_LIB_IPRT_GUEST_R3_SHARED = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Shared$(VBOX_SUFF_LIB) +VBOX_LIB_IPRT_GUEST_R0 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0$(VBOX_SUFF_DLL) ifeq ($(KBUILD_TARGET_ARCH),x86) - VBOX_LIB_IPRT_GUEST_R0_NT4 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0NT4$(VBOX_SUFF_LIB) + VBOX_LIB_IPRT_GUEST_R0_NT4 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0NT4$(VBOX_SUFF_DLL) else VBOX_LIB_IPRT_GUEST_R0_NT4 = $(VBOX_LIB_IPRT_GUEST_R0) endif -VBOX_LIB_VBGL_R3 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3Lib$(VBOX_SUFF_LIB) -VBOX_LIB_VBGL_R3_XFREE86 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibXFree86$(VBOX_SUFF_LIB) -VBOX_LIB_VBGL_R3_SHARED = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibShared$(VBOX_SUFF_LIB) -VBOX_LIB_VBGL_R0BASE = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR0LibBase$(VBOX_SUFF_LIB) -VBOX_LIB_VBGL_R0 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR0Lib$(VBOX_SUFF_LIB) +VBOX_LIB_VBGL_R3 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3Lib$(VBOX_SUFF_LIB) +VBOX_LIB_VBGL_R3_XFREE86 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibXFree86$(VBOX_SUFF_DLL) +VBOX_LIB_VBGL_R3_SHARED = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibShared$(VBOX_SUFF_LIB) +VBOX_LIB_VBGL_R0BASE = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR0LibBase$(VBOX_SUFF_DLL) +VBOX_LIB_VBGL_R0 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR0Lib$(VBOX_SUFF_DLL) ifeq ($(KBUILD_TARGET),x86) VBOX_LIB_IPRT_GUEST_R3_X86 = $(VBOX_LIB_IPRT_GUEST_R3) VBOX_LIB_IPRT_GUEST_R3_SHARED_X86 = $(VBOX_LIB_IPRT_GUEST_R3_SHARED) VBOX_LIB_VBGL_R3_X86 = $(VBOX_LIB_VBGL_R3) VBOX_LIB_VBGL_R3_SHARED_X86 = $(VBOX_LIB_VBGL_R3_SHARED) else - VBOX_LIB_IPRT_GUEST_R3_X86 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3-x86$(VBOX_SUFF_LIB) - VBOX_LIB_IPRT_GUEST_R3_SHARED_X86 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Shared-x86$(VBOX_SUFF_LIB) - VBOX_LIB_VBGL_R3_X86 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3Lib-x86$(VBOX_SUFF_LIB) - VBOX_LIB_VBGL_R3_SHARED_X86 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibShared-x86$(VBOX_SUFF_LIB) + VBOX_LIB_IPRT_GUEST_R3_X86 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3-x86$(VBOX_SUFF_DLL) + VBOX_LIB_IPRT_GUEST_R3_SHARED_X86 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Shared-x86$(VBOX_SUFF_DLL) + VBOX_LIB_VBGL_R3_X86 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3Lib-x86$(VBOX_SUFF_DLL) + VBOX_LIB_VBGL_R3_SHARED_X86 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibShared-x86$(VBOX_SUFF_DLL) endif --- VirtualBox-4.2.0_RC3/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk.orig 2012-09-02 18:32:05.119324113 +0100 +++ VirtualBox-4.2.0_RC3/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk 2012-05-30 11:38:10.000000000 +0100 @@ -21,7 +21,9 @@ include $(KBUILD_PATH)/subheader.kmk # # Structure size testcase. # +ifneq ($(KBUILD_HOST_ARCH),amd64) PROGRAMS += tstShflSizes +endif TESTING += $(tstShflSizes_0_OUTDIR)/tstShflSizes.run ifndef VBOX_ONLY_SDK ifeq ($(KBUILD_TARGET),$(KBUILD_HOST)) @@ -44,7 +46,9 @@ ifdef VBOX_WITH_TESTCASES # # Case conversion testcase. # +ifneq ($(KBUILD_HOST_ARCH),amd64) PROGRAMS += tstShflCase +endif tstShflCase_TEMPLATE = VBOXR3TSTEXE tstShflCase_DEFS = VBOX_WITH_HGCM tstShflCase_SOURCES = tstShflCase.cpp @@ -56,9 +60,11 @@ tstShflCase_LIBS = $(LIB_RUNTIME) # As there are differences between the Windows build of the service and others, # we do an additional build with RT_OS_WINDOWS defined on non-Windows targets. +ifneq ($(KBUILD_HOST_ARCH),amd64) PROGRAMS += \ tstSharedFolderService \ $(if $(eq $(KBUILD_TARGET),win),,tstSharedFolderService-win) +endif tstSharedFolderService_TEMPLATE = VBOXR3TSTEXE tstSharedFolderService_DEFS = VBOX_WITH_HGCM UNITTEST --- a/src/VBox/Main/Makefile.kmk 2012-08-29 15:13:36.000000000 +0100 +++ b/src/VBox/Main/Makefile.kmk 2012-09-02 19:09:49.250454117 +0100 @@ -705,7 +705,7 @@ $$(VBoxC_0_OUTDIR)/VBoxC.rgs: $(VBOX_PAT # VBoxCOM - COM Abstraction Layer library # LIBRARIES += VBoxCOM -VBoxCOM_TEMPLATE = VBOXMAINLIB +VBoxCOM_TEMPLATE = VBOXMAINDLL VBoxCOM_INTERMEDIATES = $(VBOX_MAIN_PREREQS) VBoxCOM_SOURCES = \ glue/com.cpp \ --- a/src/VBox/Runtime/Makefile.kmk.testmangle 2012-08-29 15:13:34.000000000 +0100 +++ b/src/VBox/Runtime/Makefile.kmk 2012-09-02 19:30:41.688859884 +0100 @@ -211,7 +211,7 @@ endif # # RuntimeR3 - Static Runtime for Ring-3 executables. # -RuntimeR3_TEMPLATE = VBoxR3Static +RuntimeR3_TEMPLATE = VBOXR3DLLNOXCPT RuntimeR3_SDKS = VBOX_LIBXML2 VBOX_OPENSSL VBOX_BOOST ## @todo why is BOOST and XML2 here? r3/xml.cpp is not in this lib... RuntimeR3_SDKS.win = $(VBOX_WINPSDK) $(VBOX_WINDDK) RuntimeR3_DEFS = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX RT_NO_GIP 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: b/src/VBox/Additions/common/crOpenGL/Makefile.kmk | 14 ++--- b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 15 +++++- b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 40 +++++++++++++++++ src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk | 4 - 4 files changed, 60 insertions(+), 13 deletions(-) --- NEW FILE VirtualBox-4.2.0-xorg17.patch --- Based: Description: Build the X.Org driver only for the selected system X Server version. Author: 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/vboxmouse/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100 +++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2012-09-02 23:44:33.878251237 +0100 @@ -57,9 +57,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 +398,7 @@ endif # neq ($(KBUILD_TARGET),linux) # endif # ! VBOX_ONLY_ADDITIONS endif # VBOX_WITH_TESTCASES +endif # neq ($(KBUILD_TARGET),linux) + include $(FILE_KBUILD_SUB_FOOTER) --- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk.xorg17 2012-05-30 11:39:29.000000000 +0100 +++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2012-09-03 00:00:13.988618277 +0100 @@ -94,6 +94,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) edid.c vboxvideo_dri.c + +ifdef NOT_FEDORA + + # # vboxvideo_drv_70 # @@ -505,4 +543,6 @@ $$(vboxvideo_drv_112_0_OUTDIR)/tstvboxvi # endif # ! VBOX_ONLY_ADDITIONS endif # VBOX_WITH_TESTCASES +endif # NOT_FEDORA + include $(FILE_KBUILD_SUB_FOOTER) --- 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-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/devel/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 3 Sep 2012 03:30:25 -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/devel/VirtualBox.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- VirtualBox.spec 3 Sep 2012 01:28:08 -0000 1.16 +++ VirtualBox.spec 3 Sep 2012 03:30:26 -0000 1.17 @@ -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//') @@ -13,71 +13,70 @@ %global prerel RC3 %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} -Name: VirtualBox -Version: 4.2.0 -Release: 0.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 -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 +Name: VirtualBox +Version: 4.2.0 +Release: 0.2%{?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 +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 +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 +# libstdc++.i686 and libc-devel.i686 for 32-bits +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 @@ -86,20 +85,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}%{?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} %description A general-purpose full virtualizer and emulator for 32-bit and @@ -107,49 +106,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} +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} %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 @@ -160,8 +159,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} @@ -178,13 +177,9 @@ %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 %patch17 -p1 -b .beramono %patch18 -p1 -b .aiobug -%patch20 -p1 -b .testmangle %if 0%{?fedora} < 16 %patch22 -p1 -b .gsoap %endif @@ -216,13 +211,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} @@ -266,68 +261,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 @@ -338,51 +333,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 @@ -401,12 +396,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 @@ -425,8 +420,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 @@ -555,6 +550,23 @@ %changelog +* 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 --- VirtualBox-4.1.20-libcxx.patch DELETED --- --- VirtualBox-OSE-3.2.0-visibility.patch DELETED --- --- VirtualBox-OSE-4.0.0-32bit.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 ---