From a87ba3cd0fac8d91b5c3f6d080c18809ab2755ac Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Tue, 14 Apr 2009 13:50:01 +0000 Subject: [PATCH] virtualbox: updated to 2.2.0 --- virtualbox/.footprint | 34 ++++++++++++++++++++++++++++++++++ virtualbox/.md5sum | 2 +- virtualbox/Pkgfile | 24 ++++++------------------ virtualbox/README | 2 +- 4 files changed, 42 insertions(+), 20 deletions(-) diff --git a/virtualbox/.footprint b/virtualbox/.footprint index c2e10013a..6be2cd8cd 100644 --- a/virtualbox/.footprint +++ b/virtualbox/.footprint @@ -20,6 +20,7 @@ drwxr-xr-x root/root usr/share/pixmaps/ -rw-r--r-- root/root usr/share/pixmaps/virtualbox.png drwxr-xr-x root/root usr/share/virtualbox/ drwxr-xr-x root/root usr/share/virtualbox/bin/ +-rwxr-xr-x root/root usr/share/virtualbox/bin/SUPLoggerCtl -rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxBFE -rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxDD.so -rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxDD2.so @@ -32,6 +33,11 @@ drwxr-xr-x root/root usr/share/virtualbox/bin/ -rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxHeadless -rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxKeyboard.so -rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxManage +-rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxNetAdpCtl +-rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxNetDHCP +-rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxOGLhostcrutil.so +-rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxOGLhosterrorspu.so +-rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxOGLrenderspu.so -rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxPython.so -rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxREM.so -rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxREM32.so @@ -41,11 +47,13 @@ drwxr-xr-x root/root usr/share/virtualbox/bin/ -rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxSVC -rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxSettings.so -rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxSharedClipboard.so +-rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxSharedCrOpenGL.so -rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxSharedFolders.so -rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxSysInfo.sh -rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxTunctl -rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxVMM.so -rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxXPCOM.so +-rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxXPCOMC.so -rwxr-xr-x root/root usr/share/virtualbox/bin/VBoxXPCOMIPCD -rwxr-xr-x root/root usr/share/virtualbox/bin/VMMGC.gc -rwxr-xr-x root/root usr/share/virtualbox/bin/VMMR0.r0 @@ -54,6 +62,9 @@ drwxr-xr-x root/root usr/share/virtualbox/bin/ drwxr-xr-x root/root usr/share/virtualbox/bin/additions/ -rwxr-xr-x root/root usr/share/virtualbox/bin/additions/VBoxClient -rwxr-xr-x root/root usr/share/virtualbox/bin/additions/VBoxControl +-rwxr-xr-x root/root usr/share/virtualbox/bin/additions/VBoxOGLcrutil.so +-rwxr-xr-x root/root usr/share/virtualbox/bin/additions/VBoxOGLerrorspu.so +-rwxr-xr-x root/root usr/share/virtualbox/bin/additions/autorun.sh -rwxr-xr-x root/root usr/share/virtualbox/bin/additions/mountvboxsf drwxr-xr-x root/root usr/share/virtualbox/bin/additions/src/ -rw-r--r-- root/root usr/share/virtualbox/bin/additions/src/Makefile @@ -220,6 +231,11 @@ drwxr-xr-x root/root usr/share/virtualbox/bin/additions/src/vboxvfs/r0drv/linux/ -rw-r--r-- root/root usr/share/virtualbox/bin/additions/src/vboxvfs/version-generated.h -rw-r--r-- root/root usr/share/virtualbox/bin/additions/src/vboxvfs/vfsmod.c -rw-r--r-- root/root usr/share/virtualbox/bin/additions/src/vboxvfs/vfsmod.h +drwxr-xr-x root/root usr/share/virtualbox/bin/additions/src/vboxvideo_drm/ +-rw-r--r-- root/root usr/share/virtualbox/bin/additions/src/vboxvideo_drm/Makefile +-rwxr-xr-x root/root usr/share/virtualbox/bin/additions/src/vboxvideo_drm/build_in_tmp +-rw-r--r-- root/root usr/share/virtualbox/bin/additions/src/vboxvideo_drm/vboxvideo_drm.c +-rw-r--r-- root/root usr/share/virtualbox/bin/additions/src/vboxvideo_drm/vboxvideo_drm.h -rwxr-xr-x root/root usr/share/virtualbox/bin/additions/vboxadd-timesync -rwxr-xr-x root/root usr/share/virtualbox/bin/additions/vboxmouse_drv.o -rwxr-xr-x root/root usr/share/virtualbox/bin/additions/vboxmouse_drv_14.so @@ -244,6 +260,11 @@ drwxr-xr-x root/root usr/share/virtualbox/bin/sdk/ drwxr-xr-x root/root usr/share/virtualbox/bin/sdk/bindings/ -rwxr-xr-x root/root usr/share/virtualbox/bin/sdk/bindings/VirtualBox.xidl drwxr-xr-x root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/ +drwxr-xr-x root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/cbinding/ +-rw-r--r-- root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/cbinding/VBoxXPCOMCGlue.c +-rw-r--r-- root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/cbinding/VBoxXPCOMCGlue.h +drwxr-xr-x root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/cbinding/samples/ +-rw-r--r-- root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/cbinding/samples/Makefile drwxr-xr-x root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/idl/ -rw-r--r-- root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/idl/VirtualBox_XPCOM.idl -rw-r--r-- root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/idl/ipcIClientObserver.idl @@ -338,6 +359,7 @@ drwxr-xr-x root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/idl/ -rw-r--r-- root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/idl/nsIXPTLoader.idl -rw-r--r-- root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/idl/nsrootidl.idl drwxr-xr-x root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/include/ +-rw-r--r-- root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/include/VBoxCAPI_v2_2.h -rw-r--r-- root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/include/VirtualBox_XPCOM.h -rw-r--r-- root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/include/ipcIClientObserver.h -rw-r--r-- root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/include/ipcIDConnectService.h @@ -443,6 +465,7 @@ drwxr-xr-x root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/include/nsprpub -rw-r--r-- root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/include/nsprpub/md/_darwin.h -rw-r--r-- root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/include/nsprpub/md/_freebsd.cfg -rw-r--r-- root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/include/nsprpub/md/_freebsd.h +-rw-r--r-- root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/include/nsprpub/md/_iprt_atomic.h -rw-r--r-- root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/include/nsprpub/md/_l4v2.cfg -rw-r--r-- root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/include/nsprpub/md/_l4v2.h -rw-r--r-- root/root usr/share/virtualbox/bin/sdk/bindings/xpcom/include/nsprpub/md/_linux.cfg @@ -1168,7 +1191,13 @@ drwxr-xr-x root/root usr/share/virtualbox/lib/ -rwxr-xr-x root/root usr/share/virtualbox/lib/ServicesR0.a -rwxr-xr-x root/root usr/share/virtualbox/lib/VBox-liblzf.a -rwxr-xr-x root/root usr/share/virtualbox/lib/VBoxCOM.a +-rwxr-xr-x root/root usr/share/virtualbox/lib/VBoxOGLcrserverlib.a +-rwxr-xr-x root/root usr/share/virtualbox/lib/VBoxOGLcrunpacker.a +-rwxr-xr-x root/root usr/share/virtualbox/lib/VBoxOGLhostcrpacker.a +-rwxr-xr-x root/root usr/share/virtualbox/lib/VBoxOGLhostcrstate.a +-rwxr-xr-x root/root usr/share/virtualbox/lib/VBoxOGLhostspuload.a -rwxr-xr-x root/root usr/share/virtualbox/lib/VBoxREM.so +-rwxr-xr-x root/root usr/share/virtualbox/lib/VBoxXPCOMCGlue.a -rwxr-xr-x root/root usr/share/virtualbox/lib/VBoxXPCOMGlue.a -rwxr-xr-x root/root usr/share/virtualbox/lib/VMMR3.a -rwxr-xr-x root/root usr/share/virtualbox/lib/VgaBiosBin.a @@ -1177,8 +1206,13 @@ drwxr-xr-x root/root usr/share/virtualbox/lib/additions/ -rwxr-xr-x root/root usr/share/virtualbox/lib/additions/RuntimeGuestR0.a -rwxr-xr-x root/root usr/share/virtualbox/lib/additions/RuntimeGuestR3.a -rwxr-xr-x root/root usr/share/virtualbox/lib/additions/RuntimeGuestR3Mini.a +-rwxr-xr-x root/root usr/share/virtualbox/lib/additions/RuntimeGuestR3Shared.a -rwxr-xr-x root/root usr/share/virtualbox/lib/additions/VBoxGuestR0Lib.a -rwxr-xr-x root/root usr/share/virtualbox/lib/additions/VBoxGuestR0LibBase.a -rwxr-xr-x root/root usr/share/virtualbox/lib/additions/VBoxGuestR3Lib.a -rwxr-xr-x root/root usr/share/virtualbox/lib/additions/VBoxGuestR3LibShared.a -rwxr-xr-x root/root usr/share/virtualbox/lib/additions/VBoxGuestR3LibXFree86.a +-rwxr-xr-x root/root usr/share/virtualbox/lib/additions/VBoxOGLcrpacker.a +-rwxr-xr-x root/root usr/share/virtualbox/lib/additions/VBoxOGLcrstate.a +-rwxr-xr-x root/root usr/share/virtualbox/lib/additions/VBoxOGLspuload.a +-rwxr-xr-x root/root usr/share/virtualbox/lib/libXcomposite.so diff --git a/virtualbox/.md5sum b/virtualbox/.md5sum index f8aea7121..337097903 100644 --- a/virtualbox/.md5sum +++ b/virtualbox/.md5sum @@ -1,4 +1,4 @@ 2a2724088f65d0a373a689209bb4d938 60-vboxdrv.rules -54548336d61b33e2a01b210b314927cd VirtualBox-2.1.4-3-OSE.tar.bz2 +37bd7d58cf7b6c46998cfd82c1b70573 VirtualBox-2.2.0-OSE.tar.bz2 d365878a0f2f0a738a093a6bc48293be virtualbox 362e923d42651f370561b0f9095ea7a5 virtualbox.desktop diff --git a/virtualbox/Pkgfile b/virtualbox/Pkgfile index 4bc9ba7ef..af7592a0b 100644 --- a/virtualbox/Pkgfile +++ b/virtualbox/Pkgfile @@ -5,30 +5,18 @@ # Depends on: bin86,dev86,hal,libsdl,libidl,qt4,xalan-c,iasl,xorg-libxmu,libcap name=virtualbox -version=2.1.4-3 +version=2.2.0 release=1 source=(http://download.virtualbox.org/$name/${version%-*}/VirtualBox-$version-OSE.tar.bz2 \ $name 60-vboxdrv.rules $name.desktop) build() { - KVER=$(uname -r) - [ ! -z $KDIR ] && KARG="KERN_DIR=$KDIR" - - local QT3GUI QT4GUI - if [ "$(pkginfo -i | grep '^qt3 ')" ]; then - QT3GUI="--with-qt-dir=/usr/share/qt" - else - QT3GUI="--disable-qt3" - fi - if [ "$(pkginfo -i | grep '^qt4 ')" ]; then - QT4GUI="--with-qt4-dir=/usr/share/qt4" - else - QT4GUI="--disable-qt4" - fi + # environment value + [ ! -z $KERN_DIR ] && KARG="KERN_DIR=$KERN_DIR" cd VirtualBox-${version%-*}_OSE # compile - ./configure $QT3GUI $QT4GUI \ + ./configure --with-qt4-dir=/usr/share/qt4 \ --disable-hardening \ --ose \ --disable-pulse @@ -38,8 +26,8 @@ build() { cd out/linux.x86/release/bin/src make $KARG # install kernel modules - install -D -m 0644 vboxdrv.ko $PKG/lib/modules/$KVER/kernel/drivers/misc/vboxdrv.ko - install -D -m 0644 vboxnetflt.ko $PKG/lib/modules/$KVER/kernel/drivers/misc/vboxnetflt.ko + install -D -m 0644 vboxdrv.ko $PKG/lib/modules/$(uname -r)/kernel/drivers/misc/vboxdrv.ko + install -D -m 0644 vboxnetflt.ko $PKG/lib/modules/$(uname -r)/kernel/drivers/misc/vboxnetflt.ko # remove superfluous files rm -rf $SRC/VirtualBox-${version%-*}_OSE/out/linux.x86/release/bin/{sdk/samples,testcase,nls*} find $SRC/VirtualBox-${version%-*}_OSE/out/linux.x86/release/bin -type f -name 'tst*' -exec rm -rf {} \; diff --git a/virtualbox/README b/virtualbox/README index 376f97876..e9965a028 100644 --- a/virtualbox/README +++ b/virtualbox/README @@ -41,7 +41,7 @@ PRECAUTION Virtualbox by default uses /usr/src/linux as the source directory of your Linux kernel. To use an alternative kernel directory you should type something like: - # env KDIR=/not-default-path/src/linux pkgmk + # env KERN_DIR=/not-default-path/src/linux pkgmk If you have problems trying to update virtualbox (xalan-c not found...) use this command to solve it: