Author: sergiomb Update of /cvs/free/rpms/VirtualBox/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13226 Modified Files: VirtualBox.spec Added Files: VirtualBox-4.3.0-32bit.patch VirtualBox-4.3.0-VBoxGuestLib.patch VirtualBox-4.3.0-libcxx.patch VirtualBox-4.3.0-mesa.patch VirtualBox-4.3.0-no-bundles.patch VirtualBox-4.3.0-testmangle.patch Removed Files: VirtualBox-4.1.20-x113.patch VirtualBox-4.2.0-32bit.patch VirtualBox-4.2.0-VBoxGuestLib.patch VirtualBox-4.2.0-libcxx.patch VirtualBox-4.2.0-mesa.patch VirtualBox-4.2.4-no-bundles.patch VirtualBox-4.2.6-gcc48.patch VirtualBox-OSE-4.0.0-makeself.patch changeset_trunk_48529.diff Log Message: * Mon Oct 28 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.0-1 - New upstream release. - Refactor patches VirtualBox-4.3.0-32bit.patch, VirtualBox-4.3.0-libcxx.patch, VirtualBox-4.3.0-mesa.patch, VirtualBox-4.3.0-no-bundles.patch, VirtualBox-4.3.0-testmangle.patch and VirtualBox-4.3.0-VBoxGuestLib.patch - Took the opportunity to do a review: add some new binaries, need to review it again . VirtualBox-4.3.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(-) --- NEW FILE VirtualBox-4.3.0-32bit.patch --- From: Lubomir Rintel <lkundrak(a)v3.sk&gt; Date: Fri, 26 Mar 2010 04:44:55 +0100 Subject: [PATCH] Build on x86_64 without 32bit toolchain. This disables the check for 32bit toolchain and tests that need it (boo). --- configure | 2 +- src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++ src/VBox/VMM/testcase/Makefile.kmk | 9 +++++++++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 42ce775..0932637 100755 --- a/configure +++ b/configure @@ -2525,7 +2525,7 @@ if [ "$OS" = "linux" ]; then fi check_libcap 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 fi diff --git a/src/VBox/Devices/testcase/Makefile.kmk b/src/VBox/Devices/testcase/Makefile.kmk index 4debf81..59dae0d 100644 --- a/src/VBox/Devices/testcase/Makefile.kmk +++ b/src/VBox/Devices/testcase/Makefile.kmk @@ -45,22 +45,28 @@ VBOX_DEVICES_TESTS_FEATURES = \ # We setup one 'other' target for executing the structure & alignment # validation testcases. Perhaps a bit hackish, but extremely useful. # +ifneq ($(KBUILD_HOST_ARCH),amd64) ifeq ($(KBUILD_TARGET),$(KBUILD_HOST)) ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),) OTHERS += \ $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run endif endif +endif # The normal testing pass. +ifneq ($(KBUILD_HOST_ARCH),amd64) TESTING += \ $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run +endif ifdef VBOX_WITH_RAW_MODE # # The testcase generator. # +ifneq ($(KBUILD_HOST_ARCH),amd64) PROGRAMS += tstDeviceStructSizeRC +endif tstDeviceStructSizeRC_TEMPLATE = VBoxRcExe tstDeviceStructSizeRC_DEFS = $(VBOX_DEVICES_TESTS_FEATURES) tstDeviceStructSizeRC_SOURCES = tstDeviceStructSizeRC.cpp @@ -73,7 +79,9 @@ endif # VBOX_WITH_RAW_MODE # # The testcase it self. # +ifneq ($(KBUILD_HOST_ARCH),amd64) PROGRAMS += tstDeviceStructSize +endif tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST tstDeviceStructSize_DEFS = $(VBOX_DEVICES_TESTS_FEATURES) tstDeviceStructSize_INCS = \ --- 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. # -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 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)),) + ifneq ($(KBUILD_HOST_ARCH),amd64) OTHERS += \ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run + endif endif endif # The normal testing pass. + +ifneq ($(KBUILD_HOST_ARCH),amd64) TESTING += \ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run +endif ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS TESTING += \ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run VirtualBox-4.3.0-VBoxGuestLib.patch: Makefile.kmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE VirtualBox-4.3.0-VBoxGuestLib.patch --- --- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.guestlib 2013-10-27 20:50:38.091380572 +0000 +++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-10-27 20:53:54.380791350 +0000 @@ -38,7 +38,7 @@ endif LIBRARIES += \ VBoxGuestR3Lib \ VBoxGuestR3LibShared -ifndef VBOX_ONLY_TESTSUITE +ifndef VBOX_USE_SYSTEM_XORG_HEADERS if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) LIBRARIES += \ VBoxGuestR3LibXFree86 VirtualBox-4.3.0-libcxx.patch: ./src/VBox/Disassembler/testcase/tstAsm.mac | 3 --- ./src/VBox/Disassembler/testcase/tstDisasm-1A.asm | 3 --- ./src/VBox/Runtime/Makefile.kmk | 2 +- ./src/VBox/Storage/testcase/Makefile.kmk | 4 ++-- ./src/libs/kStuff/Makefile.kmk | 2 +- Config.kmk | 4 ++-- b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 4 +--- b/src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ b/src/VBox/HostDrivers/win/Makefile.kmk | 2 +- b/src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- b/src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- configure | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- 16 files changed, 21 insertions(+), 29 deletions(-) --- NEW FILE VirtualBox-4.3.0-libcxx.patch --- Try 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. Was From dd383911ef6a9a43c17b18d48b17cd82d6c8feb9 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkundrak(a)v3.sk&gt; Date: Fri, 18 Jun 2010 10:58:14 +0200 Redo for VirtualBox-4.2.x and updated for VirtualBox-4.3.x Sérgio Basto <sergio(a)serjux.com&gt; --- ./src/VBox/Disassembler/testcase/tstAsm.mac.orig 2013-10-27 22:49:12.971665505 +0000 +++ ./src/VBox/Disassembler/testcase/tstAsm.mac 2013-10-27 22:49:17.290716021 +0000 @@ -52,7 +52,4 @@ %error "TEST_BITS is missing or wrong." %endif -%if __YASM_MAJOR__ > 1 || (__YASM_MAJOR__ == 1 && __YASM_MINOR__ >= 2) - %define pmulhrwa pmulhrw -%endif --- ./src/VBox/Disassembler/testcase/tstDisasm-1A.asm 2013-10-15 12:12:36.000000000 +0100 +++ ./src/VBox/Disassembler/testcase/tstDisasm-1A.asm 2013-10-27 22:36:35.204829647 +0000 @@ -26,9 +26,6 @@ BITS 32 -%if __YASM_MAJOR__ > 1 || (__YASM_MAJOR__ == 1 && __YASM_MINOR__ >= 2) - %define pmulhrwa pmulhrw -%endif BEGINCODE --- a/Config.kmk +++ b/Config.kmk @@ -2588,7 +2588,7 @@ else VBOX_SUFF_OBJ = $(SUFF_OBJ) endif VBOXW32GUEST_SUFF_LIB = .lib -VBOXLNX32GUEST_SUFF_LIB = .a +VBOXLNX32GUEST_SUFF_LIB = .so # # SDKs for external libraries. @@ -3784,7 +3776,7 @@ endif # Unlike VBOXR3STATIC, this is strict wrt warnings and includes IPRT. # TEMPLATE_VBoxR3Static = New name for VBOXR3STATIC -TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3STATIC +TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3EXE TEMPLATE_VBoxR3Static_EXTENDS_BY = appending TEMPLATE_VBoxR3Static_SDKS += VBOX_OPENSSL TEMPLATE_VBoxR3Static_SDKS.win += VBOX_NTDLL --- 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 += \ --- 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 # --- 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 \ --- 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 += VBoxStub --- ./src/VBox/Storage/testcase/Makefile.kmk.libcxx 2013-10-15 12:13:42.000000000 +0100 +++ ./src/VBox/Storage/testcase/Makefile.kmk 2013-10-28 03:38:30.036141172 +0000 @@ -83,7 +83,7 @@ if defined(VBOX_WITH_TESTCASES) || defin # # 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 vbox-img_SOURCES = \ vbox-img.cpp \ @@ -113,7 +113,7 @@ if defined(VBOX_WITH_TESTCASES) || defin $(SDK_VBOX_ZLIB_LIBS) endif ifeq ($(KBUILD_TARGET),linux) - vbox-img_LIBS += crypt + vbox-img_LIBS += crypto ifdef SDK_VBOX_LIBXML2_LIBS vbox-img_LIBS += xml2 lzma endif --- 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) --- ./src/VBox/Runtime/Makefile.kmk.libcxx 2013-10-15 12:13:19.000000000 +0100 +++ ./src/VBox/Runtime/Makefile.kmk 2013-10-28 03:08:32.053146036 +0000 @@ -232,7 +232,7 @@ endif # # RuntimeR3 - Static Runtime for Ring-3 executables. # -RuntimeR3_TEMPLATE = VBoxR3Static +RuntimeR3_TEMPLATE = VBOXR3EXE RuntimeR3_SDKS = VBOX_OPENSSL VBOX_LIBXML2 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 --- ./src/libs/kStuff/Makefile.kmk.orig 2012-12-27 18:36:01.629728244 +0000 +++ ./src/libs/kStuff/Makefile.kmk 2012-12-27 18:36:11.876827415 +0000 @@ -75,7 +75,7 @@ VBox-kStuff_SOURCES = \ # The library for static linking. # LIBRARIES += VBox-kStuffStatic -VBox-kStuffStatic_TEMPLATE = VBoxR3Static +VBox-kStuffStatic_TEMPLATE = VBOXR3EXE VBox-kStuffStatic_EXTENDS = VBox-kStuff VirtualBox-4.3.0-mesa.patch: Config.kmk | 10 --- src/VBox/Additions/common/crOpenGL/Makefile.kmk | 21 +------ src/VBox/Additions/common/crOpenGL/fakedri_drv.c | 66 +++++++++++++++++------ src/VBox/Additions/common/crOpenGL/fakedri_drv.h | 21 ++++--- 4 files changed, 71 insertions(+), 47 deletions(-) --- NEW FILE VirtualBox-4.3.0-mesa.patch --- fakedri_drv.c,h: Just compile with X11 system source and we may remove bundle X11 source code. --- ./Config.kmk 2012-03-13 13:14:01.000000000 +0000 +++ ./Config.kmk 2012-03-27 23:55:28.070630137 +0100 @@ -2003,15 +2003,7 @@ ifdef VBOX_WITH_CROGL endif if1of ($(KBUILD_TARGET), freebsd linux solaris) - # VBOX_PATH_MESA_SOURCE = $(PATH_ROOT)/src/libs/mesa-7.2 - VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2 - VBOX_MESA_INCS = \ - $(VBOX_PATH_MESA_SOURCE) \ - $(VBOX_PATH_MESA_SOURCE)/include \ - $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \ - $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \ - $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \ - $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common + VBOX_MESA_INCS = /usr/include/GL /usr/include/xorg /usr/include/pixman-1 endif VBOX_DARWIN_OPENGL_INST = obj/VBoxOGL/GL/ --- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.mesa 2012-09-13 09:26:18.000000000 +0100 +++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2012-09-23 01:08:36.032101751 +0100 @@ -82,18 +82,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES 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)/libXext-1.3.1 \ - $(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)/xextproto-7.1.1 \ - $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \ + /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 @@ -222,11 +216,6 @@ VBoxOGL_LIBS = \ $(VBOX_LIB_OGL_CRUTIL) \ $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) if1of ($(KBUILD_TARGET), linux solaris freebsd) - VBoxOGL_LIBS += \ - $(PATH_STAGE_LIB)/libXcomposite.so \ - $(PATH_STAGE_LIB)/libXdamage.so \ - $(PATH_STAGE_LIB)/libXfixes.so \ - $(PATH_STAGE_LIB)/libXext.so ifdef VBoxOGL_FAKEDRI ifeq ($(KBUILD_TARGET), freebsd) VBoxOGL_LIBS += \ --- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.c.mesa 2013-10-15 12:03:30.000000000 +0100 +++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2013-10-27 21:54:02.829363416 +0000 @@ -17,7 +17,12 @@ */ #define _GNU_SOURCE 1 +#define HAVE_STRNDUP 1 +#include <xf86.h> +#include <xf86drm.h> +#include <GL/gl.h> +#include <GL/glext.h> #include "cr_error.h" #include "cr_gl.h" #include "cr_mem.h" @@ -38,20 +43,6 @@ #include <string.h> #endif -/** X server message type definitions. */ -typedef enum { - X_PROBED, /* Value was probed */ - X_CONFIG, /* Value was given in the config file */ - X_DEFAULT, /* Value is a default */ - X_CMDLINE, /* Value was given on the command line */ - X_NOTICE, /* Notice */ - X_ERROR, /* Error message */ - X_WARNING, /* Warning message */ - X_INFO, /* Informational message */ - X_NONE, /* No prefix */ - X_NOT_IMPLEMENTED, /* Not implemented */ - X_UNKNOWN = -1 /* unknown -- this must always be last */ -} MessageType; #define VBOX_NO_MESA_PATCH_REPORTS @@ -136,8 +127,53 @@ static const __DRIswrastExtension *gpSwD extern const __DRIextension * __driDriverExtensions[]; +//copy from /usr/share/xorg-x11-server-source/glx/dispatch.h +#define SET_by_offset(disp, offset, fn) \ + do { \ + if ( (offset) < 0 ) { \ + /* fprintf( stderr, "[%s:%u] SET_by_offset(%p, %d, %s)!\n", */ \ + /* __func__, __LINE__, disp, offset, # fn); */ \ + /* abort(); */ \ + } \ + else { \ + ( (_glapi_proc *) (disp) )[offset] = (_glapi_proc) fn; \ + } \ + } while(0) + +// copy from glx/glapi.c + +/** + * Search the table of static entrypoint functions for the named function + * and return the corresponding glprocs_table_t entry. + */ +static const glprocs_table_t * find_entry( const char * n ) +{ + GLuint i; + for (i = 0; static_functions[i].Name_offset >= 0; i++) { + const char *testName = gl_string_table + static_functions[i].Name_offset; + if (strcmp(testName, n) == 0) { + return &static_functions[i]; + } + } + return NULL; +} + +/** + * Return dispatch table offset of the named static (built-in) function. + * Return -1 if function not found. + */ +static GLint +get_static_proc_offset(const char *funcName) +{ + const glprocs_table_t * const f = find_entry( funcName ); + if (f) { + return f->Offset; + } + return -1; +} + #define VBOX_SET_MESA_FUNC(table, name, func) \ - if (_glapi_get_proc_offset(name)>=0) SET_by_offset(table, _glapi_get_proc_offset(name), func); \ + if (get_static_proc_offset(name)>=0) SET_by_offset(table, get_static_proc_offset(name), func); \ else crWarning("%s not found in mesa table", name) #define GLAPI_ENTRY(Func) VBOX_SET_MESA_FUNC(vbox_glapi_table, "gl"#Func, cr_gl##Func); --- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2012-03-13 13:14:21.000000000 +0000 +++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2012-03-27 23:14:15.058370962 +0100 @@ -20,13 +20,20 @@ #ifndef ___CROPENGL_FAKEDRIDRV_H #define ___CROPENGL_FAKEDRIDRV_H -#include "src/mesa/main/mtypes.h" -#include "src/mesa/main/dd.h" -#include "src/mesa/glapi/dispatch.h" -#include "src/mesa/glapi/glapi.h" -#include "src/mesa/glapi/glapitable.h" -#include "src/mesa/glapi/glapioffsets.h" -#include "src/mesa/drivers/dri/common/dri_util.h" +//#include "/usr/share/xorg-x11-server-source/glx/glapi.h" +typedef void (*_glapi_proc)(void); /* generic function pointer */ + +extern GLuint +_glapi_get_dispatch_table_size(void); + +extern struct _glapi_table * +_glapi_get_dispatch(void); + +extern void +_glapi_set_dispatch(struct _glapi_table *dispatch); + +//#include "/usr/share/xorg-x11-server-source/glx/glapioffsets.h" +#include "/usr/share/xorg-x11-server-source/glx/glprocs.h" #include "GL/internal/dri_interface.h" #include "glx_proto.h" VirtualBox-4.3.0-no-bundles.patch: Config.kmk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- NEW FILE VirtualBox-4.3.0-no-bundles.patch --- --- ./Config.kmk.nobundles 2013-10-27 21:01:59.094737459 +0000 +++ ./Config.kmk 2013-10-27 21:09:07.046005624 +0000 @@ -2742,19 +2742,19 @@ VBOXLNX32GUEST_SUFF_LIB = .so # SDKs for external libraries. # SDK_VBOX_LIBXML2 = . -SDK_VBOX_LIBXML2_INCS ?= $(PATH_ROOT)/src/libs/libxml2-2.6.31/include +SDK_VBOX_LIBXML2_INCS ?= /usr/include/libxml2 SDK_VBOX_LIBXML2_DEFS ?= _REENTRANT SDK_VBOX_LIBXML2_DEFS.win += WIN32 _WINDOWS _MBCS # note: no linking to LIB here, we do that explicitly in src/VBox/Runtime/Makefile.kmk to link # libxml against VBoxRT SDK_VBOX_LIBPNG = . -SDK_VBOX_LIBPNG_INCS ?= $(PATH_ROOT)/src/libs/libpng-1.2.8 +SDK_VBOX_LIBPNG_INCS ?= /usr/include/libpng15 SDK_VBOX_LIBPNG_LIBS ?= $(PATH_STAGE_LIB)/VBox-libpng$(VBOX_SUFF_LIB) SDK_VBOX_ZLIB = . if1of ($(KBUILD_TARGET), os2 solaris win) - SDK_VBOX_ZLIB_INCS ?= $(PATH_ROOT)/src/libs/zlib-1.2.6 + SDK_VBOX_ZLIB_INCS ?= /usr/include/ SDK_VBOX_ZLIB_LIBS ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB) else SDK_VBOX_ZLIB_INCS ?= VirtualBox-4.3.0-testmangle.patch: Makefile.kmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE VirtualBox-4.3.0-testmangle.patch --- Disable a failing check. --- ./src/VBox/Runtime/Makefile.kmk.libcxx 2013-10-15 12:13:19.000000000 +0100 +++ ./src/VBox/Runtime/Makefile.kmk 2013-10-28 03:08:32.053146036 +0000 @@ -2452,7 +2452,7 @@ test-doxygen:: # # Test mangling. # -if1of ($(LIBRARIES),RuntimeR3 RuntimeR0 RuntimeR0Drv RuntimeRC) +if 0 test-mangling:: $(IPRT_OUT_DIR)/mangling.run OTHERS += $(IPRT_OUT_DIR)/mangling.run CLEANS += $(IPRT_OUT_DIR)/mangling.run Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-19/VirtualBox.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- VirtualBox.spec 29 Sep 2013 20:21:15 -0000 1.49 +++ VirtualBox.spec 29 Oct 2013 04:10:28 -0000 1.50 @@ -26,8 +26,8 @@ #endif Name: VirtualBox -Version: 4.2.18 -Release: 2%{?prerel:.%{prerel}}%{?dist} +Version: 4.3.0 +Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools @@ -44,17 +44,16 @@ 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 -Patch10: VirtualBox-4.2.0-32bit.patch -Patch15: VirtualBox-OSE-4.0.0-makeself.patch +Patch3: VirtualBox-4.3.0-libcxx.patch +Patch4: VirtualBox-4.3.0-testmangle.patch +Patch10: VirtualBox-4.3.0-32bit.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-4.2.0-mesa.patch -Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch +Patch23: VirtualBox-4.3.0-mesa.patch +Patch24: VirtualBox-4.3.0-VBoxGuestLib.patch Patch25: VirtualBox-4.2.0-xorg111.patch -Patch26: VirtualBox-4.2.4-no-bundles.patch -Patch27: changeset_trunk_48529.diff +Patch26: VirtualBox-4.3.0-no-bundles.patch %if 0%{?fedora} < 16 BuildRequires: kBuild >= 0.1.98 @@ -88,6 +87,9 @@ BuildRequires: libpng-devel BuildRequires: zlib-devel BuildRequires: device-mapper-devel +BuildRequires: libvpx-devel +BuildRequires: makeself + #BuildRequires: glibc(x86-32) glibc-devel(x86-32) libstdc++(x86-32) #BuildRequires: glibc.i686 glibc-devel.i686 libstdc++.i686 #BuildRequires: /usr/lib/libc.so @@ -218,7 +220,7 @@ %patch1 -p1 -b .noupdates %patch2 -p1 -b .strings %patch3 -p1 -b .libcxx -%patch15 -p1 -b .makeself +%patch4 -p1 -b .mangletest %ifarch x86_64 %patch10 -p1 -b .32bit %endif @@ -233,7 +235,6 @@ %patch25 -p1 -b .xorg111 %endif %patch26 -p1 -b .nobundles -%patch27 -p1 -b .fix_shared_folders_for_Linux_3.11 # CRLF->LF sed -i 's/\r//' COPYING @@ -248,6 +249,7 @@ --disable-docs \ %endif +#--enable-vnc --build-headless --build-libxml2 #--disable-java #--disable-xpcom . ./env.sh @@ -307,11 +309,9 @@ %if %{enable_webservice} ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv %endif -ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE -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 \ @@ -328,24 +328,33 @@ # 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/SUPInstall \ + obj/bin/SUPLoggerCtl \ + obj/bin/SUPUninstall \ obj/bin/VirtualBox \ + obj/bin/VBoxAutostart \ + obj/bin/VBoxBalloonCtrl \ + obj/bin/VBoxExtPackHelperApp \ + obj/bin/VBoxHeadless \ obj/bin/VBoxManage \ + obj/bin/VBoxManageHelp \ + obj/bin/VBoxNetAdpCtl \ + obj/bin/VBoxNetDHCP \ + obj/bin/VBoxNetNAT \ + obj/bin/VBoxSDL \ obj/bin/VBoxSVC \ + obj/bin/VBoxTestOGL \ + obj/bin/VBoxVMMPreload \ + obj/bin/VBoxVolInfo \ obj/bin/VBoxXPCOMIPCD \ obj/bin/VBoxSysInfo.sh \ obj/bin/vboxshell.py \ - obj/bin/VBoxTestOGL \ - obj/bin/VBoxExtPackHelperApp \ - obj/bin/VBoxBalloonCtrl \ %if %{enable_webservice} obj/bin/vboxwebsrv \ obj/bin/webtest \ %endif - obj/bin/VBoxBFE + +install -p -m 0755 -D obj/bin/VBoxCreateUSBNode.sh $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh # Language files install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \ @@ -410,21 +419,17 @@ install -m 0644 -D %{SOURCE11} \ $RPM_BUILD_ROOT%{_unitdir}/vboxservice.service -install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh \ - $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh - #review this 3 install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \ $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh -#ancient script /usr/bin/VBoxClient-all does not exits +#/usr/bin/VBoxClient-all does not exits #install -m 0644 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \ # $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop +#desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop install -m 0644 -D %{SOURCE8} \ $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 @@ -529,8 +534,6 @@ %{_bindir}/VBox %{_bindir}/vboxballoonctrl %{_bindir}/VBoxBalloonCtrl -%{_bindir}/vboxbfe -%{_bindir}/VBoxBFE %{_bindir}/vboxheadless %{_bindir}/VBoxHeadless %{_bindir}/vboxmanage @@ -555,13 +558,20 @@ %{_libdir}/virtualbox/VBoxTestOGL %{_libdir}/virtualbox/VBoxXPCOMIPCD %{_libdir}/virtualbox/VBoxBalloonCtrl +%{_libdir}/virtualbox/SUPInstall +%{_libdir}/virtualbox/SUPLoggerCtl +%{_libdir}/virtualbox/SUPUninstall +%{_libdir}/virtualbox/VBoxAutostart +%{_libdir}/virtualbox/VBoxManageHelp +%{_libdir}/virtualbox/VBoxNetNAT +%{_libdir}/virtualbox/VBoxVMMPreload +%{_libdir}/virtualbox/VBoxVolInfo %if %{enable_webservice} %{_libdir}/virtualbox/vboxwebsrv %{_libdir}/virtualbox/webtest %endif %attr(4755,root,root) %{_libdir}/virtualbox/VBoxHeadless %attr(4755,root,root) %{_libdir}/virtualbox/VBoxSDL -%attr(4755,root,root) %{_libdir}/virtualbox/VBoxBFE %attr(4755,root,root) %{_libdir}/virtualbox/VBoxNetDHCP %attr(4755,root,root) %{_libdir}/virtualbox/VBoxNetAdpCtl %attr(4755,root,root) %{_libdir}/virtualbox/VirtualBox @@ -608,7 +618,7 @@ %exclude %{_datadir}/gdm %config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules %config %{_sysconfdir}/modules-load.d/%{name}-guest.conf -%doc COPYING +#doc COPYING %{_unitdir}/vboxservice.service @@ -617,6 +627,12 @@ %changelog +* Mon Oct 28 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.0-1 +- New upstream release. +- Refactor patches VirtualBox-4.3.0-32bit.patch, VirtualBox-4.3.0-libcxx.patch, VirtualBox-4.3.0-mesa.patch, +VirtualBox-4.3.0-no-bundles.patch, VirtualBox-4.3.0-testmangle.patch and VirtualBox-4.3.0-VBoxGuestLib.patch +- Took the opportunity to do a review: add some new binaries, need to review it again . + * Sun Sep 29 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.18-2 - Additions/linux: fix shared folders for Linux 3.11 --- VirtualBox-4.1.20-x113.patch DELETED --- --- VirtualBox-4.2.0-32bit.patch DELETED --- --- VirtualBox-4.2.0-VBoxGuestLib.patch DELETED --- --- VirtualBox-4.2.0-libcxx.patch DELETED --- --- VirtualBox-4.2.0-mesa.patch DELETED --- --- VirtualBox-4.2.4-no-bundles.patch DELETED --- --- VirtualBox-4.2.6-gcc48.patch DELETED --- --- VirtualBox-OSE-4.0.0-makeself.patch DELETED --- --- changeset_trunk_48529.diff DELETED ---