rpms/VirtualBox/devel VirtualBox-4.3.0-32bit.patch, NONE, 1.1 VirtualBox-4.3.0-VBoxGuestLib.patch, NONE, 1.1 VirtualBox-4.3.0-mesa.patch, NONE, 1.1 VirtualBox-4.3.0-no-bundles.patch, NONE, 1.1 VirtualBox-4.2.0-32bit.patch, 1.1, NONE VirtualBox-4.2.0-VBoxGuestLib.patch, 1.2, NONE VirtualBox-4.2.0-libcxx.patch, 1.3, NONE VirtualBox-4.2.0-mesa.patch, 1.4, NONE VirtualBox-4.2.4-no-bundles.patch, 1.1, NONE changeset_47484.diff, 1.1, NONE changeset_47588.diff, 1.1, NONE

Author: sergiomb Update of /cvs/free/rpms/VirtualBox/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14801 Added Files: VirtualBox-4.3.0-32bit.patch VirtualBox-4.3.0-VBoxGuestLib.patch VirtualBox-4.3.0-mesa.patch VirtualBox-4.3.0-no-bundles.patch Removed Files: 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 changeset_47484.diff changeset_47588.diff Log Message: Preparing 4.3.0 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-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.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 --- --- changeset_47484.diff DELETED --- --- changeset_47588.diff DELETED ---