summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community-testing/ibus/ibus.install6
-rw-r--r--community/subtle/PKGBUILD12
-rw-r--r--community/teeworlds/PKGBUILD48
-rw-r--r--community/xnee/PKGBUILD13
-rw-r--r--community/xnee/xnee.changelog5
-rw-r--r--core/lilo/PKGBUILD12
-rw-r--r--extra/bluez/PKGBUILD6
-rw-r--r--extra/claws-mail-extra-plugins/PKGBUILD10
-rw-r--r--extra/claws-mail/PKGBUILD10
-rw-r--r--extra/consolekit/PKGBUILD12
-rw-r--r--extra/geeqie/PKGBUILD9
-rw-r--r--extra/geeqie/geeqie.install11
-rw-r--r--extra/iptraf-ng/PKGBUILD30
-rw-r--r--extra/libburn/PKGBUILD6
-rw-r--r--extra/libisoburn/PKGBUILD12
-rw-r--r--extra/libisofs/PKGBUILD6
-rw-r--r--extra/phonon-gstreamer/PKGBUILD6
-rw-r--r--extra/rsync/PKGBUILD10
-rw-r--r--extra/wxgtk/PKGBUILD14
-rw-r--r--extra/wxpython/PKGBUILD13
-rw-r--r--multilib-testing/gcc-multilib/PKGBUILD29
-rw-r--r--multilib-testing/lib32-mesa/PKGBUILD337
-rw-r--r--multilib-testing/lib32-mesa/nouveau-fix-header.patch86
-rw-r--r--testing/claws-mail-extra-plugins/PKGBUILD8
-rw-r--r--testing/cloog/PKGBUILD10
-rw-r--r--testing/gcc/PKGBUILD26
-rw-r--r--testing/isl/PKGBUILD16
-rw-r--r--testing/mesa/PKGBUILD22
-rw-r--r--testing/mesa/nouveau-fix-header.patch86
-rw-r--r--testing/miro/PKGBUILD29
-rw-r--r--testing/miro/miro.install17
-rw-r--r--testing/networkmanager/PKGBUILD6
-rw-r--r--testing/udisks/01-mkfs-tempdir.patch17
-rw-r--r--testing/udisks/PKGBUILD37
34 files changed, 832 insertions, 145 deletions
diff --git a/community-testing/ibus/ibus.install b/community-testing/ibus/ibus.install
index d5c04de2b..439f00b29 100644
--- a/community-testing/ibus/ibus.install
+++ b/community-testing/ibus/ibus.install
@@ -5,6 +5,9 @@ post_install() {
/usr/sbin/gconfpkg --install ibus
gtk-update-icon-cache -fq -t /usr/share/icons/hicolor
+
+ # update for gkt3
+ gtk-query-immodules-3.0 --update-cache
}
pre_upgrade() {
@@ -22,4 +25,7 @@ pre_remove() {
post_remove() {
/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
gtk-update-icon-cache -fq -t /usr/share/icons/hicolor
+
+ # update for gkt3
+ gtk-query-immodules-3.0 --update-cache
}
diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD
index c08e25119..247479027 100644
--- a/community/subtle/PKGBUILD
+++ b/community/subtle/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 38833 2011-02-01 21:18:39Z angvp $
+# $Id: PKGBUILD 44650 2011-04-10 13:39:02Z angvp $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Contributor: unexist <unexist@dorfelite.net>
# Past Contributors: Abakus <java5@arcor.de>, TDY <tdy@gmx.com>, Xilon <xilonmu@gmail.com>
pkgname=subtle
-pkgver=0.9.2573
-pkgrel=2
+pkgver=0.9.2773
+pkgrel=1
pkgdesc="A grid-based manual tiling window manager with a strong focus on easy but customizable look and feel"
arch=("i686" "x86_64")
url="http://subtle.subforge.org"
@@ -14,10 +14,10 @@ makedepends=("ruby" "pkg-config" "libxinerama" "libxrandr" "libxft" "libxpm")
provides=("subtle")
conflicts=("subtle-hg")
backup=("etc/xdg/subtle/subtle.rb")
-source=(http://subforge.org/attachments/download/46/$pkgname-$pkgver-lambda.tbz2)
-md5sums=('afcb897307329fc2cdb0733db9cc3a79')
+source=(http://subforge.org/attachments/download/50/$pkgname-$pkgver-mu.tbz2)
+md5sums=('bbae53d6c16cfe25186003e9e28504f8')
build() {
- cd "$srcdir/$pkgname-$pkgver-lambda"
+ cd "$srcdir/$pkgname-$pkgver-mu"
rake destdir=$pkgdir install
}
diff --git a/community/teeworlds/PKGBUILD b/community/teeworlds/PKGBUILD
index 12e6720c4..68f2e64b8 100644
--- a/community/teeworlds/PKGBUILD
+++ b/community/teeworlds/PKGBUILD
@@ -1,65 +1,59 @@
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Armin 'IsSuE' Praher [issue.at.gmx.dot.at]
# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=teeworlds
-pkgver=0.5.2
-_bamver=0.2.0
-pkgrel=2
+pkgver=0.6.0
+_bamver=0.4.0
+pkgrel=1
pkgdesc="A multiplayer 2D shooter"
arch=('i686' 'x86_64')
url="http://teeworlds.com"
license=('custom')
-depends=('alsa-lib' 'mesa' 'sdl')
+depends=('alsa-lib' 'mesa' 'sdl' 'freetype2')
makedepends=('python2')
replaces=('teewars')
source=(http://www.teeworlds.com/files/${pkgname}-${pkgver}-src.tar.gz
- http://www.teeworlds.com/files/bam-${_bamver}.tar.gz
+ https://github.com/downloads/matricks/bam/bam-${_bamver}.tar.bz2
teeworlds.desktop
- teeworlds.png
- fix_datadir_search.patch)
-md5sums=('f605f6df9f1714dcda4cba1d281cc757'
- 'd4efe74591a73c1cec8b34d76ffd1049'
+ teeworlds.png)
+md5sums=('4d6e5d0fb1b5f0bdf6c5c49714045ef1'
+ 'f8b62ad553c3615a725a034df4fb4257'
'3944aaf7a8c19a83510b2b39c4cddf5f'
- '44f39e398409232a0e0a431ed46d8cc8'
- '673791ecb74274346456f0fae53b4428')
+ '44f39e398409232a0e0a431ed46d8cc8')
build() {
- # Build bam (used to build teewars)
+ # Build bam (used to build teeworlds)
# Now it is released separately I should make a separate package...
cd ${srcdir}/bam-${_bamver}
./make_unix.sh
# Build teeworlds
- cd ${srcdir}/${pkgname}-${pkgver}-src
-
- # fix for FS 13118 which will be applied in next release
- patch -p1 -i ../fix_datadir_search.patch
+ cd ${srcdir}/${pkgname}-${pkgver}-source
# Use Python 2
- sed -i 's/python /python2 /' default.bam
+ sed -i 's/python /python2 /' bam.lua
- ../bam-${_bamver}/src/bam server_release client_release
+ ../bam-${_bamver}/bam server_release client_release
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}-src
+ cd ${srcdir}/${pkgname}-${pkgver}-source
# Install data files
mkdir -p ${pkgdir}/usr/share/${pkgname}/data
- cp -r ${srcdir}/${pkgname}-${pkgver}-src/data/* \
- ${pkgdir}/usr/share/${pkgname}/data
+ cp -r data/* ${pkgdir}/usr/share/${pkgname}/data
- install -Dm755 ${srcdir}/${pkgname}-${pkgver}-src/${pkgname} \
- ${pkgdir}/usr/bin/${pkgname}
- install -Dm755 ${srcdir}/${pkgname}-${pkgver}-src/${pkgname}_srv \
- ${pkgdir}/usr/bin/${pkgname}_srv
+ install -Dm755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
+ install -Dm755 ${pkgname}_srv ${pkgdir}/usr/bin/${pkgname}_srv
install -Dm644 ${srcdir}/${pkgname}.desktop \
${pkgdir}/usr/share/applications/${pkgname}.desktop
install -Dm644 ${srcdir}/${pkgname}.png \
${pkgdir}/usr/share/pixmaps/${pkgname}.png
- install -Dm644 ${srcdir}/${pkgname}-${pkgver}-src/license.txt \
+
+ install -Dm644 license.txt \
${pkgdir}/usr/share/licenses/${pkgname}/license.txt
}
diff --git a/community/xnee/PKGBUILD b/community/xnee/PKGBUILD
index 25effed5e..ca671adaa 100644
--- a/community/xnee/PKGBUILD
+++ b/community/xnee/PKGBUILD
@@ -1,8 +1,9 @@
+# $Id: PKGBUILD 44669 2011-04-10 20:26:28Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
pkgname=xnee
-pkgver=3.05
+pkgver=3.09
pkgrel=1
pkgdesc="A program to record, distribute, and replay X (X11) protocol data"
arch=('i686' 'x86_64')
@@ -11,14 +12,20 @@ license=('GPL3')
depends=('gtk2' 'libgnomeui' 'libxtst')
makedepends=('texinfo')
options=('!libtool' '!emptydirs')
+changelog=$pkgname.changelog
source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('0ba4ea4f6102bcc0b478f4a6fe787b0b')
+sha256sums=('1145add697e4932007396bc093336689efa934dd92e701f0aaefe388990e2720')
build() {
cd ${srcdir}/$pkgname-$pkgver
./configure --prefix=/usr --disable-gnome-applet
- make || return 1
+ make
+}
+
+package() {
+ cd ${srcdir}/$pkgname-$pkgver
+
make DESTDIR=${pkgdir} install
}
diff --git a/community/xnee/xnee.changelog b/community/xnee/xnee.changelog
new file mode 100644
index 000000000..a096a22e8
--- /dev/null
+++ b/community/xnee/xnee.changelog
@@ -0,0 +1,5 @@
+2011-04-10 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * xnee 3.09-1
+
+2009-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * Update to major release 3.05
diff --git a/core/lilo/PKGBUILD b/core/lilo/PKGBUILD
index c2de0f4ed..216f1b91d 100644
--- a/core/lilo/PKGBUILD
+++ b/core/lilo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 101453 2010-11-29 09:41:45Z andrea $
+# $Id: PKGBUILD 118988 2011-04-09 21:38:07Z tpowa $
# Maintainer: Eric Belanger <eric@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=lilo
-pkgver=23.1
-pkgrel=2
+pkgver=23.2
+pkgrel=1
pkgdesc="A bootloader for Linux"
arch=('i686' 'x86_64')
url="https://alioth.debian.org/projects/lilo/"
@@ -20,10 +20,10 @@ makedepends=('bin86' 'sharutils')
optdepends=('perl: to use keytab-lilo')
install=lilo.install
options=('!makeflags')
-source=("http://lilo.alioth.debian.org/ftp/upstream/sources/${pkgname}-${pkgver}.tar.gz"
+source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz"
'lilo.conf')
-md5sums=('36139c1b8f4dc835fc7775e59ee4b20c'
- 'a3a4c90bead3f9b8672bd384ff9f8db1')
+md5sums=('51b9b9db665d3b8724919e3d46054d12'
+ 'a3a4c90bead3f9b8672bd384ff9f8db1')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index d281822c3..89a518885 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 115264 2011-03-17 15:35:14Z andrea $
+# $Id: PKGBUILD 119035 2011-04-10 15:08:06Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
pkgname=bluez
-pkgver=4.90
+pkgver=4.91
pkgrel=1
pkgdesc="Libraries and tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
@@ -27,7 +27,7 @@ backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
'bluetooth.conf.d'
'rc.bluetooth')
-md5sums=('b111de22ff0f5c2b31f62b6be44dca00'
+md5sums=('0a293ae6cf0d0e0bdd74fb65e655842a'
'8f60a5eb9d84b9c64c478d63e1c24b10'
'ca4c39eb4bb201bd2eacad01492cd735')
diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD
index 97451d37b..0ff70cbd2 100644
--- a/extra/claws-mail-extra-plugins/PKGBUILD
+++ b/extra/claws-mail-extra-plugins/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 112792 2011-03-06 22:47:24Z heftig $
+# $Id: PKGBUILD 119025 2011-04-10 13:51:10Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Mildred <mildred593 at online dot fr>
pkgname=claws-mail-extra-plugins
-pkgver=3.7.8
-pkgrel=2
+pkgver=3.7.9
+pkgrel=1
pkgdesc="Extra plugins for claws-mail"
url="http://www.claws-mail.org/plugins.php?branch=EXT"
license=('GPL3')
arch=('i686' 'x86_64')
depends=('claws-mail>=3.7.8')
makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7'
- 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.1.15.4-2'
+ 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.2'
'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra')
optdepends=('libgtkhtml: for gtkhtml2_viewer plugin'
'perl: for perl plugin'
@@ -33,7 +33,7 @@ replaces=('sylpheed-claws-extra-plugins')
options=('!libtool')
source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2
claws-mail-notification-0.26-libnotify-0.7.patch)
-md5sums=('8a67a00598262f8ca07a4af5cd43361d'
+md5sums=('3d1ebc48f686ab10702380c776b5d5d0'
'b76e1cdbff7af46d6594c34646c06fd0')
build() {
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
index 9771cb21d..f863f8d74 100644
--- a/extra/claws-mail/PKGBUILD
+++ b/extra/claws-mail/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 102090 2010-12-05 20:57:04Z andyrtr $
+# $Id: PKGBUILD 119020 2011-04-10 13:42:00Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=claws-mail
-pkgver=3.7.8
+pkgver=3.7.9
pkgrel=1
pkgdesc="A GTK+ based e-mail client."
arch=('i686' 'x86_64')
license=('GPL3')
url="http://www.claws-mail.org"
-depends=('gtk2>=2.18.5' 'gnutls>=2.8.5' 'startup-notification>=0.10' 'pilot-link>=0.12.4' 'enchant>=1.5.0-2'
- 'gpgme>=1.2.0' 'libetpan>=1.0' 'libsm>=1.1.1' 'db' 'dbus-glib>=0.82-2' 'hicolor-icon-theme')
+depends=('gtk2' 'gnutls' 'startup-notification' 'pilot-link' 'enchant'
+ 'gpgme' 'libetpan' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme')
makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind')
optdepends=('python2: needed for some tools'
'perl: needed for some tools'
@@ -21,7 +21,7 @@ provides=('claws')
options=(!libtool)
install=claws-mail.install
source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e8c516f67df195ee605ed5e5408b2a42')
+md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/consolekit/PKGBUILD b/extra/consolekit/PKGBUILD
index 79f9d831a..d1a6f8519 100644
--- a/extra/consolekit/PKGBUILD
+++ b/extra/consolekit/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 108600 2011-02-01 20:16:14Z ibiru $
+# $Id: PKGBUILD 119015 2011-04-10 13:37:10Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: onestep_ua <onestep@ukr.net>
pkgname=consolekit
pkgver=0.4.3
-pkgrel=2
+pkgrel=3
pkgdesc="A framework for defining and tracking users, login sessions, and seats"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/ConsoleKit"
license=('GPL')
-depends=('polkit>=0.99' 'zlib' 'libx11>=1.4.1' 'dbus-glib>=0.92')
+depends=('polkit' 'zlib' 'libx11' 'dbus-glib')
makedepends=('pkgconfig' 'xmlto' 'docbook-xsl')
options=(!libtool)
source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${pkgver}.tar.bz2
@@ -27,9 +27,15 @@ build() {
--enable-pam-module \
--enable-docbook-docs
make
+}
+
+package() {
+ cd "${srcdir}/ConsoleKit-${pkgver}"
make DESTDIR="${pkgdir}" install
install -m755 "${srcdir}/pam-foreground-compat.ck" "${pkgdir}/usr/lib/ConsoleKit/run-session.d/"
# install the logrotate config
install -D -m644 ${srcdir}/consolekit.logrotate ${pkgdir}/etc/logrotate.d/consolekit
+
+ rm -rf "${pkgdir}/var/run"
}
diff --git a/extra/geeqie/PKGBUILD b/extra/geeqie/PKGBUILD
index af38bc2a6..b2315cea4 100644
--- a/extra/geeqie/PKGBUILD
+++ b/extra/geeqie/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 110925 2011-02-23 07:41:06Z eric $
+# $Id: PKGBUILD 119080 2011-04-10 20:19:22Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=geeqie
pkgver=1.0
-pkgrel=4
+pkgrel=5
pkgdesc="A lightweight image browser and viewer (fork of GQview)"
arch=('i686' 'x86_64')
url="http://geeqie.sourceforge.net/"
license=('GPL3')
-depends=('exiv2' 'gtk2' 'lcms')
-makedepends=('intltool' 'doxygen')
+depends=('exiv2' 'gtk2' 'lcms' 'desktop-file-utils')
+makedepends=('intltool' 'doxygen' 'gnome-doc-utils')
optdepends=('librsvg: SVG rendering')
replaces=('gqview-devel')
+install=geeqie.install
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
md5sums=('1d67ef990390224c5052697d93bb49c0')
sha1sums=('8494a557d67d20e6ad720645ec789dd2b33a3266')
diff --git a/extra/geeqie/geeqie.install b/extra/geeqie/geeqie.install
new file mode 100644
index 000000000..2eaa60550
--- /dev/null
+++ b/extra/geeqie/geeqie.install
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
diff --git a/extra/iptraf-ng/PKGBUILD b/extra/iptraf-ng/PKGBUILD
new file mode 100644
index 000000000..d5e9d5829
--- /dev/null
+++ b/extra/iptraf-ng/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 119065 2011-04-10 18:53:50Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer: sh0 <mee@sh0.org>
+
+pkgname=iptraf-ng
+pkgver=1.0.2
+pkgrel=1
+pkgdesc="A console-based network monitoring utility (a fork of original iptraf)"
+url="https://fedorahosted.org/iptraf-ng/"
+arch=('i686' 'x86_64')
+depends=('ncurses')
+license=('GPL2')
+replaces=('iptraf')
+options=('!libtool')
+source=(https://fedorahosted.org/releases/i/p/iptraf-ng/${pkgname}-${pkgver}.tar.gz)
+md5sums=('b2adbbbee4c269fb97a1951981c9047c')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static
+ make CFLAGS="$CFLAGS"
+}
+
+package() {
+ cd "$srcdir/${pkgname}-${pkgver}"
+ make DESTDIR=$pkgdir install
+}
+
+# vim: ts=2: ft=sh
diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD
index d3c776324..f668355f7 100644
--- a/extra/libburn/PKGBUILD
+++ b/extra/libburn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 114274 2011-03-12 06:54:15Z andyrtr $
+# $Id: PKGBUILD 119040 2011-04-10 17:24:51Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=libburn
-pkgver=1.0.4.pl00
+pkgver=1.0.6.pl00
pkgrel=1
pkgdesc="Library for reading, mastering and writing optical discs"
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL')
depends=('glibc')
source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz)
options=('!libtool' '!emptydirs')
-md5sums=('edc117aa6d02a19c5aafe30d95df5e80')
+md5sums=('7c3bd62964e5885f7733cf904089f82d')
build() {
cd ${srcdir}/${pkgname}-${pkgver/.pl??/}
diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD
index 2cd7b651f..ce8bce22c 100644
--- a/extra/libisoburn/PKGBUILD
+++ b/extra/libisoburn/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 114284 2011-03-12 07:01:26Z andyrtr $
+# $Id: PKGBUILD 119050 2011-04-10 17:34:53Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Gour <Gour <gour@mail.inet.hr>
pkgname=libisoburn
-pkgver=1.0.4.pl00
+pkgver=1.0.6.pl00
pkgrel=1
pkgdesc="frontend for libraries libburn and libisofs"
url="http://libburnia.pykix.org/wiki/Libisoburn"
arch=('i686' 'x86_64')
license=('GPL2')
-depends=('libburn>=1.0.4' 'libisofs>=1.0.4' 'readline>=6.1')
+depends=('libburn>=1.0.6' 'libisofs>=1.0.6' 'readline>=6.1')
options=('!libtool')
source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz)
-md5sums=('ba21567325bda50f02d406f46c3c8392')
+md5sums=('f4eff76915c08dba533180d618df95a1')
build() {
cd ${srcdir}/${pkgname}-${pkgver/.pl??/}
./configure --prefix=/usr
make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver/.pl??/}
make DESTDIR=${pkgdir} install
}
diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD
index 568a0b8f0..25415147c 100644
--- a/extra/libisofs/PKGBUILD
+++ b/extra/libisofs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 114279 2011-03-12 06:56:07Z andyrtr $
+# $Id: PKGBUILD 119045 2011-04-10 17:31:05Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Contributor: Hugo Doria <hugodoria@gmail.com>
# Contributor: Bjorn Martensen
pkgname=libisofs
-pkgver=1.0.4
+pkgver=1.0.6
pkgrel=1
pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL')
depends=('acl' 'zlib')
source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz)
options=('!libtool')
-md5sums=('5a8abcec98c312f5c3550cb66754eb66')
+md5sums=('85b8d2c9e378dc01c4b6039bcc1c6b43')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/phonon-gstreamer/PKGBUILD b/extra/phonon-gstreamer/PKGBUILD
index 0b4ca11d0..981d78aba 100644
--- a/extra/phonon-gstreamer/PKGBUILD
+++ b/extra/phonon-gstreamer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 107146 2011-01-21 18:57:32Z andrea $
+# $Id: PKGBUILD 119060 2011-04-10 18:47:30Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=phonon-gstreamer
-pkgver=4.4.4
+pkgver=4.5.0
pkgrel=1
arch=('i686' 'x86_64')
url="http://phonon.kde.org"
@@ -12,7 +12,7 @@ depends=('gstreamer0.10-base-plugins')
makedepends=('cmake' 'automoc4' 'phonon' 'mesa')
provides=('phonon-backend')
source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/src/phonon-backend-gstreamer-${pkgver}.tar.bz2")
-md5sums=('fa313a77db3da9df20bc8991352378cb')
+md5sums=('2875139f2b7b649396125f4acc66de67')
build() {
cd ${srcdir}
diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD
index 9441a7322..af1d9b185 100644
--- a/extra/rsync/PKGBUILD
+++ b/extra/rsync/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 107956 2011-01-28 05:41:54Z angvp $
+# $Id: PKGBUILD 118437 2011-04-06 20:17:24Z angvp $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=rsync
-pkgver=3.0.7
-pkgrel=2
+pkgver=3.0.8
+pkgrel=1
pkgdesc="A file transfer program to keep remote files in sync"
arch=('i686' 'x86_64')
url="http://samba.anu.edu.au/rsync/"
@@ -14,11 +14,11 @@ depends=('acl')
backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync')
source=(http://rsync.samba.org/ftp/rsync/${pkgname}-${pkgver}.tar.gz \
rsyncd.conf rsyncd rsync.xinetd)
-md5sums=('b53525900817cf1ba7ad3a516ab5bfe9'
+md5sums=('0ee8346ce16bdfe4c88a236e94c752b4'
'4395c0591638349b1a7aeaaa4da1f03a'
'3d8f90ac8467ff6af28754584a61fd11'
'ea3e9277dc908bc51f9eddc0f6b935c1')
-sha1sums=('63426a1bc71991d93159cd522521fbacdafb7a61'
+sha1sums=('10e80173c7e9ed8b8a4dc9e8fdab08402da5f08d'
'48be09294134dfed888818872fe552a59c29147a'
'357af5648eb4ecf84cc6b1de1cd79d21eca3a518'
'fdb99785bc87ee13d77aa90dc1804f3f75dd7fc1')
diff --git a/extra/wxgtk/PKGBUILD b/extra/wxgtk/PKGBUILD
index 7352b5573..cbce9cc63 100644
--- a/extra/wxgtk/PKGBUILD
+++ b/extra/wxgtk/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 99629 2010-11-15 21:53:38Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 119104 2011-04-10 22:59:50Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=wxgtk
-pkgver=2.8.11
-pkgrel=2
+pkgver=2.8.12
+pkgrel=1
pkgdesc="GTK+ implementation of wxWidgets API for GUI"
arch=('i686' 'x86_64')
url="http://wxwidgets.org"
license=('custom:wxWindows')
-depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm')
+depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm')
makedepends=('libgnomeprintui' 'gstreamer0.10-base-plugins' 'gconf' 'mesa')
#source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
-md5sums=('6040933d200037f90f6aa1c5169e7ec6')
-sha1sums=('e979d9d2b1ee5bd10e90fd00b02f3306327c661a')
+md5sums=('08f81ab60647308058f6ce99712b14f8')
+sha1sums=('a8d31ef924ae49e97690646b13d5a2a7be7dda10')
build() {
# cd "${srcdir}/wxPython-src-${pkgver}"
diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD
index b9375cca7..be600b600 100644
--- a/extra/wxpython/PKGBUILD
+++ b/extra/wxpython/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 88207 2010-08-21 05:14:19Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 119109 2011-04-10 23:04:52Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
# Contributor: Andrew Wright <andreww@photism.org>
pkgname=wxpython
pkgver=2.8.11.0
-pkgrel=2
+pkgrel=3
pkgdesc="A wxWidgets GUI toolkit for Python"
arch=('i686' 'x86_64')
license=('custom:wxWindows')
url="http://www.wxpython.org"
depends=('wxgtk' 'python2')
makedepends=('mesa')
-changelog=ChangeLog
source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 editra-aui.diff)
-md5sums=('63f73aae49e530852db56a31b57529fa' '06c637c34c1570d8c82b870ce19c0622')
-sha1sums=('18982edc236a1d87e4eef018928358c925aa5b17' '077fe341bf8822647934d6b1ea82ce9b0adbf93a')
+md5sums=('63f73aae49e530852db56a31b57529fa'
+ '06c637c34c1570d8c82b870ce19c0622')
+sha1sums=('18982edc236a1d87e4eef018928358c925aa5b17'
+ '077fe341bf8822647934d6b1ea82ce9b0adbf93a')
build() {
cd "${srcdir}/wxPython-src-${pkgver}"
diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD
index bc407224d..2b884e347 100644
--- a/multilib-testing/gcc-multilib/PKGBUILD
+++ b/multilib-testing/gcc-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 43545 2011-03-27 14:10:17Z heftig $
+# $Id: PKGBUILD 44677 2011-04-10 23:43:09Z heftig $
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: Allan McRae <allan@archlinux.org>
@@ -8,28 +8,28 @@
pkgbase='gcc-multilib'
pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
pkgver=4.6.0
-pkgrel=1
-#_snapshot=4.6.0-RC-20110321
+pkgrel=2
+_snapshot=4.6-20110408
_libstdcppmanver=20110201 # Note: check source directory name when updating this
pkgdesc="The GNU Compiler Collection for multilib"
arch=('x86_64')
-license=('GPL' 'LGPL' 'custom')
+license=('GPL' 'LGPL' 'FDL' 'custom')
url="http://gcc.gnu.org"
makedepends=('binutils-multilib>=2.21' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' 'dejagnu'
'lib32-glibc>=2.12.1')
options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${pkgver}.tar.bz2
- #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${_snapshot}.tar.bz2
+source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${pkgver}.tar.bz2
+ ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${_snapshot}.tar.bz2
ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
gcc_pure64.patch
gcc-hash-style-both.patch)
-md5sums=('b1957f3209080b2f55bc3756d3a62b7c'
- 'a30090fa655d0db4c970740d353c81f1'
- 'a4687a9035c3e92db7e84fc01fc548ef'
- '120d4675366ee82ea52f9ed65b57da04'
- 'ea003fee5123f5bfbe17cc569cffe867'
- 'c182dfcad477564af9d94e2aa1552bcd'
- '8c76d751c5b99560e8acc3111f62263a'
+md5sums=('51ee21d6bd7955c78cb29038ff8089d0'
+ '92144f8790ca850317b6f4496e534aef'
+ '7286e62b51e126226e10e0e6a1706eae'
+ 'a9da84a451c4484126b2befa446b1638'
+ '94de82b3148b7686901f35c223477813'
+ '6719f6e005e2e443ebc5a3609607e8ef'
+ '0a870e1180a0cb4ffa5264f0b79abe3f'
'1e9fd2eaf0ee47ea64e82c48998f1999'
'22cec272f9cc2801d3cd348feaca888b'
'4df25b623799b148a0703eaeec8fdf3f')
@@ -43,9 +43,6 @@ fi
build() {
cd ${_basedir}
- # "Add" ppl-0.11 compatibility
- sed -i "/ppl_minor_version=/s#10#11#" configure
-
# Do not install libiberty
sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD
new file mode 100644
index 000000000..489fd3703
--- /dev/null
+++ b/multilib-testing/lib32-mesa/PKGBUILD
@@ -0,0 +1,337 @@
+# $Id: PKGBUILD 44674 2011-04-10 20:53:16Z lcarlier $
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
+
+pkgbase=lib32-mesa
+pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri'
+'lib32-sis-dri' 'lib32-tdfx-dri' 'lib32-nouveau-dri')
+
+#_git=true
+_git=false
+
+if [ "${_git}" = "true" ]; then
+ pkgver=7.10.0.git20110215
+ else
+ pkgver=7.10.2
+fi
+
+pkgrel=2
+arch=(x86_64)
+makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.23' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8'
+'lib32-gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev')
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+if [ "${_git}" = "true" ]; then
+ # mesa git shot from 7.10 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=cc1636b6db85604510f97f8a37d7fd0ecf453866
+ source=('ftp://ftp.archlinux.org/other/mesa/mesa-cc1636b6db85604510f97f8a37d7fd0ecf453866.tar.bz2')
+ md5sums=('f0d9daab4aaaacfd3b756dcb23b268af')
+else
+ source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" nouveau-fix-header.patch)
+ md5sums=('f5de82852f1243f42cc004039e10b771' '67c87b77cc2236b52a3b47dad3fbb5d4')
+fi
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*
+ autoreconf -vfi
+ else
+ cd "${srcdir}/Mesa-${pkgver}"
+ fi
+
+ patch -Np1 -i "${srcdir}/nouveau-fix-header.patch"
+
+ if [ "${_git}" = "true" ]; then
+ ./autogen.sh --prefix=/usr \
+ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
+ --enable-gallium-radeon \
+ --enable-gallium-r600 \
+ --enable-gallium-nouveau \
+ --enable-gallium-swrast \
+ --enable-glx-tls \
+ --with-driver=dri \
+ --enable-xcb \
+ --with-state-trackers=dri,glx \
+ --disable-glut \
+ --enable-gles1 \
+ --enable-gles2 \
+ --enable-egl \
+ --disable-gallium-egl \
+ --enable-32-bit \
+ --libdir=/usr/lib32
+ else
+ ./configure --prefix=/usr \
+ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
+ --enable-gallium-radeon \
+ --enable-gallium-r600 \
+ --enable-gallium-nouveau \
+ --enable-gallium-swrast \
+ --enable-glx-tls \
+ --with-driver=dri \
+ --enable-xcb \
+ --with-state-trackers=dri,glx \
+ --disable-glut \
+ --enable-gles1 \
+ --enable-gles2 \
+ --enable-egl \
+ --disable-gallium-egl \
+ --enable-32-bit \
+ --libdir=/usr/lib32
+ fi
+
+ make
+}
+
+package_lib32-libgl() {
+ depends=('lib32-libdrm>=2.4.23' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-gcc-libs>=4.5' 'libgl')
+ pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)"
+
+ if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*
+ else
+ cd "${srcdir}/Mesa-${pkgver}"
+ fi
+
+ install -m755 -d "${pkgdir}/usr/lib32"
+ install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions"
+
+ bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/"
+
+ if [ "${_git}" = "true" ]; then
+ make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
+ else
+ make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
+ fi
+ ln -s swrastg_dri.so "${pkgdir}/usr/lib32/xorg/modules/dri/swrast_dri.so"
+ ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so"
+
+ rm -rf "${pkgdir}"/usr/{include,share,bin}
+ install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
+ ln -s libgl "$pkgdir/usr/share/licenses/libgl/lib32-libgl"
+}
+
+package_lib32-libgles() {
+ depends=('libgles')
+ pkgdesc="Mesa GLES libraries (32-bit)"
+
+ if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*
+ else
+ cd "${srcdir}/Mesa-${pkgver}"
+ fi
+
+ install -m755 -d "${pkgdir}/usr/lib32"
+ install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
+ bin/minstall lib32/libGLESv* "${pkgdir}/usr/lib32/"
+ bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib32/pkgconfig/"
+ bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib32/pkgconfig/"
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
+ ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles"
+}
+
+package_lib32-libegl() {
+ depends=('lib32-udev' 'libegl')
+ pkgdesc="Mesa libEGL libraries (32-bit)"
+
+ if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*
+ else
+ cd "${srcdir}/Mesa-${pkgver}"
+ fi
+
+ install -m755 -d "${pkgdir}/usr/lib32"
+ install -m755 -d "${pkgdir}/usr/lib32/egl"
+ install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
+ bin/minstall lib32/libEGL.so* "${pkgdir}/usr/lib32/"
+ bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/"
+ bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib32/pkgconfig/"
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
+ ln -s libgles "$pkgdir/usr/share/licenses/libegl/lib32-libegl"
+}
+
+package_lib32-mesa() {
+ depends=('lib32-libgl' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' 'mesa')
+ pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)"
+
+ if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*
+ else
+ cd "${srcdir}/Mesa-${pkgver}"
+ fi
+
+ make DESTDIR="${pkgdir}" install
+
+
+ rm -f "${pkgdir}/usr/lib32/libGL.so"*
+ rm -f "${pkgdir}/usr/lib32/libGLESv"*
+ rm -f "${pkgdir}/usr/lib32/libEGL"*
+ rm -rf "${pkgdir}/usr/lib32/egl"
+ rm -f ${pkgdir}/usr/lib32/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc}
+ rm -rf "$pkgdir"/{usr/include,usr/lib32/xorg}
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
+ ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa"
+}
+
+package_lib32-ati-dri() {
+ depends=("lib32-libgl=${pkgver}")
+ pkgdesc="Mesa DRI + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)"
+ conflicts=('xf86-video-ati<6.9.0-6')
+
+ if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+ fi
+
+ make -C radeon DESTDIR="${pkgdir}" install
+ make -C r200 DESTDIR="${pkgdir}" install
+
+ # DRI drivers for r300 and r600 are removed
+ # gallium3D driver for R300 and R600 r300_dri.so/r600_dri.so
+ if [ "${_git}" = "true" ]; then
+ make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
+ else
+ make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
+ fi
+}
+
+package_lib32-intel-dri() {
+ depends=("lib32-libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for Intel (32-bit)"
+
+ if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+ fi
+
+ make -C i810 DESTDIR="${pkgdir}" install
+ make -C i915 DESTDIR="${pkgdir}" install
+ make -C i965 DESTDIR="${pkgdir}" install
+}
+
+package_lib32-unichrome-dri() {
+ depends=("lib32-libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome (32-bit)"
+
+ if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+ fi
+
+ make -C unichrome DESTDIR="${pkgdir}" install
+}
+
+package_lib32-mach64-dri() {
+ depends=("lib32-libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for ATI Mach64 (32-bit)"
+ conflicts=('xf86-video-mach64<6.8.2')
+
+ if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+ fi
+
+ make -C mach64 DESTDIR="${pkgdir}" install
+}
+
+package_lib32-mga-dri() {
+ depends=("lib32-libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for Matrox (32-bit)"
+ conflicts=('xf86-video-mga<1.4.11')
+
+ if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+ fi
+
+ make -C mga DESTDIR="${pkgdir}" install
+}
+
+package_lib32-r128-dri() {
+ depends=("lib32-libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for ATI Rage128 (32-bit)"
+ conflicts=('xf86-video-r128<6.8.1')
+
+ if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+ fi
+
+ make -C r128 DESTDIR="${pkgdir}" install
+}
+
+package_lib32-savage-dri() {
+ depends=("lib32-libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage (32-bit)"
+ conflicts=('xf86-video-savage<2.3.1')
+
+ if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+ fi
+
+ make -C savage DESTDIR="${pkgdir}" install
+}
+
+package_lib32-sis-dri() {
+ depends=("lib32-libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for SiS (32-bit)"
+ conflicts=('xf86-video-sis<0.10.2')
+
+ if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+ fi
+
+ make -C sis DESTDIR="${pkgdir}" install
+}
+
+package_lib32-tdfx-dri() {
+ depends=("lib32-libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for 3dfx (32-bit)"
+ conflicts=('xf86-video-tdfx<1.4.3')
+
+ if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+ fi
+
+ make -C tdfx DESTDIR="${pkgdir}" install
+}
+
+package_lib32-nouveau-dri() {
+ depends=("lib32-libgl=${pkgver}")
+ pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)"
+
+ if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+ fi
+
+ # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
+ make -C nouveau DESTDIR="${pkgdir}" install
+ # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
+ if [ "${_git}" = "true" ]; then
+ make -C ${srcdir}/mesa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
+ else
+ make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
+ fi
+}
+
diff --git a/multilib-testing/lib32-mesa/nouveau-fix-header.patch b/multilib-testing/lib32-mesa/nouveau-fix-header.patch
new file mode 100644
index 000000000..38aa996f1
--- /dev/null
+++ b/multilib-testing/lib32-mesa/nouveau-fix-header.patch
@@ -0,0 +1,86 @@
+From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001
+From: Ben Skeggs <bskeggs@redhat.com>
+Date: Mon, 20 Dec 2010 03:39:36 +0000
+Subject: nouveau: fix includes for latest libdrm
+
+Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+---
+diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
+index ab480ca..747b084 100644
+--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
++++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
+@@ -10,7 +10,7 @@
+ #include "nouveau/nouveau_grobj.h"
+ #include "nouveau/nouveau_notifier.h"
+ #include "nouveau/nouveau_resource.h"
+-#include "nouveau/nouveau_pushbuf.h"
++#include "nouveau/nv04_pushbuf.h"
+
+ #ifndef NV04_PFIFO_MAX_PACKET_LEN
+ #define NV04_PFIFO_MAX_PACKET_LEN 2047
+diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c
+index ce48022..a99df76 100644
+--- a/src/gallium/drivers/nv50/nv50_surface.c
++++ b/src/gallium/drivers/nv50/nv50_surface.c
+@@ -22,7 +22,7 @@
+
+ #define __NOUVEAU_PUSH_H__
+ #include <stdint.h>
+-#include "nouveau/nouveau_pushbuf.h"
++#include "nouveau/nv04_pushbuf.h"
+ #include "nv50_context.h"
+ #include "nv50_resource.h"
+ #include "pipe/p_defines.h"
+diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c
+index e0e65e7..e2fadd3 100644
+--- a/src/gallium/drivers/nvfx/nv04_2d.c
++++ b/src/gallium/drivers/nvfx/nv04_2d.c
+@@ -34,11 +34,11 @@
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <nouveau/nouveau_device.h>
+-#include <nouveau/nouveau_pushbuf.h>
+ #include <nouveau/nouveau_channel.h>
+ #include <nouveau/nouveau_bo.h>
+ #include <nouveau/nouveau_notifier.h>
+ #include <nouveau/nouveau_grobj.h>
++#include <nouveau/nv04_pushbuf.h>
+ #include "nv04_2d.h"
+
+ #include "nouveau/nv_object.xml.h"
+diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c
+index 597664e..339b317 100644
+--- a/src/gallium/drivers/nvfx/nvfx_vbo.c
++++ b/src/gallium/drivers/nvfx/nvfx_vbo.c
+@@ -9,8 +9,7 @@
+ #include "nvfx_resource.h"
+
+ #include "nouveau/nouveau_channel.h"
+-
+-#include "nouveau/nouveau_pushbuf.h"
++#include "nouveau/nv04_pushbuf.h"
+
+ static inline unsigned
+ util_guess_unique_indices_count(unsigned mode, unsigned indices)
+diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
+index 8036b18..c5ac128 100644
+--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h
++++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
+@@ -38,7 +38,6 @@
+ #include <assert.h>
+
+ #include "nouveau_device.h"
+-#include "nouveau_pushbuf.h"
+ #include "nouveau_grobj.h"
+ #include "nouveau_channel.h"
+ #include "nouveau_bo.h"
+@@ -46,6 +45,7 @@
+ #include "nouveau_screen.h"
+ #include "nouveau_state.h"
+ #include "nouveau_surface.h"
++#include "nv04_pushbuf.h"
+
+ #define DRIVER_DATE "20091015"
+ #define DRIVER_AUTHOR "Nouveau"
+--
+cgit v0.8.3-6-g21f6
diff --git a/testing/claws-mail-extra-plugins/PKGBUILD b/testing/claws-mail-extra-plugins/PKGBUILD
index 6d32e06bd..b1110e3ed 100644
--- a/testing/claws-mail-extra-plugins/PKGBUILD
+++ b/testing/claws-mail-extra-plugins/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 118805 2011-04-07 20:23:35Z andyrtr $
+# $Id: PKGBUILD 119030 2011-04-10 14:07:06Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Mildred <mildred593 at online dot fr>
pkgname=claws-mail-extra-plugins
-pkgver=3.7.8
-pkgrel=3
+pkgver=3.7.9
+pkgrel=2
pkgdesc="Extra plugins for claws-mail"
url="http://www.claws-mail.org/plugins.php?branch=EXT"
license=('GPL3')
@@ -33,7 +33,7 @@ replaces=('sylpheed-claws-extra-plugins')
options=('!libtool')
source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2
claws-mail-notification-0.26-libnotify-0.7.patch)
-md5sums=('8a67a00598262f8ca07a4af5cd43361d'
+md5sums=('3d1ebc48f686ab10702380c776b5d5d0'
'b76e1cdbff7af46d6594c34646c06fd0')
build() {
diff --git a/testing/cloog/PKGBUILD b/testing/cloog/PKGBUILD
index 82049f36d..39645a7e5 100644
--- a/testing/cloog/PKGBUILD
+++ b/testing/cloog/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 106802 2011-01-19 09:43:37Z allan $
+# $Id: PKGBUILD 119094 2011-04-10 21:37:04Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
pkgname=cloog
-pkgver=0.16.1
+pkgver=0.16.2
pkgrel=1
pkgdesc="Library that generates loops for scanning polyhedra"
arch=('i686' 'x86_64')
@@ -12,12 +12,16 @@ depends=('isl' 'gmp')
conflicts=('cloog-ppl<0.15.10-2')
options=('!libtool')
source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz)
-md5sums=('947123350d1ff6dcb4b0774947ac015a')
+md5sums=('83877caaa879c7160063138bb18348e7')
build() {
cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr --with-isl=system --with-gmp=system
make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
make check
}
diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD
index d3a6dcdc9..c746c765a 100644
--- a/testing/gcc/PKGBUILD
+++ b/testing/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 116981 2011-03-27 06:16:42Z allan $
+# $Id: PKGBUILD 119099 2011-04-10 21:45:04Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,8 +6,8 @@
pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
pkgver=4.6.0
-pkgrel=1
-#_snapshot=4.6.0-RC-20110321
+pkgrel=2
+_snapshot=4.6-20110408
_libstdcppmanver=20110201 # Note: check source directory name when updating this
pkgdesc="The GNU Compiler Collection"
arch=('i686' 'x86_64')
@@ -15,18 +15,18 @@ license=('GPL' 'LGPL' 'FDL' 'custom')
url="http://gcc.gnu.org"
makedepends=('binutils>=2.21' 'libmpc' 'cloog' 'ppl' 'gcc-ada' 'dejagnu')
options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${pkgver}.tar.bz2
- #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${_snapshot}.tar.bz2
+source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${pkgver}.tar.bz2
+ ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${_snapshot}.tar.bz2
ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
gcc_pure64.patch
gcc-hash-style-both.patch)
-md5sums=('b1957f3209080b2f55bc3756d3a62b7c'
- 'a30090fa655d0db4c970740d353c81f1'
- 'a4687a9035c3e92db7e84fc01fc548ef'
- '120d4675366ee82ea52f9ed65b57da04'
- 'ea003fee5123f5bfbe17cc569cffe867'
- 'c182dfcad477564af9d94e2aa1552bcd'
- '8c76d751c5b99560e8acc3111f62263a'
+md5sums=('51ee21d6bd7955c78cb29038ff8089d0'
+ '92144f8790ca850317b6f4496e534aef'
+ '7286e62b51e126226e10e0e6a1706eae'
+ 'a9da84a451c4484126b2befa446b1638'
+ '94de82b3148b7686901f35c223477813'
+ '6719f6e005e2e443ebc5a3609607e8ef'
+ '0a870e1180a0cb4ffa5264f0b79abe3f'
'1e9fd2eaf0ee47ea64e82c48998f1999'
'4030ee1c08dd1e843c0225b772360e76'
'4df25b623799b148a0703eaeec8fdf3f')
@@ -69,7 +69,7 @@ build() {
--enable-lto --enable-gold --enable-ld=default \
--enable-plugin --with-plugin-ld=ld.gold \
--disable-multilib --disable-libstdcxx-pch \
- --enable-checking=release
+ --enable-checking=release
make
}
diff --git a/testing/isl/PKGBUILD b/testing/isl/PKGBUILD
index 5cd8c8dfa..bba92fb24 100644
--- a/testing/isl/PKGBUILD
+++ b/testing/isl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 106792 2011-01-19 09:34:43Z allan $
+# $Id: PKGBUILD 119089 2011-04-10 21:34:57Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
pkgname=isl
-pkgver=0.05.1
+pkgver=0.06
pkgrel=1
pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints"
arch=('i686' 'x86_64')
@@ -10,16 +10,24 @@ url="http://www.kotnet.org/~skimo/isl/"
license=('LGPL2.1')
options=('!libtool')
source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2)
-md5sums=('8ef8f307d3f042434e358ddf3320dcad')
+md5sums=('504f054eaffdd8d07c497ebe3ebc7e04')
build() {
cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr
make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
make check
}
package() {
cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir/" install
+ make -j1 DESTDIR="$pkgdir/" install
+
+ # this seems a better place for this file...
+ install -dm755 $pkgdir/usr/share/gdb/auto-load/
+ mv $pkgdir/usr/{lib,share/gdb/auto-load}/libisl.so.6.0.0-gdb.py
}
diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD
index 26997608b..5b4bd68c4 100644
--- a/testing/mesa/PKGBUILD
+++ b/testing/mesa/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 117470 2011-04-03 17:24:19Z ibiru $
+# $Id: PKGBUILD 119075 2011-04-10 20:11:41Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
@@ -11,7 +11,7 @@ _git=false
if [ "${_git}" = "true" ]; then
pkgver=7.10.0.git20110215
else
- pkgver=7.10.1
+ pkgver=7.10.2
fi
pkgrel=2
arch=('i686' 'x86_64')
@@ -19,17 +19,18 @@ makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.23' 'libxxf86vm>=1.1.0'
'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake')
url="http://mesa3d.sourceforge.net"
license=('custom')
-source=(LICENSE)
+source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch)
if [ "${_git}" = "true" ]; then
# mesa git shot from 7.10 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=cc1636b6db85604510f97f8a37d7fd0ecf453866
source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-cc1636b6db85604510f97f8a37d7fd0ecf453866.tar.bz2')
else
source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
- gnome-shell-shader-fix.patch)
+)
fi
md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
- 'efe8da4d80c2a5d32a800770b8ce5dfa'
- '3ec78f340f9387abd7a37b195e764cbf')
+ '3ec78f340f9387abd7a37b195e764cbf'
+ '67c87b77cc2236b52a3b47dad3fbb5d4'
+ 'f5de82852f1243f42cc004039e10b771')
build() {
if [ "${_git}" = "true" ]; then
@@ -42,6 +43,7 @@ fi
#backport from master to fix gnome-shell shader
#https://bugs.freedesktop.org/show_bug.cgi?id=35714
patch -Np1 -i "${srcdir}/gnome-shell-shader-fix.patch"
+patch -Np1 -i "${srcdir}/nouveau-fix-header.patch"
if [ "${_git}" = "true" ]; then
./autogen.sh --prefix=/usr \
@@ -105,7 +107,7 @@ fi
ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
- install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
}
package_libgles() {
@@ -130,7 +132,7 @@ fi
bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/"
install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
- install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/"
}
package_libegl() {
@@ -160,7 +162,7 @@ fi
bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/"
install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
- install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
}
package_mesa() {
depends=('libgl' 'libx11>=1.3.5' 'libxt>=1.0.8' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.22' 'glproto>=1.4.12')
@@ -187,7 +189,7 @@ fi
rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR}
install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
- install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
}
package_ati-dri() {
diff --git a/testing/mesa/nouveau-fix-header.patch b/testing/mesa/nouveau-fix-header.patch
new file mode 100644
index 000000000..38aa996f1
--- /dev/null
+++ b/testing/mesa/nouveau-fix-header.patch
@@ -0,0 +1,86 @@
+From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001
+From: Ben Skeggs <bskeggs@redhat.com>
+Date: Mon, 20 Dec 2010 03:39:36 +0000
+Subject: nouveau: fix includes for latest libdrm
+
+Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+---
+diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
+index ab480ca..747b084 100644
+--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
++++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
+@@ -10,7 +10,7 @@
+ #include "nouveau/nouveau_grobj.h"
+ #include "nouveau/nouveau_notifier.h"
+ #include "nouveau/nouveau_resource.h"
+-#include "nouveau/nouveau_pushbuf.h"
++#include "nouveau/nv04_pushbuf.h"
+
+ #ifndef NV04_PFIFO_MAX_PACKET_LEN
+ #define NV04_PFIFO_MAX_PACKET_LEN 2047
+diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c
+index ce48022..a99df76 100644
+--- a/src/gallium/drivers/nv50/nv50_surface.c
++++ b/src/gallium/drivers/nv50/nv50_surface.c
+@@ -22,7 +22,7 @@
+
+ #define __NOUVEAU_PUSH_H__
+ #include <stdint.h>
+-#include "nouveau/nouveau_pushbuf.h"
++#include "nouveau/nv04_pushbuf.h"
+ #include "nv50_context.h"
+ #include "nv50_resource.h"
+ #include "pipe/p_defines.h"
+diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c
+index e0e65e7..e2fadd3 100644
+--- a/src/gallium/drivers/nvfx/nv04_2d.c
++++ b/src/gallium/drivers/nvfx/nv04_2d.c
+@@ -34,11 +34,11 @@
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <nouveau/nouveau_device.h>
+-#include <nouveau/nouveau_pushbuf.h>
+ #include <nouveau/nouveau_channel.h>
+ #include <nouveau/nouveau_bo.h>
+ #include <nouveau/nouveau_notifier.h>
+ #include <nouveau/nouveau_grobj.h>
++#include <nouveau/nv04_pushbuf.h>
+ #include "nv04_2d.h"
+
+ #include "nouveau/nv_object.xml.h"
+diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c
+index 597664e..339b317 100644
+--- a/src/gallium/drivers/nvfx/nvfx_vbo.c
++++ b/src/gallium/drivers/nvfx/nvfx_vbo.c
+@@ -9,8 +9,7 @@
+ #include "nvfx_resource.h"
+
+ #include "nouveau/nouveau_channel.h"
+-
+-#include "nouveau/nouveau_pushbuf.h"
++#include "nouveau/nv04_pushbuf.h"
+
+ static inline unsigned
+ util_guess_unique_indices_count(unsigned mode, unsigned indices)
+diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
+index 8036b18..c5ac128 100644
+--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h
++++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
+@@ -38,7 +38,6 @@
+ #include <assert.h>
+
+ #include "nouveau_device.h"
+-#include "nouveau_pushbuf.h"
+ #include "nouveau_grobj.h"
+ #include "nouveau_channel.h"
+ #include "nouveau_bo.h"
+@@ -46,6 +45,7 @@
+ #include "nouveau_screen.h"
+ #include "nouveau_state.h"
+ #include "nouveau_surface.h"
++#include "nv04_pushbuf.h"
+
+ #define DRIVER_DATE "20091015"
+ #define DRIVER_AUTHOR "Nouveau"
+--
+cgit v0.8.3-6-g21f6
diff --git a/testing/miro/PKGBUILD b/testing/miro/PKGBUILD
new file mode 100644
index 000000000..a923b8f65
--- /dev/null
+++ b/testing/miro/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 119004 2011-04-10 11:32:39Z eric $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=miro
+pkgver=3.5.1
+pkgrel=2
+pkgdesc="The free and open source internet TV platform"
+arch=('i686' 'x86_64')
+url="http://www.getmiro.com"
+license=('GPL2')
+depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
+ 'python-pysqlite' 'pywebkitgtk' 'shared-mime-info'
+ 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
+ 'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar'
+ 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl')
+makedepends=('pkg-config')
+install=miro.install
+source=(http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('0f5c2a307e7040c9c2895ee9a2d1c3ff99d34e9e')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}/linux"
+
+ python2 setup.py install --root="${pkgdir}"
+
+ # fix miro startup script so --debug works with python2
+ sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro"
+ sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro"
+}
diff --git a/testing/miro/miro.install b/testing/miro/miro.install
new file mode 100644
index 000000000..a5ee228aa
--- /dev/null
+++ b/testing/miro/miro.install
@@ -0,0 +1,17 @@
+post_install() {
+ update-desktop-database -q
+ xdg-icon-resource forceupdate --theme hicolor
+ update-mime-database usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ update-desktop-database -q
+ xdg-icon-resource forceupdate --theme hicolor
+ update-mime-database usr/share/mime > /dev/null
+}
+
+
diff --git a/testing/networkmanager/PKGBUILD b/testing/networkmanager/PKGBUILD
index fb2c07498..a5991fa4c 100644
--- a/testing/networkmanager/PKGBUILD
+++ b/testing/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118015 2011-04-05 06:49:05Z heftig $
+# $Id: PKGBUILD 119010 2011-04-10 13:15:03Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinxu.org>
# Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org>
# Contributor: Tor Krill <tor@krill.nu>
@@ -7,7 +7,7 @@
pkgname=networkmanager
pkgver=0.8.998
-pkgrel=1
+pkgrel=2
pkgdesc="Network Management daemon"
arch=('i686' 'x86_64')
license=('GPL')
@@ -55,4 +55,6 @@ package() {
make DESTDIR="${pkgdir}" install
install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/"
+
+ rm -rf "${pkgdir}/var/run/"
}
diff --git a/testing/udisks/01-mkfs-tempdir.patch b/testing/udisks/01-mkfs-tempdir.patch
new file mode 100644
index 000000000..976108264
--- /dev/null
+++ b/testing/udisks/01-mkfs-tempdir.patch
@@ -0,0 +1,17 @@
+# Description: Daemon does not create /var/run/udisks/, so mkfs jobs fail.
+# Just create the directory in /tmp, this is what /tmp is for, after all.
+# Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=24265
+
+Index: udisks/src/helpers/job-mkfs.c
+===================================================================
+--- udisks.orig/src/helpers/job-mkfs.c 2010-12-05 23:08:54.587881164 +0100
++++ udisks/src/helpers/job-mkfs.c 2010-12-05 23:09:12.399889312 +0100
+@@ -546,7 +546,7 @@
+ /* take ownership of the device if requested */
+ if (take_ownership_uid != 0 || take_ownership_gid != 0)
+ {
+- char dir[256] = PACKAGE_LOCALSTATE_DIR "/run/udisks/job-mkfs-XXXXXX";
++ char dir[256] = "/tmp/job-mkfs-XXXXXX";
+
+ if (mkdtemp (dir) == NULL)
+ {
diff --git a/testing/udisks/PKGBUILD b/testing/udisks/PKGBUILD
new file mode 100644
index 000000000..98feb0535
--- /dev/null
+++ b/testing/udisks/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 119007 2011-04-10 12:50:18Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=udisks
+pkgver=1.0.3
+pkgrel=1
+pkgdesc="Disk Management Service"
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/udisks"
+license=('GPL')
+depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'lvm2' 'eject')
+makedepends=('intltool' 'docbook-xsl' 'gtk-doc')
+options=(!libtool)
+#source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
+source=(ftp://ftp.archlinux.org/other/${pkgname}-${pkgver}.tar.xz
+ 01-mkfs-tempdir.patch)
+sha256sums=('a4d18b2de59c1567df5342f26960c6c3e70a0320f7bafe42893f2708c9b57dd5'
+ '786c0adb1a37e16b351c906527e3cbd17193bb51d8c1dd0889f216556c419c6c')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/01-mkfs-tempdir.patch"
+ ./autogen.sh
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --libexecdir=/usr/lib/udisks --disable-static
+ #fix location for bash_completion helper
+ sed -i -e 's|profile.d|bash_completion.d|' tools/Makefile
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ rm -rf "${pkgdir}/var/run"
+}