From 4d5b27db6702e5d92ca0f26853cc6c783ed61294 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 15 Oct 2013 17:52:49 +0200 Subject: [PATCH] virtualbox-ose: update to 4.3.0. --- srcpkgs/virtualbox-ose/files/LocalConfig.kmk | 1 + .../patches/change_default_driver_dir.patch | 18 ------------------ srcpkgs/virtualbox-ose/template | 17 +++++++++-------- 3 files changed, 10 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/virtualbox-ose/patches/change_default_driver_dir.patch diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk index 7f674f3053d..24fe5fbbeee 100644 --- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk +++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk @@ -16,3 +16,4 @@ VBOX_WITH_UPDATE_REQUEST = #VBOX_WITH_VNC := 1 VBOX_GCC_WERR = #VBOX_GCC_WARN = +USERNAME = builder@void diff --git a/srcpkgs/virtualbox-ose/patches/change_default_driver_dir.patch b/srcpkgs/virtualbox-ose/patches/change_default_driver_dir.patch deleted file mode 100644 index d8531499dcc..00000000000 --- a/srcpkgs/virtualbox-ose/patches/change_default_driver_dir.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c ---- VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-07-19 15:11:37.903456612 +0000 -+++ VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-07-19 15:12:41.024021274 +0000 -@@ -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:/usr/lib/x86_64-linux-gnu/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:/usr/lib/i386-linux-gnu/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/template b/srcpkgs/virtualbox-ose/template index 4e7e6713753..7c039a1bba5 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -1,6 +1,6 @@ # Template file for 'virtualbox-ose' pkgname=virtualbox-ose -_vbox_distver=4.2.18 +_vbox_distver=4.3.0 version=${_vbox_distver} revision=1 wrksrc="VirtualBox-${version}" @@ -10,12 +10,12 @@ maintainer="Juan RP " homepage="http://virtualbox.org" license="GPL-2, MPL-1.1, CDDL" distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2" -checksum=9dbddf393b029c549249f627d12040c1d257972bc09292969b8819a31ab78d74 +checksum=8ea8988a041163c34bff1da6b278d7729cecd4596f5eb778575c5ac9ac95bc12 only_for_archs="i686 x86_64" -hostmakedepends="which pkg-config dev86 yasm acpica-utils" -makedepends="openssl-devel libcurl-devel libpng-devel>=1.6 +hostmakedepends="which perl pkg-config dev86 yasm acpica-utils" +makedepends="openssl-devel libcurl-devel libpng-devel>=1.6 libvpx-devel alsa-lib-devel pulseaudio-devel SDL-devel qt-devel libXcursor-devel libXinerama-devel libXcomposite-devel libIDL-devel libglib-devel pam-devel python-devel libxslt-devel libcap-devel xorg-server-devel>=1.14 @@ -59,7 +59,7 @@ do_install() { # setuid install -m4755 VBoxHeadless VBoxSDL VBoxNetDHCP VBoxNetAdpCtl \ - VirtualBox VBoxBFE -t ${DESTDIR}/usr/lib/virtualbox + VirtualBox -t ${DESTDIR}/usr/lib/virtualbox install -m0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD \ VBoxTestOGL VBoxBalloonCtrl \ @@ -130,7 +130,8 @@ virtualbox-ose-guest_package() { source ${wrksrc}/env.sh cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions - install -d ${PKGDESTDIR}/usr/bin ${PKGDESTDIR}/usr/sbin + vmkdir usr/bin + vmkdir usr/sbin install -m755 VBoxClient VBoxControl VBoxService ${PKGDESTDIR}/usr/bin install -m755 mount.vboxsf ${PKGDESTDIR}/usr/sbin @@ -140,10 +141,10 @@ virtualbox-ose-guest_package() { cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions install -D vboxvideo_drv.so \ ${PKGDESTDIR}/usr/lib/xorg/modules/drivers/vboxvideo.so - install -d ${PKGDESTDIR}/usr/lib/xorg/modules/dri + install -d ${PKGDESTDIR}/usr/lib/xorg/modules/drivers install -m755 VBoxOGL*.so ${PKGDESTDIR}/usr/lib ln -sf /usr/lib/VBoxOGL.so \ - ${PKGDESTDIR}/usr/lib/xorg/modules/dri/vboxvideo_dri.so + ${PKGDESTDIR}/usr/lib/xorg/modules/drivers/vboxvideo_dri.so cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions install -Dm755 pam_vbox.so ${PKGDESTDIR}/usr/lib/security/pam_vbox.so