Wed Jul 6 23:10:44 UTC 2011

2 files changed, 173 insertions, 8 deletions

diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index 1426765a8..aa2be0e57 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 50284 2011-06-27 19:43:47Z ibiru $
+# $Id: PKGBUILD 51016 2011-07-04 12:35:27Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk')
 pkgver=4.0.10
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -16,7 +16,8 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}
         virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch
         10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh
         18-system-xorg.patch
-        change_default_driver_dir.patch)
+        change_default_driver_dir.patch
+        usb-2.0.patch)
 _kernver=2.6.39-ARCH
 
 build() {
@@ -27,6 +28,7 @@ build() {
     patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
     patch -Np1 -i "$srcdir/18-system-xorg.patch"
     patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
+    patch -Np0 -i "$srcdir/usb-2.0.patch"
 
     cp "$srcdir/LocalConfig.kmk" .
 
@@ -46,9 +48,7 @@ build() {
 package_virtualbox() {
     pkgdesc="Powerful x86 virtualization for enterprise as well as home use"
     depends=('libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng' 'kernel26-headers' 'gcc' 'make')
-    optdepends=('libxt: for shared clipboard'
-                'python2: for python support'
-                'qt: for VirtualBox GUI'
+    optdepends=('qt: for VirtualBox GUI'
                 'vde2: Virtual Distributed Ethernet support'
                 'virtualbox-sdk: developer kit')
 
@@ -75,6 +75,8 @@ package_virtualbox() {
     ln -sf VBox "$pkgdir/usr/bin/VirtualBox"
     ln -sf VBox "$pkgdir/usr/bin/virtualbox"
     ln -sf VBox "$pkgdir/usr/bin/vboxwebsrv"
+    ln -sf VBox "$pkgdir/usr/bin/VBoxBalloonCtrl"
+    ln -sf VBox "$pkgdir/usr/bin/vboxballoonctrl"
 
     install -m 0755 VBoxTunctl "$pkgdir/usr/bin"
 
@@ -88,7 +90,7 @@ package_virtualbox() {
     #setuid root binaries
     install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox"
     #other binaries
-    install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
+    install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
 
     #language
     install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
@@ -128,6 +130,7 @@ package_virtualbox() {
 
 package_virtualbox-sdk() {
     pkgdesc=" VirtualBox Software Developer Kit (SDK)"
+    depends=('python2')
 
     mkdir -p "$pkgdir/usr/lib/virtualbox"
 
@@ -214,4 +217,5 @@ md5sums=('956af570597850ab4d3275b54bbed049'
          'c1a07f044c476a190af8486fe78bee0f'
          '47da2e88de582bb2bab14580a3aa47b1'
          '8a22b33c9dfaf8fb79bb2d26304e650b'
-         'ac43f7cf44b934d8dbdbc3bb6f7879ad')
+         'ac43f7cf44b934d8dbdbc3bb6f7879ad'
+         '696002ad0017512fc27781b07259f37c')
diff --git a/community/virtualbox/usb-2.0.patch b/community/virtualbox/usb-2.0.patch
new file mode 100644
index 000000000..38aa36ef4
--- /dev/null
+++ b/community/virtualbox/usb-2.0.patch
@@ -0,0 +1,161 @@
+Index: Config.kmk
+===================================================================
+--- Config.kmk	(revision 37751)
++++ 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
+===================================================================
+--- src/VBox/Devices/Makefile.kmk	(revision 37751)
++++ 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
+===================================================================
+--- src/VBox/Devices/build/VBoxDD.cpp	(revision 37751)
++++ 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
+===================================================================
+--- src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp	(revision 37751)
++++ 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
+===================================================================
+--- src/VBox/Devices/testcase/tstDeviceStructSize.cpp	(revision 37751)
++++ 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
+===================================================================
+--- src/VBox/Devices/testcase/Makefile.kmk	(revision 37751)
++++ 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,) \