diff options
author | root <root@rshg047.dnsready.net> | 2011-07-20 23:12:48 +0000 |
---|---|---|
committer | root <root@rshg047.dnsready.net> | 2011-07-20 23:12:48 +0000 |
commit | 34b339c5913a55cb5bac8a502696fcd3f54aac0f (patch) | |
tree | 9713cc16d431b99b598b3d019281b713ab07420a /community | |
parent | 3da6b13f1eb136d0899bd2e8dd217048bb4d9030 (diff) |
Wed Jul 20 23:12:48 UTC 2011
Diffstat (limited to 'community')
-rw-r--r-- | community/ario/PKGBUILD | 23 | ||||
-rw-r--r-- | community/ario/ario.changelog | 3 | ||||
-rw-r--r-- | community/dmenu/PKGBUILD | 6 | ||||
-rw-r--r-- | community/fityk/PKGBUILD | 10 | ||||
-rw-r--r-- | community/gammu/PKGBUILD | 8 | ||||
-rw-r--r-- | community/gammu/gammu.changelog | 33 | ||||
-rw-r--r-- | community/libraw/PKGBUILD | 6 | ||||
-rw-r--r-- | community/minidlna/PKGBUILD | 6 | ||||
-rw-r--r-- | community/monit/PKGBUILD | 6 | ||||
-rw-r--r-- | community/monit/monit.changelog | 3 | ||||
-rw-r--r-- | community/qlandkartegt/PKGBUILD | 6 | ||||
-rw-r--r-- | community/qlandkartegt/qlandkartegt.changelog | 3 | ||||
-rw-r--r-- | community/qps/PKGBUILD | 12 | ||||
-rw-r--r-- | community/quassel/PKGBUILD | 6 | ||||
-rw-r--r-- | community/sfml/PKGBUILD | 4 | ||||
-rw-r--r-- | community/vifm/PKGBUILD | 25 | ||||
-rw-r--r-- | community/vifm/vifm.changelog | 5 | ||||
-rw-r--r-- | community/virtualbox/PKGBUILD | 67 | ||||
-rw-r--r-- | community/virtualbox/change_default_driver_dir.patch | 10 | ||||
-rw-r--r-- | community/virtualbox/vboxdrv-reference.patch | 20 | ||||
-rwxr-xr-x | community/virtualbox/vboxdrv.sh | 14 | ||||
-rw-r--r-- | community/virtualbox/virtualbox-archlinux-modules.install | 24 | ||||
-rw-r--r-- | community/virtualbox/virtualbox.install | 22 |
23 files changed, 158 insertions, 164 deletions
diff --git a/community/ario/PKGBUILD b/community/ario/PKGBUILD index d1a739a4c..cc59a56fd 100644 --- a/community/ario/PKGBUILD +++ b/community/ario/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 41557 2011-03-07 20:04:50Z icelaya $ +# $Id: PKGBUILD 52022 2011-07-19 19:38:14Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=ario -pkgver=1.5 -pkgrel=2 +pkgver=1.5.1 +pkgrel=1 pkgdesc="A GTK client for MPD (Music player daemon) inspired by Rhythmbox but much lighter and faster" arch=('i686' 'x86_64') url="http://ario-player.sourceforge.net/" license=('GPL') -depends=('avahi' 'curl' 'dbus-glib' 'gnutls' 'hicolor-icon-theme' 'libglade' 'libmpdclient' 'libnotify' 'libsoup>=2.4' 'libunique' 'taglib' 'xdg-utils') +depends=('avahi' 'curl' 'dbus-glib' 'gnutls' 'hicolor-icon-theme' 'libglade' 'libmpdclient' 'libnotify' 'libsoup' 'libunique' 'taglib' 'xdg-utils') makedepends=('intltool' 'perlxml') options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog -source=("http://downloads.sourceforge.net/sourceforge/$pkgname-player/$pkgname-$pkgver.tar.gz" - 'ario-1.5-libnotify-0.7.patch') -md5sums=('5dac6cc8b8f12b0acc132d5ff7fc779f' - 'e5ac8d29f39365f5da86934ac03e0bca') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname-player/$pkgname-$pkgver.tar.gz) +sha256sums=('0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e') build() { cd ${srcdir}/$pkgname-$pkgver - patch -p0 -i $srcdir/ario-1.5-libnotify-0.7.patch - ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 + make + } + +package () { + cd ${srcdir}/$pkgname-$pkgver + make DESTDIR=${pkgdir} install } diff --git a/community/ario/ario.changelog b/community/ario/ario.changelog index 8f906a6a3..d2839893f 100644 --- a/community/ario/ario.changelog +++ b/community/ario/ario.changelog @@ -1,3 +1,6 @@ +2011-07-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 1.5.1 + 2010-08-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * Update to major release 1.5 diff --git a/community/dmenu/PKGBUILD b/community/dmenu/PKGBUILD index 1e72b3f35..a9dc8a15f 100644 --- a/community/dmenu/PKGBUILD +++ b/community/dmenu/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 51710 2011-07-13 12:57:23Z spupykin $ +# $Id: PKGBUILD 52072 2011-07-19 21:43:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> pkgname=dmenu -pkgver=4.3.1 +pkgver=4.4 pkgrel=1 pkgdesc="A generic menu for X" url="http://tools.suckless.org/dmenu/" @@ -13,7 +13,7 @@ arch=('i686' 'x86_64') license=('MIT') depends=('sh' 'libxinerama') source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz") -md5sums=('6b619f6901bf4765442b4e410b1e5410') +md5sums=('ae1902fc37716f739836fddce6123ebc') build(){ cd $srcdir/$pkgname-$pkgver diff --git a/community/fityk/PKGBUILD b/community/fityk/PKGBUILD index 14552b927..dff9a66b3 100644 --- a/community/fityk/PKGBUILD +++ b/community/fityk/PKGBUILD @@ -3,18 +3,18 @@ # Contributor: Cuneyt Unlu <unlucu AT gmail.com> pkgname=fityk -pkgver=1.0.2 +pkgver=1.1.0 pkgrel=1 pkgdesc='A program for nonlinear fitting of analytical functions to data.' arch=('i686' 'x86_64') url='http://www.unipress.waw.pl/fityk/' license=('GPL') -depends=('boost-libs' 'xylib' 'wxgtk' 'shared-mime-info') -makedepends=('boost' 'git' 'python-sphinx') +depends=('xylib' 'shared-mime-info' 'lua' 'gnuplot') # wxgtk supplied by statically linked wxWidgets +makedepends=('boost' 'git' 'python-sphinx' 'swig') options=('!libtool') -install=${pkgname}.install +install='fityk.install' source=('http://biolpc22.york.ac.uk/pub/Daily_HEAD/wxWidgets.tar.gz') # daily snapshot because fityk requires a version that hasn't been released yet... -md5sums=('71a465a1d60c33c33b644d15ba23f30b') +md5sums=('c1dc712e43a84bf0ff4bee839eb00e88') build() { cd wxWidgets diff --git a/community/gammu/PKGBUILD b/community/gammu/PKGBUILD index 49fd5a554..7ede3ead2 100644 --- a/community/gammu/PKGBUILD +++ b/community/gammu/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 42312 2011-03-16 10:51:16Z jelle $ +# $Id: PKGBUILD 52053 2011-07-19 20:30:49Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=gammu -pkgver=1.29.0 -pkgrel=2 +pkgver=1.30.0 +pkgrel=1 pkgdesc="GNU All Mobile Management Utilities" arch=('i686' 'x86_64') url="http://wammu.eu/" @@ -16,7 +16,7 @@ makedepends=('cmake' 'doxygen' 'mysql') optdepends=('dialog: support for the gammu-config script') options=('!makeflags') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('5a860f37519fab3d2e7a42349b413738') +md5sums=('5bb061f1299e7ae8d38ecac1b8b11465') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gammu/gammu.changelog b/community/gammu/gammu.changelog index e3038c41e..a66ae1b50 100644 --- a/community/gammu/gammu.changelog +++ b/community/gammu/gammu.changelog @@ -1,7 +1,3 @@ -2011-01-27 Ray Rashif <schiv@archlinux.org> - - * Version bump: 1.29.0 - 2010-06-29 Ray Rashif <schiv@archlinux.org> * Version bump: 1.27.94 @@ -12,10 +8,7 @@ src now from sourceforge * ChangeLog: changed to gammu.changelog - -2010-01-05 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 1.27.0 + only important changes will be logged 2009-09-19 Biru Ionut <ionut@archlinux.ro> @@ -28,10 +21,6 @@ * PKGBUILD: moved python from makedepends to depends due to gammu substituting python-gammu -2009-07-14 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 1.25.0 - 2009-04-14 Corrado Primier <bardo@aur.archlinux.org> * Release bump: 2 @@ -39,20 +28,12 @@ * PKGBUILD: forgot to add python-gammu to conflicts and provides arrays, also added doxygen to makedepends -2009-04-14 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 1.23.1 - 2009-02-15 Corrado Primier <bardo@aur.archlinux.org> * Release bump: 2 * PKGBUILD: substituted bluez-libs dependency with bluez -2009-01-17 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 1.22.1 - 2008-10-27 Corrado Primier <bardo@aur.archlinux.org> * Version bump: 1.21.0 @@ -68,14 +49,6 @@ * gammu.install: removed post_upgrade() function -2008-03-07 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 1.19.0 - -2008-01-30 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 1.18.0 - 2008-01-23 Corrado Primier <bardo@aur.archlinux.org> * Version bump: 1.17.0 @@ -90,10 +63,6 @@ * ChangeLog: adapted to "official" specifications -2007-12-06 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 1.15.0 - 2007-11-05 Corrado Primier <bardo@aur.archlinux.org> * gammu: adopted from [extra] diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD index f3de9ef59..73661a48b 100644 --- a/community/libraw/PKGBUILD +++ b/community/libraw/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 51368 2011-07-08 01:02:45Z bfanella $ +# $Id: PKGBUILD 52082 2011-07-20 03:04:09Z bfanella $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=libraw _pkgbasename=LibRaw -pkgver=0.13.6 +pkgver=0.13.7 pkgrel=1 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ license=('CDDL' 'LGPL' 'custom') depends=('lcms') options=('!makeflags') source=(http://www.libraw.org/data/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('452bff308af4bfcb9bf1c2fdb0bd0eab') +md5sums=('5c189e16d61f423162da57333b7c8873') build() { cd ${srcdir}/${_pkgbasename}-${pkgver} diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index 18cba3694..3519f0e90 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 49069 2011-06-10 08:44:02Z spupykin $ +# $Id: PKGBUILD 52058 2011-07-19 20:43:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> # Contributor: Matthias Sobczyk <matthias.sobczyk@googlemail.com> pkgname=minidlna -pkgver=1.0.20 +pkgver=1.0.21 pkgrel=1 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ conflicts=('minidlna-cvs') backup=('etc/minidlna.conf') source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz minidlna.rc) -md5sums=('1c5230cc6dec7592eca4c63c526eadb7' +md5sums=('a53e0008ad225843a1782e4af6e5bf0b' '80c423f003894ad15d7de41f3ed342c0') build() { diff --git a/community/monit/PKGBUILD b/community/monit/PKGBUILD index c38ca3931..5913458d5 100644 --- a/community/monit/PKGBUILD +++ b/community/monit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 42862 2011-03-21 21:28:35Z jlichtblau $ +# $Id: PKGBUILD 52027 2011-07-19 19:44:05Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: Marco Bartholomew <marco@marcobartholomew.com> pkgname=monit -pkgver=5.2.4 +pkgver=5.2.5 pkgrel=1 pkgdesc="Utility for managing and monitoring, processes, files, directories and devices on a *NIX system" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ backup=('etc/monitrc') changelog=$pkgname.changelog source=(http://mmonit.com/$pkgname/dist/$pkgname-$pkgver.tar.gz \ monitd) -sha256sums=('feabdd2c0e3263eadaf5359841b92a9e6d4824819b1df7b2b49d9727a849b4cf' +sha256sums=('3c2496e9f653ff8a46b75b61126a86cb3861ad35e4eeb7379d64a0fc55c1fd8d' 'b235b2fdeec49015d6b74f028d161b289663692f9ee2d2d78cf52d8db87ca496') build() { diff --git a/community/monit/monit.changelog b/community/monit/monit.changelog index c0a09fd7d..0a0d6d223 100644 --- a/community/monit/monit.changelog +++ b/community/monit/monit.changelog @@ -1,3 +1,6 @@ +2011-07-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * monit 5.2.5-1 + 2011-03-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * monit 5.2.4-1 diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 57309a0d8..111839dbc 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 51336 2011-07-07 21:24:31Z jlichtblau $ +# $Id: PKGBUILD 52050 2011-07-19 20:29:33Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-mimetypes.xml) -sha256sums=('24304fb148651e1e989ff9c15e56e3c6fb5d8b1e16aa70342d73bee86be67da8' +sha256sums=('37c241d84e2525c9daa73d05c7101912031944a8ef7f399acdf5f731da8f443d' 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index 83a7eee92..e7031e937 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2011-07-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.2.2-1 + 2011-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qlandkartegt 1.2.1-1 diff --git a/community/qps/PKGBUILD b/community/qps/PKGBUILD index 60bc67be0..c6a528fe6 100644 --- a/community/qps/PKGBUILD +++ b/community/qps/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 48817 2011-06-06 11:52:03Z spupykin $ +# $Id: PKGBUILD 52003 2011-07-19 16:41:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Rosenstrauch <darose@darose.net> pkgname=qps -pkgver=1.10.12.3 +pkgver=1.10.15 +_dlpkgver=5946 pkgrel=1 -_dlpkgver=5930 -pkgdesc="Qps is a visual process manager, an X11 version of 'top' or 'ps'." +pkgdesc="a visual process manager, an X11 version of 'top' or 'ps'." url="http://qps.kldp.net/projects/qps" depends=('qt') arch=('i686' 'x86_64') license="GPL" -source=(http://kldp.net/frs/download.php/$_dlpkgver/qps-$pkgver.tar.bz2) -md5sums=('43f8c0c00e31c869d6a4bb5e42d6680a') +source=(http://kldp.net/frs/download.php/${_dlpkgver}/qps-$pkgver.tar.bz2) +md5sums=('25a6c6f8ac9172a6874e3514edf1eda1') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/quassel/PKGBUILD b/community/quassel/PKGBUILD index 9c3187863..5dc833b03 100644 --- a/community/quassel/PKGBUILD +++ b/community/quassel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 40740 2011-02-26 12:03:19Z jlichtblau $ +# $Id: PKGBUILD 52032 2011-07-19 19:58:15Z jlichtblau $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=quassel -pkgver=0.7.1 +pkgver=0.7.2 pkgrel=1 pkgdesc="QT4 irc client with a separated core" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ backup=(etc/conf.d/quassel.conf) source=(http://quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2 rc.$pkgname $pkgname.conf) -sha256sums=('914a9cd21bfe4be1f78b2f6c96e54b52db7ed3c0adc4dce6bfabec38a30f7ecd' +sha256sums=('b9e4a094c46715dd68152cd98a4e0778e308a0ec653eb8b5476ec429d128d55c' '845e621448a51ec181554e9327bfcc3a3de1501ae8f70410f0b9b8991ac171b0' 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8') diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD index ac2deca2f..346c4a828 100644 --- a/community/sfml/PKGBUILD +++ b/community/sfml/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 51437 2011-07-09 04:42:03Z svenstaro $ +# $Id: PKGBUILD 51998 2011-07-19 14:00:57Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Ondrej Martinak <omartinak@gmail.com> @@ -7,7 +7,7 @@ pkgname=sfml _git=true if [[ "${_git}" = "true" ]]; then - pkgver=1.99.git20110709 + pkgver=1.99.git20110719 fi pkgrel=1 diff --git a/community/vifm/PKGBUILD b/community/vifm/PKGBUILD index 47d3b9c0c..e0af13c05 100644 --- a/community/vifm/PKGBUILD +++ b/community/vifm/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 44342 2011-04-05 23:27:31Z jelle $ +# $Id: PKGBUILD 52068 2011-07-19 20:56:41Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=vifm -pkgver=0.5 -pkgrel=4 +pkgver=0.6.2 +pkgrel=1 pkgdesc="Ncurses based file manager with vi like keybindings" arch=('i686' 'x86_64') url="http://vifm.sourceforge.net/" license=('GPL') -depends=('ncurses') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 ncurses.patch) +depends=('ncurses' 'gtk2') +changelog=$pkgname.changelog +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) +sha256sums=('8375f0cce8e1a703cf97322dbbab7ce2fc3be2b2ee072085b10623510b88c137') + build() { - cd ${srcdir}/$pkgname-$pkgver - patch -Np1 -i $srcdir/ncurses.patch + cd ${srcdir}/$pkgname ./configure --prefix=/usr make } -package() -{ - cd ${srcdir}/$pkgname-$pkgver + +package() { + cd ${srcdir}/$pkgname + make DESTDIR=${pkgdir} install } -md5sums=('76818f02d6acd4997d1f41db932438aa' - 'ad7c6b70678409d122426b9ed62386c0') diff --git a/community/vifm/vifm.changelog b/community/vifm/vifm.changelog new file mode 100644 index 000000000..167e102a9 --- /dev/null +++ b/community/vifm/vifm.changelog @@ -0,0 +1,5 @@ +2011-07-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * vifm 0.6.2-1 + +2010-02-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Moved to [community] 0.5-2 (212 votes in AUR) diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index 4d2916ec1..589b5b720 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 51807 2011-07-15 20:01:05Z ibiru $ +# $Id: PKGBUILD 52077 2011-07-19 22:16:29Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox -pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') -pkgver=4.0.12 -pkgrel=1 +pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk') +pkgver=4.1.0 +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' -'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' '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 - 18-system-xorg.patch change_default_driver_dir.patch) _kernver=2.6.39-ARCH @@ -25,7 +24,6 @@ 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" patch -Np1 -i "$srcdir/change_default_driver_dir.patch" cp "$srcdir/LocalConfig.kmk" . @@ -64,18 +62,10 @@ package_virtualbox() { #Binaries and Wrapper with Launchers install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox" - ln -sf VBox "$pkgdir/usr/bin/VBoxHeadless" - ln -sf VBox "$pkgdir/usr/bin/vboxheadless" - ln -sf VBox "$pkgdir/usr/bin/VBoxManage" - ln -sf VBox "$pkgdir/usr/bin/vboxmanage" - ln -sf VBox "$pkgdir/usr/bin/VBoxSDL" - ln -sf VBox "$pkgdir/usr/bin/vboxsdl" - ln -sf VBox "$pkgdir/usr/bin/VirtualBox" - ln -sf VBox "$pkgdir/usr/bin/virtualbox" - ln -sf VBox "$pkgdir/usr/bin/vboxwebsrv" - ln -sf VBox "$pkgdir/usr/bin/VBoxBalloonCtrl" - ln -sf VBox "$pkgdir/usr/bin/vboxballoonctrl" + for i in VBoxHeadless vboxheadless VBoxManage vboxmanage VBoxSDL vboxsdl VirtualBox virtualbox vboxwebsrv VBoxBalloonCtrl vboxballoonctrl; do + ln -sf VBox "$pkgdir/usr/bin/$i" + done install -m 0755 VBoxTunctl "$pkgdir/usr/bin" #components @@ -143,18 +133,18 @@ package_virtualbox-sdk() { rm -rf sdk/installer mv sdk "$pkgdir/usr/lib/virtualbox" } -package_virtualbox-guest-additions(){ - pkgdesc="VirtualBox user-space tools for Linux guests" - depends=("virtualbox-guest-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr') - replaces=('virtualbox-ose-additions') - conflicts=('virtualbox-ose-additions') + +package_virtualbox-archlinux-additions(){ + pkgdesc="Additions only for Arch Linux guests (userspace tools)" + depends=("virtualbox-archlinux-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr') + replaces=('virtualbox-guest-additions') + conflicts=('virtualbox-guest-additions') source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" - install -d "$pkgdir/usr/bin" - install -d "$pkgdir/sbin" + install -d "$pkgdir"/{usr/bin,sbin} install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin" install -m755 mount.vboxsf "$pkgdir/sbin" @@ -176,43 +166,40 @@ package_virtualbox-guest-additions(){ install -m755 -D pam_vbox.so "$pkgdir/lib/security/pam_vbox.so" } -package_virtualbox-guest-modules(){ - pkgdesc="VirtualBox kernel modules for Linux guests" + +package_virtualbox-archlinux-modules(){ + pkgdesc="Additions only for Arch Linux guests (kernel modules)" license=('GPL') - install=virtualbox-guest-modules.install + install=virtualbox-archlinux-modules.install depends=('kernel26>=2.6.39' 'kernel26<2.6.40') - replaces=('virtualbox-ose-additions-modules') - conflicts=('virtualbox-ose-additions-modules') + replaces=('virtualbox-guest-modules') + conflicts=('virtualbox-guest-modules') source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" - cd vboxguest install -D -m644 vboxguest.ko \ "$pkgdir/lib/modules/$_kernver/misc/vboxguest.ko" - cd ../vboxsf install -D -m644 vboxsf.ko \ "$pkgdir/lib/modules/$_kernver/misc/vboxsf.ko" - cd ../vboxvideo install -D -m644 vboxvideo.ko \ "$pkgdir/lib/modules/$_kernver/misc/vboxvideo.ko" install -D -m 0644 "$srcdir/60-vboxguest.rules" \ "$pkgdir/lib/udev/rules.d/60-vboxguest.rules" - sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-guest-modules.install" + sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-archlinux-modules.install" } -md5sums=('5b39b99c2a36c96a062913e8ac67c60f' - '34cfb9a430a231a274aba3550c3d0e00' +md5sums=('02556a6b4877cfdfbaa3ce0a0c0dcf31' + '24056c13ddbe2c9b5d135e8c96a53a11' '44efb3c4be214daa453a317d527f1f30' '32a232b43852b9a08cb11a7bcd64b347' '5f85710e0b8606de967716ded7b2d351' 'ed1341881437455d9735875ddf455fbe' - '9bde5b7dfba5abcd49768052c5409800' + '4cf75d9c091199a47a7a1bc2f4e347d9' 'c1a07f044c476a190af8486fe78bee0f' - '47da2e88de582bb2bab14580a3aa47b1' - '8a22b33c9dfaf8fb79bb2d26304e650b' - 'ac43f7cf44b934d8dbdbc3bb6f7879ad') + '838c4c4ebe11b34ae2168df5cd06f694' + '97e193f050574dd272a38e5ee5ebe62b') diff --git a/community/virtualbox/change_default_driver_dir.patch b/community/virtualbox/change_default_driver_dir.patch index 71930f062..d8531499d 100644 --- a/community/virtualbox/change_default_driver_dir.patch +++ b/community/virtualbox/change_default_driver_dir.patch @@ -1,16 +1,16 @@ -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 +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" +-# 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" +-# 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 diff --git a/community/virtualbox/vboxdrv-reference.patch b/community/virtualbox/vboxdrv-reference.patch index e7a9179a9..05d840f05 100644 --- a/community/virtualbox/vboxdrv-reference.patch +++ b/community/virtualbox/vboxdrv-reference.patch @@ -1,6 +1,6 @@ -diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp ---- VirtualBox-4.0.6_OSE.orig//src/VBox/Frontends/VirtualBox/src/main.cpp 2011-04-21 03:31:05.000000000 -0700 -+++ VirtualBox-4.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-04-21 11:10:00.503832646 -0700 +diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp +--- VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-07-19 15:11:37.730121727 +0000 ++++ VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-07-19 19:02:15.658471139 +0000 @@ -75,9 +75,8 @@ "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " @@ -8,7 +8,7 @@ diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Frontends/VirtualBox/src/main.cpp - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" - "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS " - "package first. This package keeps track of Linux kernel changes and " -+ " <font color=blue>'/etc/rc.d/vboxdrv setup'</font><br/><br/>" ++ " <font color=blue>'rc.d setup vboxdrv'</font><br/><br/>" + "as root. This package keeps track of Linux kernel changes and" "recompiles the vboxdrv kernel module if necessary." ); @@ -18,19 +18,19 @@ diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Frontends/VirtualBox/src/main.cpp "VirtualBox. The installation of VirtualBox was apparently not " "successful. Executing<br/><br/>" - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" -+ " <font color=blue>'/etc/rc.d/vboxdrv setup'</font><br/><br/>" ++ " <font color=blue>'rc.d setup vboxdrv'</font><br/><br/>" "may correct this. Make sure that you do not mix the " "OSE version and the PUEL version of VirtualBox." ); -diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Installer/linux/VBox.sh VirtualBox-4.0.6_OSE/src/VBox/Installer/linux/VBox.sh ---- VirtualBox-4.0.6_OSE.orig//src/VBox/Installer/linux/VBox.sh 2011-04-21 03:31:18.000000000 -0700 -+++ VirtualBox-4.0.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-04-21 11:10:00.503832646 -0700 +diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh +--- VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-07-19 15:11:37.603453927 +0000 ++++ VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh 2011-07-19 19:02:15.658471139 +0000 @@ -34,7 +34,7 @@ available for the current kernel (`uname -r`) or it failed to load. Please recompile the kernel module and install it by - sudo /etc/init.d/vboxdrv setup -+ /etc/rc.d/vboxdrv setup ++ sudo rc.d setup vboxdrv You will not be able to start VMs until this problem is fixed. EOF @@ -39,7 +39,7 @@ diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Installer/linux/VBox.sh VirtualBox WARNING: The character device /dev/vboxdrv does not exist. Try - sudo /etc/init.d/vboxdrv restart -+ /etc/rc.d/vboxdrv restart ++ sudo rc.d restart vboxdrv and if that is not successful, try to re-install the package. diff --git a/community/virtualbox/vboxdrv.sh b/community/virtualbox/vboxdrv.sh index 8de14b97f..5eb7ecb89 100755 --- a/community/virtualbox/vboxdrv.sh +++ b/community/virtualbox/vboxdrv.sh @@ -12,6 +12,7 @@ if [ -n "$INSTALL_DIR" ]; then BUILDVBOXDRV="$INSTALL_DIR/src/vboxdrv/build_in_tmp" BUILDVBOXNETFLT="$INSTALL_DIR/src/vboxnetflt/build_in_tmp" BUILDVBOXNETADP="$INSTALL_DIR/src/vboxnetadp/build_in_tmp" + BUILDVBOXPCI="$INSTALL_DIR/src/vboxpci/build_in_tmp" else echo "missing vbox.cfg" exit 0 @@ -31,7 +32,7 @@ case "$1" in if [ ! -d "$p/kernel" ]; then if [ -e "$p/misc/vboxdrv.ko" ]; then stat_busy "Removing old VirtualBox kernel modules from $p" - rm -f "$p/misc/vbox"{drv,netadp,netflt}.ko 2>/dev/null + rm -f "$p/misc/vbox"{drv,netadp,netflt,pci}.ko 2>/dev/null rmdir -p --ignore-fail-on-non-empty "$p/misc/" 2>/dev/null stat_done fi @@ -52,6 +53,12 @@ case "$1" in find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null stat_done fi + if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then + stat_busy "Removing old VirtualBox pci kernel module" + find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null + stat_done + fi + stat_busy "Recompiling VirtualBox kernel modules" if ! $BUILDVBOXDRV \ --save-module-symvers /tmp/vboxdrv-Module.symvers \ @@ -68,6 +75,11 @@ case "$1" in --no-print-directory install >> $LOG 2>&1; then echo "Look at $LOG to find out what went wrong" fi + if ! $BUILDVBOXPCI \ + --use-module-symvers /tmp/vboxdrv-Module.symvers \ + --no-print-directory install >> $LOG 2>&1; then + echo "Look at $LOG to find out what went wrong" + fi stat_done stat_busy "Reloading VirtualBox kernel modules" for module in "${MODLIST[@]}"; do diff --git a/community/virtualbox/virtualbox-archlinux-modules.install b/community/virtualbox/virtualbox-archlinux-modules.install new file mode 100644 index 000000000..8faef400e --- /dev/null +++ b/community/virtualbox/virtualbox-archlinux-modules.install @@ -0,0 +1,24 @@ +KERNEL_VERSION='2.6.39-ARCH' + +post_install() { + cat << EOM + +===> virtualbox-archlinux-modules post-install message: +===> +===> You may want to load vboxguest, vboxsf and vboxvideo +===> +===> To load them automatically, add them +===> to the MODULES array in /etc/rc.conf. + +EOM + + depmod -v $KERNEL_VERSION >/dev/null 2>&1 +} + +post_remove() { + depmod -v $KERNEL_VERSION >/dev/null 2>&1 +} + +post_upgrade() { + depmod -v $KERNEL_VERSION >/dev/null 2>&1 +} diff --git a/community/virtualbox/virtualbox.install b/community/virtualbox/virtualbox.install index e70757685..97a1b52f9 100644 --- a/community/virtualbox/virtualbox.install +++ b/community/virtualbox/virtualbox.install @@ -24,16 +24,14 @@ post_install() { ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv ===> -===> You must load vboxnetflt for Host Interface Networking: -===> # modprobe vboxnetflt +===> For networking you must load vboxnetflt or vboxnetadp. ===> -===> You must load vboxnetadp for Host-Only networking: -===> # modprobe vboxnetadp +===> For PCI passthrough support load vboxpci module. ===> ===> To load it automatically, add vboxdrv module ===> to the MODULES array in /etc/rc.conf. -*** To compile the modules do /etc/rc.d/vboxdrv setup *** +*** To compile the modules do rc.d setup vboxdrv *** EOF utils @@ -42,19 +40,7 @@ EOF post_upgrade() { getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers /bin/cat << EOF -===> You must reload vboxdrv module before starting VirtualBox: -===> # modprobe vboxdrv -===> -===> You must reload vboxnetflt for Host Interface Networking: -===> # modprobe vboxnetflt -===> -===> You must reload vboxnetadp for Host-Only networking: -===> # modprobe vboxnetadp -===> -===> To load it automatically, add vboxdrv module -===> to the MODULES array in /etc/rc.conf. - -*** To recompile the modules do /etc/rc.d/vboxdrv setup *** +*** To recompile the modules do rc.d setup vboxdrv *** EOF utils } |