From 9aca294d1b4a9c8225837bc16e23a3963dcbf623 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 10 Jul 2011 21:29:11 +0200 Subject: [PATCH] virtualbox-ose: update to 4.0.10. --- .../patches/18-system-xorg.patch | 277 ++++++++++++++++++ .../patches/change_default_driver_dir.patch | 18 ++ .../patches/kernel_headers_path.diff | 4 +- srcpkgs/virtualbox-ose/patches/usb-2.0.patch | 161 ++++++++++ .../patches/virtualbox-4-makeself-check.patch | 4 +- .../patches/virtualbox-4-mkisofs-check.patch | 4 +- srcpkgs/virtualbox-ose/template | 57 ++-- .../virtualbox-ose-guest.template | 4 +- 8 files changed, 495 insertions(+), 34 deletions(-) create mode 100644 srcpkgs/virtualbox-ose/patches/18-system-xorg.patch create mode 100644 srcpkgs/virtualbox-ose/patches/change_default_driver_dir.patch create mode 100644 srcpkgs/virtualbox-ose/patches/usb-2.0.patch diff --git a/srcpkgs/virtualbox-ose/patches/18-system-xorg.patch b/srcpkgs/virtualbox-ose/patches/18-system-xorg.patch new file mode 100644 index 00000000000..4a28b93b677 --- /dev/null +++ b/srcpkgs/virtualbox-ose/patches/18-system-xorg.patch @@ -0,0 +1,277 @@ +Description: Build the X.Org driver only for the selected system X Server version. +Author: Michael Meskes , Felix Geyer + +diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk +--- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk ++++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk +@@ -40,8 +40,8 @@ LIBRARIES += \ + VBoxGuestR3LibShared + ifndef VBOX_ONLY_TESTSUITE + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) +- LIBRARIES += \ +- VBoxGuestR3LibXFree86 ++# LIBRARIES += \ ++# VBoxGuestR3LibXFree86 + endif + endif + LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86 +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 + +diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk +--- a/src/VBox/Additions/x11/Makefile.kmk ++++ b/src/VBox/Additions/x11/Makefile.kmk +@@ -17,6 +17,10 @@ + SUB_DEPTH = ../../../.. + include $(KBUILD_PATH)/subheader.kmk + ++ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110) ++ XSERVER_VERSION := 17 ++endif ++ + # Include sub-makefiles. + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) + include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk +diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk +--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk ++++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk +@@ -23,7 +23,6 @@ include $(KBUILD_PATH)/subheader.kmk + # vboxmouse_drv + # + if1of ($(KBUILD_TARGET), linux) +- SYSMODS += vboxmouse_drv + vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD + vboxmouse_drv_DEFS.linux = linux + vboxmouse_drv_DEFS.x86 += __i386__ +@@ -59,7 +58,6 @@ endif + # + # vboxmouse_drv_70 + # +-DLLS += vboxmouse_drv_70 + vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_70_DEFS = \ + XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE +@@ -80,7 +78,6 @@ vboxmouse_drv_70_SOURCES = \ + # + # vboxmouse_drv_71 + # +-DLLS += vboxmouse_drv_71 + vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) + vboxmouse_drv_71_INCS := \ +@@ -97,7 +94,6 @@ vboxmouse_drv_71_SOURCES = \ + # + # vboxmouse_drv_13 + # +-DLLS += vboxmouse_drv_13 + vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_13_INCS := \ +@@ -112,7 +108,6 @@ vboxmouse_drv_13_SOURCES = \ + # + # vboxmouse_drv_14 + # +-DLLS += vboxmouse_drv_14 + vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_14_INCS := \ +@@ -126,7 +121,6 @@ endif + # + # vboxmouse_drv_15 + # +-DLLS += vboxmouse_drv_15 + vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_15_INCS := \ +@@ -141,7 +135,6 @@ vboxmouse_drv_15_SOURCES = \ + # + # vboxmouse_drv_16 + # +-DLLS += vboxmouse_drv_16 + vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_16_INCS := \ +@@ -157,7 +150,6 @@ vboxmouse_drv_16_SOURCES = \ + # + # vboxmouse_drv_17 + # +-DLLS += vboxmouse_drv_17 + vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -177,7 +169,6 @@ vboxmouse_drv_17_SOURCES = \ + # + # vboxmouse_drv_18 + # +-DLLS += vboxmouse_drv_18 + vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -197,7 +188,6 @@ vboxmouse_drv_18_SOURCES = \ + # + # vboxmouse_drv_19 + # +-DLLS += vboxmouse_drv_19 + vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -217,7 +207,6 @@ vboxmouse_drv_19_SOURCES = \ + # + # vboxmouse_drv_110 + # +-DLLS += vboxmouse_drv_110 + vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -234,6 +224,14 @@ vboxmouse_drv_110_SOURCES = \ + vboxmouse_15.c + + ++vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv ++vboxmouse_drv_$(XSERVER_VERSION)_INCS := \ ++ /usr/include/x11 \ ++ /usr/include/xorg \ ++ /usr/include/pixman-1 ++DLLS += vboxmouse_drv_$(XSERVER_VERSION) ++ ++ + # Check the undefined symbols in the X.Org modules against lists of allowed + # symbols. Not very elegant, but it will catch problems early. + ifdef VBOX_WITH_TESTCASES +diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk ++++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +@@ -22,7 +22,6 @@ include $(KBUILD_PATH)/subheader.kmk + # vboxvideo_drv + # + if1of ($(KBUILD_TARGET), linux) +- SYSMODS += vboxvideo_drv + endif # target linux + vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD + vboxvideo_drv_DEFS.linux = linux +@@ -89,7 +88,6 @@ endif # target linux + # base keywords instead of using .solaris or .linux. + # Also it is *important* to use := and not = when deriving a property. + # +-DLLS += vboxvideo_drv_70 + vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD + if1of ($(KBUILD_TARGET), linux) + vboxvideo_drv_70_CFLAGS += \ +@@ -112,7 +110,6 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES) + # + # vboxvideo_drv_71 + # +-DLLS += vboxvideo_drv_71 + vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS) +@@ -127,7 +124,6 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES) + # + # vboxvideo_drv_13 + # +-DLLS += vboxvideo_drv_13 + vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13 +@@ -146,7 +142,6 @@ vboxvideo_drv_13_SOURCES = \ + # + # vboxvideo_drv_14 + # +-DLLS += vboxvideo_drv_14 + vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS) +@@ -165,7 +160,6 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_13_SOURCES) + # + # vboxvideo_drv_15 + # +-DLLS += vboxvideo_drv_15 + vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \ +@@ -192,7 +186,6 @@ endif + # + # vboxvideo_drv_16 + # +-DLLS += vboxvideo_drv_16 + vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -212,7 +205,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES) + # + # vboxvideo_drv_17 + # +-DLLS += vboxvideo_drv_17 + vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -239,7 +231,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES) + # + # vboxvideo_drv_18 + # +-DLLS += vboxvideo_drv_18 + vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -266,7 +257,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES) + # + # vboxvideo_drv_19 + # +-DLLS += vboxvideo_drv_19 + vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -293,7 +282,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES) + # + # vboxvideo_drv_110 + # +-DLLS += vboxvideo_drv_110 + vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_110_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -317,6 +306,23 @@ vboxvideo_drv_110_INCS = \ + vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES) + + ++vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv ++vboxvideo_drv_$(XSERVER_VERSION)_INCS := \ ++ /usr/include/xorg \ ++ /usr/include/x11 \ ++ /usr/include/pixman-1 \ ++ /usr/include/X11/dri \ ++ /usr/include/drm \ ++ /usr/include/libdrm ++vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include ++DLLS += vboxvideo_drv_$(XSERVER_VERSION) ++ ++# required for lenny backports ++ifeq ($(XSERVER_VERSION),14) ++ vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg ++endif ++ ++ + # Check the undefined symbols in the X.Org modules against lists of allowed + # symbols. Not very elegant, but it will catch problems early. + ifdef VBOX_WITH_TESTCASES diff --git a/srcpkgs/virtualbox-ose/patches/change_default_driver_dir.patch b/srcpkgs/virtualbox-ose/patches/change_default_driver_dir.patch new file mode 100644 index 00000000000..71930f06271 --- /dev/null +++ b/srcpkgs/virtualbox-ose/patches/change_default_driver_dir.patch @@ -0,0 +1,18 @@ +diff -Nur VirtualBox-4.0.8_OSE.orig//src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.0.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c +--- VirtualBox-4.0.8_OSE.orig//src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-05-18 04:28:14.545495222 -0700 ++++ VirtualBox-4.0.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-05-18 04:29:57.945499707 -0700 +@@ -36,13 +36,8 @@ + //#define DEBUG_DRI_CALLS + + //@todo this could be different... +-#ifdef RT_ARCH_AMD64 +-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri" ++# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri" + # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" +-#else +-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri" +-# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" +-#endif + + #ifdef DEBUG_DRI_CALLS + #define SWDRI_SHOWNAME(pext, func) \ diff --git a/srcpkgs/virtualbox-ose/patches/kernel_headers_path.diff b/srcpkgs/virtualbox-ose/patches/kernel_headers_path.diff index 3dd06f8e4bb..7aca6c047e3 100644 --- a/srcpkgs/virtualbox-ose/patches/kernel_headers_path.diff +++ b/srcpkgs/virtualbox-ose/patches/kernel_headers_path.diff @@ -1,5 +1,5 @@ ---- configure.orig 2010-12-22 14:24:16.536609268 +0100 -+++ configure 2010-12-22 14:24:57.939796907 +0100 +--- foo.orig/configure.orig 2010-12-22 14:24:16.536609268 +0100 ++++ foo/configure 2010-12-22 14:24:57.939796907 +0100 @@ -139,11 +139,7 @@ QT4DIR_PKGCONFIG=1 QT4UIC3DIR="/usr/bin" KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild" diff --git a/srcpkgs/virtualbox-ose/patches/usb-2.0.patch b/srcpkgs/virtualbox-ose/patches/usb-2.0.patch new file mode 100644 index 00000000000..baa8deea1a0 --- /dev/null +++ b/srcpkgs/virtualbox-ose/patches/usb-2.0.patch @@ -0,0 +1,161 @@ +Index: Config.kmk +=================================================================== +--- foo.orig/Config.kmk (revision 37751) ++++ foo/Config.kmk (revision 37752) +@@ -409,6 +409,9 @@ + ifdef VBOX_WITH_USB + VBOX_WITH_VUSB = 1 + endif ++ifdef VBOX_WITH_EHCI ++ VBOX_WITH_EHCI_IMPL = 1 ++endif + # Enable the hal/sysfs USB code on Linux. + ifeq ($(KBUILD_TARGET),linux) + VBOX_USB_WITH_SYSFS = 1 +@@ -920,7 +923,7 @@ + # + ifdef VBOX_OSE + VBOX_WITH_VRDP= +- VBOX_WITH_EHCI= ++ VBOX_WITH_EHCI_IMPL= + VBOX_WITH_EXTPACK_PUEL= + VBOX_WITH_PCI_PASSTHROUGH= + VBOX_WITH_OS2_ADDITIONS_BIN= +Index: src/VBox/Devices/Makefile.kmk +=================================================================== +--- foo.orig/src/VBox/Devices/Makefile.kmk (revision 37751) ++++ foo/src/VBox/Devices/Makefile.kmk (revision 37752) +@@ -57,8 +57,8 @@ + ifdef VBOX_WITH_USB + VBoxDDU_DEFS += VBOX_WITH_USB IN_USBLIB + VBoxDDU_SDKS.win = WINPSDK W2K3DDK +- if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_EXTPACK_PUEL) +- VBoxDDU_DEFS += VBOX_WITH_EHCI ++ if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL) ++ VBoxDDU_DEFS += VBOX_WITH_EHCI_IMPL + endif + ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN + VBoxDDU_DEFS.darwin += VBOX_WITH_NEW_USB_CODE_ON_DARWIN +@@ -122,8 +122,8 @@ + VBoxDD_DEFS = VBOX_ACPI + ifdef VBOX_WITH_USB + VBoxDD_DEFS += VBOX_WITH_USB +- if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_EXTPACK_PUEL) +- VBoxDD_DEFS += VBOX_WITH_EHCI ++ if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL) ++ VBoxDD_DEFS += VBOX_WITH_EHCI_IMPL + endif + endif + ifdef VBOX_WITH_VUSB +@@ -448,8 +448,8 @@ + endif + ifdef VBOX_WITH_USB + DevicesR3_DEFS += VBOX_WITH_USB +- if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_EXTPACK_PUEL) +- DevicesR3_DEFS += VBOX_WITH_EHCI ++ if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL) ++ DevicesR3_DEFS += VBOX_WITH_EHCI_IMPL + DevicesR3_SOURCES += \ + USB/DevEHCI.cpp + endif +@@ -603,8 +603,8 @@ + + ifdef VBOX_WITH_USB + VBoxDDGC_DEFS += VBOX_WITH_USB +- if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_EXTPACK_PUEL) +- VBoxDDGC_DEFS += VBOX_WITH_EHCI ++ if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL) ++ VBoxDDGC_DEFS += VBOX_WITH_EHCI_IMPL + VBoxDDGC_SOURCES += \ + USB/DevEHCI.cpp + endif +@@ -708,8 +708,8 @@ + endif + ifdef VBOX_WITH_USB + VBoxDDR0_DEFS += VBOX_WITH_USB +- if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_EXTPACK_PUEL) +- VBoxDDR0_DEFS += VBOX_WITH_EHCI ++ if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL) ++ VBoxDDR0_DEFS += VBOX_WITH_EHCI_IMPL + VBoxDDR0_SOURCES += \ + USB/DevEHCI.cpp + endif +Index: src/VBox/Devices/build/VBoxDD.cpp +=================================================================== +--- foo.orig/src/VBox/Devices/build/VBoxDD.cpp (revision 37751) ++++ foo/src/VBox/Devices/build/VBoxDD.cpp (revision 37752) +@@ -132,7 +132,7 @@ + if (RT_FAILURE(rc)) + return rc; + #endif +-#ifdef VBOX_WITH_EHCI ++#ifdef VBOX_WITH_EHCI_IMPL + rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceEHCI); + if (RT_FAILURE(rc)) + return rc; +Index: src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp +=================================================================== +--- foo.orig/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp (revision 37751) ++++ foo/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp (revision 37752) +@@ -62,7 +62,7 @@ + #ifdef VBOX_WITH_USB + # undef LOG_GROUP + # include "../USB/DevOHCI.cpp" +-# ifdef VBOX_WITH_EHCI ++# ifdef VBOX_WITH_EHCI_IMPL + # include "../USB/DevEHCI.cpp" + # endif + #endif +@@ -928,7 +928,7 @@ + GEN_CHECK_OFF(OHCI, StatDroppedUrbs); + GEN_CHECK_OFF(OHCI, StatTimer); + # endif +-# ifdef VBOX_WITH_EHCI ++# ifdef VBOX_WITH_EHCI_IMPL + /* USB/DevEHCI.cpp */ + GEN_CHECK_SIZE(EHCIHUBPORT); + GEN_CHECK_OFF(EHCIHUBPORT, fReg); +@@ -1005,7 +1005,7 @@ + GEN_CHECK_OFF(EHCI, pEOFTimerNoSyncRC); + GEN_CHECK_OFF(EHCI, pEOFTimerNoSyncR3); + GEN_CHECK_OFF(EHCI, pEOFTimerNoSyncR0); +-# endif /* VBOX_WITH_EHCI */ ++# endif /* VBOX_WITH_EHCI_IMPL */ + #endif /* VBOX_WITH_USB */ + + /* VMMDev/VBoxDev.cpp */ +Index: src/VBox/Devices/testcase/tstDeviceStructSize.cpp +=================================================================== +--- foo.orig/src/VBox/Devices/testcase/tstDeviceStructSize.cpp (revision 37751) ++++ foo/src/VBox/Devices/testcase/tstDeviceStructSize.cpp (revision 37752) +@@ -67,7 +67,7 @@ + #ifdef VBOX_WITH_USB + # undef LOG_GROUP + # include "../USB/DevOHCI.cpp" +-# ifdef VBOX_WITH_EHCI ++# ifdef VBOX_WITH_EHCI_IMPL + # include "../USB/DevEHCI.cpp" + # endif + #endif +@@ -284,7 +284,7 @@ + #endif + //CHECK_MEMBER_ALIGNMENT(E1KSTATE, csTx, 8); + #ifdef VBOX_WITH_USB +-# ifdef VBOX_WITH_EHCI ++# ifdef VBOX_WITH_EHCI_IMPL + CHECK_MEMBER_ALIGNMENT(EHCI, RootHub, 8); + # ifdef VBOX_WITH_STATISTICS + CHECK_MEMBER_ALIGNMENT(EHCI, StatCanceledIsocUrbs, 8); +Index: src/VBox/Devices/testcase/Makefile.kmk +=================================================================== +--- foo.orig/src/VBox/Devices/testcase/Makefile.kmk (revision 37751) ++++ foo/src/VBox/Devices/testcase/Makefile.kmk (revision 37752) +@@ -28,7 +28,7 @@ + VBOX_DEVICES_TESTS_FEATURES = \ + $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,) \ + $(if $(VBOX_WITH_USB),VBOX_WITH_USB,) \ +- $(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI,) \ ++ $(if $(VBOX_WITH_EHCI_IMPL),VBOX_WITH_EHCI_IMPL,) \ + $(if $(VBOX_WITH_AHCI),VBOX_WITH_AHCI,) \ + $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \ + $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO,) \ diff --git a/srcpkgs/virtualbox-ose/patches/virtualbox-4-makeself-check.patch b/srcpkgs/virtualbox-ose/patches/virtualbox-4-makeself-check.patch index 2b1a3694fb4..1a57565eafb 100644 --- a/srcpkgs/virtualbox-ose/patches/virtualbox-4-makeself-check.patch +++ b/srcpkgs/virtualbox-ose/patches/virtualbox-4-makeself-check.patch @@ -1,5 +1,5 @@ ---- configure.orig -+++ configure +--- foo.org/configure.orig ++++ foo/configure @@ -2527,7 +2527,6 @@ check_compiler_h [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit diff --git a/srcpkgs/virtualbox-ose/patches/virtualbox-4-mkisofs-check.patch b/srcpkgs/virtualbox-ose/patches/virtualbox-4-mkisofs-check.patch index e1db9102470..6abf5df71ed 100644 --- a/srcpkgs/virtualbox-ose/patches/virtualbox-4-mkisofs-check.patch +++ b/srcpkgs/virtualbox-ose/patches/virtualbox-4-mkisofs-check.patch @@ -1,5 +1,5 @@ ---- configure.orig -+++ configure +--- foo.orig/configure.orig ++++ foo/configure @@ -2499,7 +2499,6 @@ # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs # [ "$OS" != "darwin" ] && check_yasm diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index fb45106c29a..4e3865df0d4 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -1,13 +1,16 @@ # Template file for 'virtualbox-ose' pkgname=virtualbox-ose -_vbox_distver=4.0.8 +_vbox_distver=4.0.10 version=${_vbox_distver} +patch_args="-Np1" wrksrc="VirtualBox-${version}_OSE" distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2" build_style=custom-install short_desc="General-purpose full virtualizer for x86 hardware" maintainer="Juan RP " -checksum=48961f0d6fe70c3887cbca5ea987767ac1bafd4b64dd3c4d25445682351e118e +homepage="http://virtualbox.org" +license="GPL-2, MPL-1.1, CDDL" +checksum=47fca441db321f7b9cfad9beb52dbeb9d52f5270e95e26f2c1ece13e100e474c long_desc=" VirtualBox is a free x86 virtualization solution allowing a wide range of x86 operating systems such as Windows, DOS, BSD or Linux to run on a Linux system." @@ -34,10 +37,16 @@ Add_dependency run python Add_dependency run libXcursor Add_dependency run libXt Add_dependency run libXinerama +Add_dependency run libXrandr Add_dependency run MesaLib Add_dependency run libIDL Add_dependency run glib +Add_dependency run libpulseaudio Add_dependency run ${pkgname}-dkms ">=${version}" +Add_dependency run gcc +Add_dependency run coreutils +Add_dependency run hicolor-icon-theme +Add_dependency run desktop-file-utils Add_dependency build libpng-devel Add_dependency build zlib-devel @@ -46,19 +55,17 @@ Add_dependency build libxml2-devel Add_dependency build libcurl-devel Add_dependency build SDL-devel Add_dependency build qt-devel -Add_dependency build libX11-devel -Add_dependency build libXmu-devel Add_dependency build libXext-devel -Add_dependency build python-devel Add_dependency build libXcursor-devel -Add_dependency build libXt-devel Add_dependency build libXinerama-devel +Add_dependency build libXrandr-devel Add_dependency build MesaLib-devel Add_dependency build libIDL-devel Add_dependency build glib-devel Add_dependency build pam-devel -Add_dependency build libxslt -Add_dependency build docbook-xml +Add_dependency build pulseaudio-devel +Add_dependency build libxslt-devel +Add_dependency build xorg-server-devel Add_dependency build docbook-xsl Add_dependency build acpica-utils Add_dependency build kernel-headers @@ -67,10 +74,6 @@ Add_dependency build yasm if [ "${xbps_machine}" = "x86_64" ]; then Add_dependency build gcc-c++-multilib fi -Add_dependency full gcc -Add_dependency full coreutils -Add_dependency full hicolor-icon-theme -Add_dependency full desktop-file-utils do_build() { @@ -98,19 +101,29 @@ do_install() mkdir -p ${DESTDIR}/usr/{bin,lib/virtualbox/components,share/virtualbox/nls} install -m0755 VBox.sh ${DESTDIR}/usr/bin/VBox - for f in VirtualBox VBoxManage VBoxSDL VBoxHeadless vboxwebsrv; do + for f in VirtualBox VBoxManage VBoxSDL VBoxHeadless \ + VBoxBalloonCtrl; do ln -sf VBox ${DESTDIR}/usr/bin/${f} done + # comoonents install -m0755 components/* -t ${DESTDIR}/usr/lib/virtualbox/components + + # libs install -m0755 *.so ${DESTDIR}/usr/lib/virtualbox install -m0644 *.gc *.r0 VBoxEFI* ${DESTDIR}/usr/lib/virtualbox + + # setuid install -m4755 VBoxHeadless VBoxSDL VBoxNetDHCP VBoxNetAdpCtl \ VirtualBox VBoxBFE -t ${DESTDIR}/usr/lib/virtualbox - install -m0755 VBoxManage VBoxSVC VBoxXPCOMIPCD *.sh xpidl \ - VBoxTestOGL EfiThunk *.py -t ${DESTDIR}/usr/lib/virtualbox - + + install -m0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD \ + VBoxTestOGL VBoxBalloonCtrl \ + -t ${DESTDIR}/usr/lib/virtualbox + + # locales install -m0755 nls/*.qm -t ${DESTDIR}/usr/share/virtualbox/nls + # icons and desktop install -D -m0644 VBox.png ${DESTDIR}/usr/share/pixmaps/VBox.png install -D -m0644 virtualbox.desktop \ ${DESTDIR}/usr/share/applications/virtualbox.desktop @@ -119,23 +132,15 @@ do_install() install -d ${DESTDIR}/usr/share/icons/hicolor cp -a icons ${DESTDIR}/usr/share/icons/hicolor + # configuration file mkdir -p ${DESTDIR}/etc/vbox echo 'INSTALL_DIR=/usr/lib/virtualbox' > ${DESTDIR}/etc/vbox/vbox.cfg - mkdir -p ${DESTDIR}/usr/lib/virtualbox/sdk/bindings/xpcom/python - cd sdk/installer - VBOX_INSTALL_PATH="/usr/lib/virtualBox" \ - python vboxapisetup.py install --root "${DESTDIR}" - cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/sdk/bindings/xpcom/python - cp -r xpcom ${DESTDIR}/usr/lib/virtualbox/sdk/bindings/xpcom/python - chmod 644 ${DESTDIR}/usr/lib/virtualbox/sdk/bindings/xpcom/python/xpcom/*.py - chmod 644 ${DESTDIR}/usr/lib/virtualbox/sdk/bindings/xpcom/python/xpcom/server/*.py - chmod 644 ${DESTDIR}/usr/lib/virtualbox/sdk/bindings/xpcom/python/xpcom/client/*.py - cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin install -d ${DESTDIR}/usr/share/licenses/${pkgname} install -m0644 ${wrksrc}/COPYING* \ ${DESTDIR}/usr/share/licenses/${pkgname} + # Install the OpenRC service. install -D -m755 ${FILESDIR}/virtualbox.rc \ ${DESTDIR}/etc/init.d/virtualbox diff --git a/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template b/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template index bc7d9936132..689460749b5 100644 --- a/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template +++ b/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template @@ -40,9 +40,9 @@ do_install() ${DESTDIR}/etc/X11/Xsession.d/98vboxadd-xclient install -m755 -D ${wrksrc}/src/VBox/Additions/x11/Installer/vboxclient.desktop \ ${DESTDIR}/etc/xdg/autostart/vboxclient.desktop - install -D vboxmouse_drv_19.so \ + install -D vboxmouse_drv.so \ ${DESTDIR}/usr/lib/xorg/modules/input/vboxmouse.so - install -D vboxvideo_drv_19.so \ + install -D vboxvideo_drv.so \ ${DESTDIR}/usr/lib/xorg/modules/drivers/vboxvideo.so install -d ${DESTDIR}/usr/lib/xorg/modules/dri install -m755 VBoxOGL*.so ${DESTDIR}/usr/lib