diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-12 11:24:37 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-12 11:24:37 -0300 |
| commit | 1f52af629b1911ab027ef9c5d4d5903b48792050 (patch) | |
| tree | e975475390c79c3dd975c95091f3bb33beff24e5 /community/virtualbox | |
| parent | 951244a3e5bdc5f2f029f6550b46e5a06d1bfa26 (diff) | |
| parent | 28b5bbf3fee0627993658e096eadab71c2779912 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/llvm/PKGBUILD
community/dsniff/PKGBUILD
community/ngrep/PKGBUILD
community/virtualbox/PKGBUILD
extra/gstreamer0.10-good/PKGBUILD
extra/lirc/PKGBUILD
extra/mc/PKGBUILD
extra/mesa/PKGBUILD
extra/xfburn/PKGBUILD
testing/gnome-panel/PKGBUILD
Diffstat (limited to 'community/virtualbox')
| -rw-r--r-- | community/virtualbox/PKGBUILD | 13 | ||||
| -rw-r--r-- | community/virtualbox/virtualbox-guest-modules.install | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index a3e2ff520..4e1537f93 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 41913 2011-03-11 00:29:44Z ibiru $ +# $Id: PKGBUILD 42565 2011-03-17 13:26:20Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') pkgver=4.0.4 -pkgrel=2 +pkgrel=3 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.37' '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') [[ $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) -_kernver=2.6.37-ARCH +_kernver=2.6.38-ARCH build() { cd "$srcdir/VirtualBox-${pkgver}_OSE" @@ -43,7 +43,6 @@ package_virtualbox() { depends=('libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng' 'kernel26-headers' 'gcc' 'make') optdepends=('libxt: for shared clipboard' 'python2: for python support' - 'java-runtime: java bindings' 'qt: for VirtualBox GUI' 'vde2: Virtual Distributed Ethernet support' 'virtualbox-sdk: developer kit') @@ -140,7 +139,7 @@ package_virtualbox-sdk() { } package_virtualbox-guest-additions(){ pkgdesc="VirtualBox user-space tools for Linux guests" - depends=("virtualbox-guest-modules=$pkgver" 'gcc-libs' 'libxmu') + depends=("virtualbox-guest-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr') replaces=('virtualbox-ose-additions') conflicts=('virtualbox-ose-additions') @@ -175,7 +174,7 @@ package_virtualbox-guest-modules(){ pkgdesc="VirtualBox kernel modules for Linux guests" license=('GPL') install=virtualbox-guest-modules.install - depends=('kernel26>=2.6.37' 'kernel26<2.6.38') + depends=('kernel26>=2.6.38' 'kernel26<2.6.39') replaces=('virtualbox-ose-additions-modules') conflicts=('virtualbox-ose-additions-modules') diff --git a/community/virtualbox/virtualbox-guest-modules.install b/community/virtualbox/virtualbox-guest-modules.install index 51389ca87..3681c28e3 100644 --- a/community/virtualbox/virtualbox-guest-modules.install +++ b/community/virtualbox/virtualbox-guest-modules.install @@ -1,4 +1,4 @@ -KERNEL_VERSION='2.6.37-ARCH' +KERNEL_VERSION='2.6.38-ARCH' post_install() { cat << EOM |