diff options
Diffstat (limited to 'community/virtualbox')
-rw-r--r-- | community/virtualbox/PKGBUILD | 15 | ||||
-rw-r--r-- | community/virtualbox/change_default_driver_dir.patch | 18 |
2 files changed, 26 insertions, 7 deletions
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index ceb932b9e..ee557ebee 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 47152 2011-05-17 18:01:10Z ibiru $ +# $Id: PKGBUILD 47286 2011-05-20 18:13:22Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') pkgver=4.0.8 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=2 +arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' @@ -15,8 +15,8 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver} http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf 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) -_kernver=2.6.38-ARCH + 18-system-xorg.patch +_kernver=2.6.38-LIBRE build() { cd "$srcdir/VirtualBox-${pkgver}_OSE" @@ -25,6 +25,7 @@ build() { patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch" patch -Np1 -i "$srcdir/vboxdrv-reference.patch" patch -Np1 -i "$srcdir/18-system-xorg.patch" + patch -Np1 -i "$srcdir/change_default_driver_dir.patch" cp "$srcdir/LocalConfig.kmk" . @@ -170,7 +171,6 @@ package_virtualbox-guest-additions(){ install -d "$pkgdir/usr/lib/xorg/modules/dri" install -m755 VBoxOGL*.so "$pkgdir/usr/lib" ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so" - ln -s /usr/lib/xorg/modules/dri "$pkgdir/usr/lib/dri" install -m755 -D pam_vbox.so "$pkgdir/lib/security/pam_vbox.so" } @@ -212,4 +212,5 @@ md5sums=('a3e81289f2357fcf4bbe3e77805f38b6' '9bde5b7dfba5abcd49768052c5409800' 'c1a07f044c476a190af8486fe78bee0f' '47da2e88de582bb2bab14580a3aa47b1' - '8a22b33c9dfaf8fb79bb2d26304e650b') + '8a22b33c9dfaf8fb79bb2d26304e650b' + 'ac43f7cf44b934d8dbdbc3bb6f7879ad') diff --git a/community/virtualbox/change_default_driver_dir.patch b/community/virtualbox/change_default_driver_dir.patch new file mode 100644 index 000000000..71930f062 --- /dev/null +++ b/community/virtualbox/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) \ |