diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-14 10:53:59 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-14 10:53:59 -0300 |
commit | 1fafdadaae260eaef7194102b5eb842466e63dd1 (patch) | |
tree | 734ab5c097f5a2ed36c2a7049d44f9c2bb46dede /community/virtualbox/PKGBUILD | |
parent | 1f52af629b1911ab027ef9c5d4d5903b48792050 (diff) | |
parent | 6dab5c46b00f624c7900ff6d11b75bcafbe251d0 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/unpaper/PKGBUILD
community/virtualbox/PKGBUILD
core/crda/PKGBUILD
core/eventlog/PKGBUILD
extra/v86d/PKGBUILD
extra/vlc/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'community/virtualbox/PKGBUILD')
-rw-r--r-- | community/virtualbox/PKGBUILD | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index 4e1537f93..4dc9a2aae 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,19 +1,21 @@ -# $Id: PKGBUILD 42565 2011-03-17 13:26:20Z ibiru $ +# $Id: PKGBUILD 44881 2011-04-12 11:57:31Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') pkgver=4.0.4 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url='http://virtualbox.org' license=('GPL' 'custom') makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' -'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers>=2.6.38' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2') +'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers>=2.6.38' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2' +'xorg-server-devel' 'xf86driproto' 'libxcomposite') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 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) + 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh + 18-system-xorg.patch) _kernver=2.6.38-ARCH build() { @@ -22,6 +24,7 @@ build() { patch -Np1 -i "$srcdir/virtualbox-4-makeself-check.patch" patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch" patch -Np1 -i "$srcdir/vboxdrv-reference.patch" + patch -Np1 -i "$srcdir/18-system-xorg.patch" cp "$srcdir/LocalConfig.kmk" . @@ -160,9 +163,9 @@ package_virtualbox-guest-additions(){ "$pkgdir"/usr/bin/VBoxClient-all install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \ "$pkgdir"/etc/xdg/autostart/vboxclient.desktop - install -D vboxmouse_drv_19.so \ + install -D vboxmouse_drv.so \ "$pkgdir/usr/lib/xorg/modules/input/vboxmouse.so" - install -D vboxvideo_drv_19.so \ + install -D vboxvideo_drv.so \ "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so" install -d "$pkgdir/usr/lib/xorg/modules/dri" install -m755 VBoxOGL*.so "$pkgdir/usr/lib" @@ -207,4 +210,5 @@ md5sums=('b4770ca14d1a8cbad9b3eb0e0028ff4b' 'ed1341881437455d9735875ddf455fbe' '94514e006e73cc2fa90259a4e0eec04b' '0f3f273cdbc54db221f737ad4f761c11' - '47da2e88de582bb2bab14580a3aa47b1') + '47da2e88de582bb2bab14580a3aa47b1' + '8a22b33c9dfaf8fb79bb2d26304e650b') |