Sat Sep 29 00:54:37 PDT 2012

30 files changed, 935 insertions, 80 deletions

diff --git a/community-testing/jack2/40-hpet-permissions.rules b/community-testing/jack2/40-hpet-permissions.rules
new file mode 100644
index 000000000..7af3780f9
--- /dev/null
+++ b/community-testing/jack2/40-hpet-permissions.rules
@@ -0,0 +1,2 @@
+KERNEL=="rtc0", GROUP="audio"
+KERNEL=="hpet", GROUP="audio"
diff --git a/community-testing/jack2/99-audio.conf b/community-testing/jack2/99-audio.conf
new file mode 100644
index 000000000..eb76ef920
--- /dev/null
+++ b/community-testing/jack2/99-audio.conf
@@ -0,0 +1,2 @@
+@audio 	- rtprio 	99
+@audio 	- memlock 	unlimited
diff --git a/community-testing/jack2/PKGBUILD b/community-testing/jack2/PKGBUILD
new file mode 100644
index 000000000..dd3ab36e0
--- /dev/null
+++ b/community-testing/jack2/PKGBUILD
@@ -0,0 +1,135 @@
+# $Id: PKGBUILD 76735 2012-09-28 16:17:58Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Daniele Paolella <danielepaolella@email.it>
+# Contributor: Philipp Überbacher <hollunder at gmx dot at>
+# Contributor: Thomas Bahn <thomas-bahn at gmx dot net>
+
+pkgbase=jack2
+pkgname=('jack2' 'jack2-dbus')
+#pkgname= # single build (overrides split)
+_tarname=jack
+pkgver=1.9.8
+pkgrel=4
+arch=('i686' 'x86_64')
+url="http://jackaudio.org/"
+backup=(etc/security/limits.d/99-audio.conf)
+license=('GPL')
+makedepends=('python2' 'doxygen' 'libffado'
+             'libsamplerate' 'dbus-core' 'celt')
+source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz"
+        '99-audio.conf'
+        '40-hpet-permissions.rules'
+        'ffado_setbuffsize-jack2.patch')
+md5sums=('1dd2ff054cab79dfc11d134756f27165'
+         'ae65b7c9ebe0fff6c918ba9d97ae342d'
+         '471aad533ff56c5d3cbbf65ce32cadef'
+         '1502d82fe2276d6f224fff6467a0b6f9')
+
+_pyfix() {
+  sed -i 's:bin/env python:bin/env python2:' \
+    "$pkgdir/usr/bin/jack_control"
+}
+
+_wafconf() {
+  python2 waf configure --prefix=/usr \
+                        --alsa \
+                        --firewire \
+                        --doxygen $@
+}
+
+_isbuild() {
+  printf "%s\n" ${pkgname[@]} | grep -qx $1
+}
+
+build() {
+  cd "$srcdir/$_tarname-$pkgver"
+
+  # backport firewire stuff
+  #   - needed for setbuffsize feature in latest stable ffado
+  # from https://github.com/jackaudio/jack2/commit/96e0251
+  (
+  cd $_tarname-$pkgver
+  patch -Np1 -i "$srcdir/ffado_setbuffsize-jack2.patch"
+  )
+
+  # Some optimisation bug exists for current GCC
+  # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663
+  export CFLAGS="${CFLAGS/-O[0-9]/-O0}"
+  export CXXFLAGS="$CFLAGS"
+
+  # fix doxygen building
+  sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript
+
+  # we may do 2 different builds
+  cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver
+
+  # mixed dbus/classic build
+  if _isbuild jack2; then
+    cd $_tarname-$pkgver
+    msg2 "Running Mixed D-Bus/Classic build"
+    _wafconf --classic --dbus
+    python2 waf build $MAKEFLAGS
+    cd ..
+  fi
+
+  # dbus-ONLY build
+  if _isbuild jack2-dbus; then
+    cd $_tarname-dbus-$pkgver
+    msg2 "Running D-Bus-only build"
+    _wafconf --dbus
+    python2 waf build $MAKEFLAGS
+    cd ..
+  fi
+}
+
+package_jack2() {
+  ! _isbuild jack2 && return 0
+
+  pkgdesc="The next-generation JACK with SMP support"
+  depends=('libsamplerate' 'celt')
+  optdepends=('libffado: FireWire support'
+              'dbus-core: jackdbus'
+              'python2: jack_control')
+  conflicts=('jack')
+  provides=('jack' 'jackmp' 'jackdmp' 'jackdbus')
+
+  cd "$srcdir/$_tarname-$pkgver/$_tarname-$pkgver"
+
+  python2 waf install --destdir="$pkgdir"
+
+  # fix for major python transition
+  _pyfix
+
+  # configure realtime access/scheduling
+  # see https://bugs.archlinux.org/task/26343
+  install -Dm644 "$srcdir/99-audio.conf" \
+    "$pkgdir/etc/security/limits.d/99-audio.conf"
+
+  install -Dm644 "$srcdir/40-hpet-permissions.rules" \
+    "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules"
+}
+
+package_jack2-dbus() {
+  ! _isbuild jack2-dbus && return 0
+
+  pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)"
+  depends=('libsamplerate' 'celt' 'dbus-core')
+  optdepends=('libffado: FireWire support'
+              'python2: jack_control')
+  conflicts=('jack' 'jack2')
+  provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus')
+
+  cd "$srcdir/$_tarname-$pkgver/$_tarname-dbus-$pkgver"
+
+  python2 waf install --destdir="$pkgdir"
+
+  _pyfix
+
+  install -Dm644 "$srcdir/99-audio.conf" \
+    "$pkgdir/etc/security/limits.d/99-audio.conf"
+
+  install -Dm644 "$srcdir/40-hpet-permissions.rules" \
+    "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/jack2/ffado_setbuffsize-jack2.patch b/community-testing/jack2/ffado_setbuffsize-jack2.patch
new file mode 100644
index 000000000..0c74aad24
--- /dev/null
+++ b/community-testing/jack2/ffado_setbuffsize-jack2.patch
@@ -0,0 +1,139 @@
+From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001
+From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
+Date: Sat, 17 Mar 2012 22:36:30 +0100
+Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size
+
+This is a port of Jonathan Woithe's patch from jackd1.
+With sufficiently recent versions of FFADO, it allows to change
+the buffersize at runtime.
+---
+ linux/firewire/JackFFADODriver.cpp |   65 ++++++++++++++++++++++++++++++++----
+ linux/firewire/JackFFADODriver.h   |    6 ++++
+ 2 files changed, 65 insertions(+), 6 deletions(-)
+
+diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp
+index b33e1cd..085b78a 100644
+--- a/linux/firewire/JackFFADODriver.cpp
++++ b/linux/firewire/JackFFADODriver.cpp
+@@ -3,6 +3,7 @@
+ Copyright (C) 2004 Grame
+ Copyright (C) 2007 Pieter Palmers
+ Copyright (C) 2009 Devin Anderson
++Copyright (C) 2012 Jonathan Woithe, Adrian Knoth
+ 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -48,7 +49,10 @@
+ namespace Jack
+ {
+ 
++// Basic functionality requires API version 8.  If version 9 or later
++// is present the buffers can be resized at runtime.
+ #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8
++#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9
+ 
+ #define jack_get_microseconds GetMicroSeconds
+ 
+@@ -281,19 +285,68 @@
+ int
+ JackFFADODriver::SetBufferSize (jack_nframes_t nframes)
+ {
+-    printError("Buffer size change requested but not supported!!!");
++    ffado_driver_t* driver = (ffado_driver_t*)fDriver;
++    signed int chn;
++
++    // The speed of this function isn't critical; we can afford the
++    // time to check the FFADO API version.
++    if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE ||
++		    ffado_streaming_set_period_size == NULL) {
++	    printError("unsupported on current version of FFADO; please upgrade FFADO");
++	    return -1;
++    }
+ 
+-    /*
+     driver->period_size = nframes;
+     driver->period_usecs =
+             (jack_time_t) floor ((((float) nframes) / driver->sample_rate)
+                                  * 1000000.0f);
+-    */
++
++
++    // Reallocate the null and scratch buffers.
++    driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t));
++    if(driver->nullbuffer == NULL) {
++	    printError("could not allocate memory for null buffer");
++	    return -1;
++    }
++    driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t));
++    if(driver->scratchbuffer == NULL) {
++	    printError("could not allocate memory for scratch buffer");
++	    return -1;
++    }
++
++    // MIDI buffers need reallocating
++    for (chn = 0; chn < driver->capture_nchannels; chn++) {
++	    if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) {
++		    // setup the midi buffer
++		    if (driver->capture_channels[chn].midi_buffer != NULL)
++			    free(driver->capture_channels[chn].midi_buffer);
++		    driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t));
++	    }
++    }
++    for (chn = 0; chn < driver->playback_nchannels; chn++) {
++	    if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) {
++		    if (driver->playback_channels[chn].midi_buffer != NULL)
++			    free(driver->playback_channels[chn].midi_buffer);
++		    driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t));
++	    }
++    }
++
++    // Notify FFADO of the period size change
++    if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) {
++	    printError("could not alter FFADO device period size");
++	    return -1;
++    }
++
++    // This is needed to give the shadow variables a chance to
++    // properly update to the changes.
++    sleep(1);
+ 
+     /* tell the engine to change its buffer size */
+-    //driver->engine->set_buffer_size (driver->engine, nframes);
++    JackAudioDriver::SetBufferSize(nframes);  // Generic change, never fails
+ 
+-    return -1; // unsupported
++    UpdateLatencies();
++
++    return 0;
+ }
+ 
+ typedef void (*JackDriverFinishFunction) (jack_driver_t *);
+@@ -306,7 +359,7 @@
+ 
+     assert(params);
+ 
+-    if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) {
++    if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) {
+         printError("Incompatible libffado version! (%s)", ffado_get_version());
+         return NULL;
+     }
+diff --git a/linux/firewire/JackFFADODriver.h b/linux/firewire/JackFFADODriver.h
+index cb2a45d..790f4dd 100644
+--- a/linux/firewire/JackFFADODriver.h
++++ b/linux/firewire/JackFFADODriver.h
+@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver
+         int Read();
+         int Write();
+ 
++        // BufferSize can be changed
++        bool IsFixedBufferSize()
++        {
++            return false;
++        }
++
+         int SetBufferSize(jack_nframes_t nframes);
+ };
+ 
+-- 
+1.7.10
+
diff --git a/community/geany/PKGBUILD b/community/geany/PKGBUILD
index cfce909ce..f294fb7e1 100644
--- a/community/geany/PKGBUILD
+++ b/community/geany/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72665 2012-06-18 19:58:17Z arodseth $
+# $Id: PKGBUILD 76751 2012-09-28 23:09:27Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Ionut Biru  <ibiru@archlinux.ro>
@@ -7,14 +7,14 @@
 
 pkgname=geany
 pkgver=1.22
-pkgrel=1
-pkgdesc="Fast and lightweight IDE"
+pkgrel=2
+pkgdesc='Fast and lightweight IDE'
 arch=('x86_64' 'i686')
 url="http://www.geany.org/"
 license=('GPL')
-depends=('gtk2' 'hicolor-icon-theme' 'desktop-file-utils' 'python2')
-makedepends=('perlxml' 'intltool')
-optdepends=("vte: for terminal support")
+depends=('gtk2' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('perlxml' 'setconf' 'intltool')
+optdepends=('vte: for terminal support' 'python2')
 install=geany.install
 source=("http://download.geany.org/$pkgname-$pkgver.tar.bz2")
 options=('!libtool')
@@ -30,9 +30,9 @@ build() {
   msg2 "Python2 fix..."
 	sed -i '0,/on/s//on2/' data/templates/files/main.py
   msg2 "Fixing FS#10318..."
-  sed -i 's|MimeType=text/plain;|MimeType=|' geany.desktop
+  setconf geany.desktop MimeType ''
   msg2 "Enabling colors for PKGBUILD files..."
-  sed -i 's|Sh=|Sh=PKGBUILD;|' data/filetype_extensions.conf
+  setconf data/filetype_extensions.conf Sh PKGBUILD
 }
 
 package() {
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index 7b9c24ce0..1bb6e6868 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72888 2012-06-24 13:42:51Z arodseth $
+# $Id: PKGBUILD 76749 2012-09-28 22:40:14Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Rémy Oudompheng  <remy@archlinux.org>
@@ -9,8 +9,8 @@
 # Contributor: Daniel YC Lin <dlin.tw@gmail.com>
 
 pkgname=go
-pkgver=1.0.2
-pkgrel=2
+pkgver=1.0.3
+pkgrel=1
 epoch=2
 pkgdesc='Google Go compiler and tools'
 arch=('x86_64' 'i686')
@@ -23,16 +23,22 @@ install=go.install
 backup=('usr/lib/go/bin')
 source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz"
         "$pkgname.sh")
-sha256sums=('70fcfb455087c14cc59b7a65c78003fcd1323d73f9b991c1e52db535d6bc95a8'
+sha256sums=('7fba3533d172f13629d3d8a79e57c620632b0bd075abe11d7698b338be0ae3df'
             'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892')
 
 build() {
-  cd "$srcdir/$pkgname"
+  if [ "$CARCH" == 'x86_64' ]; then
+    export GOARCH=amd64
+  fi
+  if [ "$CARCH" == 'i686' ]; then
+    export GOARCH=386
+  fi
+
+  # Set GOARCH to arm for crosscompilation (currently doesn't work)
 
+  cd "$srcdir/$pkgname"
   export GOROOT_FINAL="/usr/lib/go"
   export GOOS=linux
-  export GOARCH=arm
-
   cd src
   bash make.bash
 }
@@ -72,12 +78,12 @@ package() {
 
   cp -r doc misc -t "$pkgdir/usr/share/go"
   ln -s /usr/share/go/doc "$pkgdir/usr/lib/go/doc"
-  cp -r --preserve=timestamps bin "$pkgdir/usr"
-  cp -r --preserve=timestamps pkg "$pkgdir/usr/lib/go"
-  cp -r --preserve=timestamps $GOROOT/src/pkg "$pkgdir/usr/lib/go/src/"
-  cp -r --preserve=timestamps $GOROOT/src/cmd "$pkgdir/usr/lib/go/src/cmd"
-  cp -r --preserve=timestamps $GOROOT/src/lib9 "$pkgdir/usr/lib/go/src/"
-  cp -r --preserve=timestamps $GOROOT/lib "$pkgdir/usr/lib/go/"
+  cp -a bin "$pkgdir/usr"
+  cp -a pkg "$pkgdir/usr/lib/go"
+  cp -a $GOROOT/src/pkg "$pkgdir/usr/lib/go/src/"
+  cp -a $GOROOT/src/cmd "$pkgdir/usr/lib/go/src/cmd"
+  cp -a $GOROOT/src/lib9 "$pkgdir/usr/lib/go/src/"
+  cp -a $GOROOT/lib "$pkgdir/usr/lib/go/"
 
   install -Dm644 src/Make.* "$pkgdir/usr/lib/go/src"
 
diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD
index ced1b0de5..213ebbbda 100644
--- a/community/gpsdrive/PKGBUILD
+++ b/community/gpsdrive/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 73996 2012-07-18 01:07:11Z ibiru $
+# $Id: PKGBUILD 76745 2012-09-28 20:24:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: damir <damir@archlinux.org>
 
 pkgname=gpsdrive
 pkgver=2.11
-_pkgver=20120711
-pkgrel=13
+_pkgver=20120928
+pkgrel=14
 pkgdesc="A car (bike, ship, plane) navigation system"
 arch=("i686" "x86_64")
 url="http://www.gpsdrive.de/"
@@ -17,8 +17,8 @@ depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' '
 makedepends=('cmake>=2.4.4' 'boost' 'cfitsio')
 install="gpsdrive.install"
 #source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz")
-source=("http://arch.p5n.pp.ru/~sergej/dl/2012/${pkgname}-${_pkgver}.tar.xz")
-md5sums=('48fe20e111c10d0826d9f05746c9cf74')
+source=("http://arch.p5n.pp.ru/~sergej/dl/2012/${pkgname}-${_pkgver}.tar.gz")
+md5sums=('bc53792529788b81c291a32d628a4850')
 
 build() {
   cd "$srcdir"
@@ -34,6 +34,7 @@ build() {
   cd build
 
   sed -i 's|GdkGC \*kontext_map;|extern GdkGC *kontext_map;|' $srcdir/gpsdrive-${_pkgver}/src/gpsdrive.c
+  sed -i '22,1i#include <mapnik/graphics.hpp>' $srcdir/gpsdrive-${_pkgver}/src/mapnik.cpp
 
   export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/
   export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/
diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD
index 550d0d2be..c37ca0408 100644
--- a/community/mapnik/PKGBUILD
+++ b/community/mapnik/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 74816 2012-08-06 08:20:52Z spupykin $
+# $Id: PKGBUILD 76741 2012-09-28 19:41:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Dent <thewinch@gmail.com>
 # Contributor: orbisvicis <orbisvicis@gmail.com>
 
 pkgname=mapnik
-pkgver=2.0.2
+pkgver=2.1.0
 pkgrel=1
 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps"
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ optdepends=('libxslt:         Web Map Service'
 makedepends=('scons' 'boost')
 install="mapnik.install"
 source=("https://github.com/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2")
-md5sums=('c00f4fa2d5f3c344d93d71afdfce3a5e')
+md5sums=('d580c558a957444873bec9e24526b0a0')
 
 build() {
   cd "$srcdir/$pkgname-v$pkgver"
diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD
index 62c4f17c0..d2234a0ff 100644
--- a/community/pinot/PKGBUILD
+++ b/community/pinot/PKGBUILD
@@ -1,12 +1,13 @@
-# $Id: PKGBUILD 76182 2012-09-12 19:21:50Z jlichtblau $
+# $Id: PKGBUILD 76755 2012-09-28 23:44:46Z arodseth $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=pinot
 pkgver=1.01
-pkgrel=1
+pkgrel=2
 pkgdesc='Personal search and metasearch tool'
 arch=('i686' 'x86_64')
 url='http://code.google.com/p/pinot-search/'
@@ -29,22 +30,31 @@ source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz)
 sha256sums=('a2a82009db05ca7abb4ffbd8baafa8fb820a7e961fd3cdcb21af46bb05eb57d4')
 
 build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat_conf.txt
+  cd $srcdir/$pkgname-$pkgver
+  x='/usr/share/libtextcat/'
   sed -i 's|/LM/russian.lm|/LM/russian-windows1251.lm|' textcat_conf.txt
-  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat3_conf.txt
-  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat31_conf.txt
-  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat32_conf.txt
-  sed -i -e "s|.*russian$|/usr/share/libtextcat/LM/russian-iso8859_5.lm   russian-iso8859_5\n\
-/usr/share/libtextcat/LM/russian-koi8_r.lm      russian-koi8_r\n\
-/usr/share/libtextcat/LM/russian-windows1251.lm russian-windows1251|" textcat3_conf.txt
+  sed -i "s|$x|${x}LM/|" \
+    textcat_conf.txt \
+    textcat3_conf.txt \
+    textcat31_conf.txt \
+    textcat32_conf.txt
+  sed -i -e "s|.*russian$|${x}LM/russian-iso8859_5.lm   russian-iso8859_5\n\
+${x}LM/russian-koi8_r.lm      russian-koi8_r\n\
+${x}LM/russian-windows1251.lm russian-windows1251|" textcat3_conf.txt
 
-  LIBS="-lboost_system" ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --enable-gtkmm3=yes
+  LIBS="-lboost_system" ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --enable-gtkmm3=yes \
+    --enable-mempool=no
   make
 }
 
 package() {
-  cd "${srcdir}/$pkgname-$pkgver"
+  cd $srcdir/$pkgname-$pkgver
 
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR=$pkgdir install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/pinot/pinot.changelog b/community/pinot/pinot.changelog
index ab865bc42..4cf1a68a2 100644
--- a/community/pinot/pinot.changelog
+++ b/community/pinot/pinot.changelog
@@ -1,3 +1,6 @@
+2012-09-29 Alexander Rødseth <rodseth@gmail.com>
+	* fix FS#31510, adding --enable-mempool=no
+
 2012-09-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* pinot 1.01-1
 
diff --git a/community/vile/PKGBUILD b/community/vile/PKGBUILD
index 1d7b359f8..3b3043fb1 100644
--- a/community/vile/PKGBUILD
+++ b/community/vile/PKGBUILD
@@ -1,25 +1,52 @@
-# $Id: PKGBUILD 76396 2012-09-17 08:49:52Z spupykin $
+# $Id: PKGBUILD 76743 2012-09-28 19:43:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=vile
-pkgver=9.8
-pkgrel=2
+pkgver=9.8_i
+_basever=9.8
+pkgrel=1
 pkgdesc="vi like emacs"
 arch=('i686' 'x86_64')
 url="http://invisible-island.net/vile/vile.html"
 depends=('ncurses')
 license=('custom')
 options=(!libtool)
-source=(ftp://invisible-island.net/vile/vile-$pkgver.tgz)
-md5sums=('b5a0d89165f633a662cdb4b5c57f2e2f')
+source=("ftp://invisible-island.net/vile/vile-${_basever}.tgz"
+	"ftp://invisible-island.net/vile/patches/vile-${_basever}a.patch.gz"
+	"ftp://invisible-island.net/vile/patches/vile-${_basever}b.patch.gz"
+	"ftp://invisible-island.net/vile/patches/vile-${_basever}c.patch.gz"
+	"ftp://invisible-island.net/vile/patches/vile-${_basever}d.patch.gz"
+	"ftp://invisible-island.net/vile/patches/vile-${_basever}e.patch.gz"
+	"ftp://invisible-island.net/vile/patches/vile-${_basever}f.patch.gz"
+	"ftp://invisible-island.net/vile/patches/vile-${_basever}g.patch.gz"
+	"ftp://invisible-island.net/vile/patches/vile-${_basever}h.patch.gz"
+	"ftp://invisible-island.net/vile/patches/vile-${_basever}i.patch.gz")
+md5sums=('b5a0d89165f633a662cdb4b5c57f2e2f'
+         '685cb681943e9315a1689a6a6f4734cb'
+         'f3842ea427c635d0ee96f6da8566fa56'
+         '69cfdbb0b84a51802455bbe44a5ce32e'
+         '5d675193bc02ac4cab72452bf0051489'
+         '1e6317a15d7b2cd99f921f3af312b977'
+         '7f8a38272395f07e1377cc1943d37e7f'
+         '26ab76a7305b7ec97b22855810911ceb'
+         '6ea4cf22e29f5418f26ba6632985c70e'
+         '908e8f9cf3c9a681c3ef76a3cd04a0c3')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname-${_basever}
+
+  for i in $srcdir/vile-${_basever}?.patch; do
+    patch -p1 <$i
+  done
   sed -i 's|FLEX_BETA|FLEX_NOBETA|g' filters/filters.h
+
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-${_basever}
   make install DESTDIR=$pkgdir
-  mv $pkgdir/usr/man $pkgdir/usr/share/
 
   mkdir -p $pkgdir/usr/share/licenses/$pkgname
   cat <<EOF >$pkgdir/usr/share/licenses/$pkgname/license
diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index fbda66e3b..c326518e2 100644
--- a/extra/accountsservice/PKGBUILD
+++ b/extra/accountsservice/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 162754 2012-06-29 15:28:24Z ibiru $
+# $Id: PKGBUILD 167219 2012-09-28 15:17:55Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=accountsservice
-pkgver=0.6.22
+pkgver=0.6.25
 pkgrel=1
 pkgdesc="D-Bus interface for user account query and manipulation"
 arch=(i686 x86_64)
@@ -11,11 +11,14 @@ license=('GPL3')
 depends=('glib2' 'polkit' 'libsystemd')
 makedepends=('intltool' 'gobject-introspection' 'vala')
 options=('!libtool')
-source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.xz)
-md5sums=('6159898955b4c7079a8ae64cd7aa5bf1')
+source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.xz
+        more-exclusions.patch)
+md5sums=('8438df64afffa3bd065c9c3134adb1e7'
+         '1d5cf127e5aac407fe7c37b2f4fd503c')
 
 build() {
   cd $pkgname-$pkgver
+  patch -Np1 -i ../more-exclusions.patch
   ./autogen.sh --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/accountsservice \
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
diff --git a/extra/accountsservice/more-exclusions.patch b/extra/accountsservice/more-exclusions.patch
new file mode 100644
index 000000000..46a80c4c9
--- /dev/null
+++ b/extra/accountsservice/more-exclusions.patch
@@ -0,0 +1,12 @@
+diff --git i/src/daemon.c w/src/daemon.c
+index c65eca3..9166055 100644
+--- i/src/daemon.c
++++ w/src/daemon.c
+@@ -77,6 +77,7 @@ static const char *default_excludes[] = {
+         "games",
+         "man",
+         "at",
++        "git",
+         NULL
+ };
+ 
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index 30961851c..5922c966b 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162978 2012-07-04 13:56:20Z andyrtr $
+# $Id: PKGBUILD 167231 2012-09-28 20:06:45Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=lftp
-pkgver=4.3.8
+pkgver=4.4.0
 pkgrel=1
 pkgdesc="Sophisticated command line based FTP client"
 arch=('i686' 'x86_64')
@@ -12,11 +12,14 @@ depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh')
 optdepends=('perl: needed for convert-netscape-cookies and verify-file')
 url="http://lftp.yar.ru/"
 backup=('etc/lftp.conf')
-source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('adced9c3e0f6b96821811dc87c0a1eeb')
+source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2
+       lftp-4.3.8-gets.patch)
+md5sums=('9d6a048bb6be9bc3baecfea53b0d8330'
+         '77168a7f368b07eec7e079b55496fa97')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/lftp-4.3.8-gets.patch
   ./configure --prefix=/usr --with-gnutls \
 	--without-openssl --disable-static
   make
diff --git a/extra/lftp/lftp-4.3.8-gets.patch b/extra/lftp/lftp-4.3.8-gets.patch
new file mode 100644
index 000000000..d4a11804e
--- /dev/null
+++ b/extra/lftp/lftp-4.3.8-gets.patch
@@ -0,0 +1,16 @@
+diff -up lftp-4.3.8/lib/stdio.in.h.gets lftp-4.3.8/lib/stdio.in.h
+--- lftp-4.3.8/lib/stdio.in.h.gets	2012-07-22 15:07:15.101115146 -0400
++++ lftp-4.3.8/lib/stdio.in.h	2012-07-22 15:08:09.777098512 -0400
+@@ -702,10 +702,12 @@ _GL_WARN_ON_USE (getline, "getline is un
+ /* It is very rare that the developer ever has full control of stdin,
+    so any use of gets warrants an unconditional warning; besides, C11
+    removed it.  */
++#if defined gets
+ #undef gets
+ #if HAVE_RAW_DECL_GETS
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
++#endif // if defined gets
+ 
+ 
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
diff --git a/extra/xf86-video-mga/PKGBUILD b/extra/xf86-video-mga/PKGBUILD
index 865b31771..79c9a9917 100644
--- a/extra/xf86-video-mga/PKGBUILD
+++ b/extra/xf86-video-mga/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 163651 2012-07-17 16:31:39Z andyrtr $
+# $Id: PKGBUILD 167227 2012-09-28 19:49:02Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-mga
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=1
 pkgdesc="X.org mga video driver"
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ conflicts=('xorg-server<1.12.0')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6a70f5015f822eef82a18eedf3d3ee5fdfa81f1c0e701103ab837ffbd61aa4b4')
+sha256sums=('3f89ce250eea93f0de890954687790e06c0bab9e3e303df393e8759a187eca6c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD
index e9b5ecbfe..31c15e8a5 100644
--- a/extra/xf86-video-r128/PKGBUILD
+++ b/extra/xf86-video-r128/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 163655 2012-07-17 16:35:34Z andyrtr $
+# $Id: PKGBUILD 167229 2012-09-28 19:51:26Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-r128
-pkgver=6.8.4
+pkgver=6.9.1
 pkgrel=1
 pkgdesc="X.org ati Rage128 video driver"
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ conflicts=('xorg-server<1.12.0')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6fbfbba2589c1daf45f048009d6521bb687adbdf2f695eb961b316ce68935cd7')
+sha256sums=('8be3baa8d3b19e3a05f00a53bf35784e144dc2ad14c358f97870c072e634e44c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/multilib-testing/jack2-multilib/40-hpet-permissions.rules b/multilib-testing/jack2-multilib/40-hpet-permissions.rules
new file mode 100644
index 000000000..7af3780f9
--- /dev/null
+++ b/multilib-testing/jack2-multilib/40-hpet-permissions.rules
@@ -0,0 +1,2 @@
+KERNEL=="rtc0", GROUP="audio"
+KERNEL=="hpet", GROUP="audio"
diff --git a/multilib-testing/jack2-multilib/99-audio.conf b/multilib-testing/jack2-multilib/99-audio.conf
new file mode 100644
index 000000000..eb76ef920
--- /dev/null
+++ b/multilib-testing/jack2-multilib/99-audio.conf
@@ -0,0 +1,2 @@
+@audio 	- rtprio 	99
+@audio 	- memlock 	unlimited
diff --git a/multilib-testing/jack2-multilib/PKGBUILD b/multilib-testing/jack2-multilib/PKGBUILD
new file mode 100644
index 000000000..e5b3d3b47
--- /dev/null
+++ b/multilib-testing/jack2-multilib/PKGBUILD
@@ -0,0 +1,158 @@
+# $Id: PKGBUILD 76737 2012-09-28 17:05:26Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+
+# This one is in response to a need for an equivalent to lib32-jack for
+# jack2. A lib32-jack2 would require much patching and invading the pure
+# jack2 package, and what's more, the buildsystem provides a flag just to
+# build a hybrid jack2 in full. As such, we have opted to provide multilib
+# users with a replacement package instead of the usual lib32 add-on.
+#
+# See http://mailman.archlinux.org/pipermail/arch-multilib/2011-December/000251.html
+
+pkgbase=jack2-multilib
+pkgname=('jack2-multilib' 'jack2-dbus-multilib')
+#pkgname= # single build (overrides split)
+_tarname=jack
+pkgver=1.9.8
+pkgrel=4
+arch=('x86_64')
+url="http://jackaudio.org/"
+backup=(etc/security/limits.d/99-audio.conf)
+license=('GPL')
+makedepends=('python2' 'doxygen' 'libffado'
+             'libsamplerate' 'lib32-dbus-core' 'lib32-celt'
+             'gcc-multilib')
+source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz"
+        '99-audio.conf'
+        '40-hpet-permissions.rules'
+        'ffado_setbuffsize-jack2.patch')
+md5sums=('1dd2ff054cab79dfc11d134756f27165'
+         'ae65b7c9ebe0fff6c918ba9d97ae342d'
+         '471aad533ff56c5d3cbbf65ce32cadef'
+         '1502d82fe2276d6f224fff6467a0b6f9')
+
+_pyfix() {
+  sed -i 's:bin/env python:bin/env python2:' \
+    "$pkgdir/usr/bin/jack_control"
+}
+
+_wafconf() {
+  python2 waf configure --prefix=/usr \
+                        --alsa \
+                        --firewire \
+                        --mixed \
+                        --doxygen $@
+}
+
+_isbuild() {
+  printf "%s\n" ${pkgname[@]} | grep -qx $1
+}
+
+_mklinks() {
+  ln -s /usr/lib32/libjack.so.0.1.0 "$pkgdir/usr/lib32/libjack.so.0"
+  ln -s /usr/lib32/libjack.so.0 "$pkgdir/usr/lib32/libjack.so"
+}
+
+build() {
+  cd "$srcdir/$_tarname-$pkgver"
+
+  export LINKFLAGS="$LDFLAGS"
+
+  # backport firewire stuff
+  #   - needed for setbuffsize feature in latest stable ffado
+  # from https://github.com/jackaudio/jack2/commit/96e0251
+  (
+  cd $_tarname-$pkgver
+  patch -Np1 -i "$srcdir/ffado_setbuffsize-jack2.patch"
+  )
+
+  # Some optimisation bug exists for current GCC
+  # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663
+  export CFLAGS="${CFLAGS/-O[0-9]/-O0}"
+  export CXXFLAGS="$CFLAGS"
+
+  # fix doxygen building
+  sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript
+
+  # we may do 2 different builds
+  cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver
+
+  # mixed dbus/classic build
+  if _isbuild jack2-multilib; then
+    cd $_tarname-$pkgver
+    msg2 "Running Mixed D-Bus/Classic build"
+    _wafconf --classic --dbus
+    python2 waf build $MAKEFLAGS
+    cd ..
+  fi
+
+  # dbus-ONLY build
+  if _isbuild jack2-dbus-multilib; then
+    cd $_tarname-dbus-$pkgver
+    msg2 "Running D-Bus-only build"
+    _wafconf --dbus
+    python2 waf build $MAKEFLAGS
+    cd ..
+  fi
+}
+
+package_jack2-multilib() {
+  ! _isbuild jack2-multilib && return 0
+
+  pkgdesc="The next-generation JACK with SMP support & mixed mode"
+  depends=('libsamplerate' 'lib32-celt' 'lib32-gcc-libs')
+  optdepends=('libffado: FireWire support'
+              'lib32-dbus-core: jackdbus'
+              'python2: jack_control')
+  conflicts=('jack' 'jack2' 'lib32-jack')
+  provides=('jack' 'jackmp' 'jackdmp' 'jackdbus'
+            'jack2' 'lib32-jack' 'lib32-jack2')
+
+  cd "$srcdir/$_tarname-$pkgver/$_tarname-$pkgver"
+
+  python2 waf install --destdir="$pkgdir"
+
+  # fix for major python transition
+  _pyfix
+
+  # configure realtime access/scheduling
+  # see https://bugs.archlinux.org/task/26343
+  install -Dm644 "$srcdir/99-audio.conf" \
+    "$pkgdir/etc/security/limits.d/99-audio.conf"
+
+  install -Dm644 "$srcdir/40-hpet-permissions.rules" \
+    "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules"
+
+  # should be done by upstream
+  # see http://trac.jackaudio.org/ticket/200
+  _mklinks
+}
+
+package_jack2-dbus-multilib() {
+  ! _isbuild jack2-dbus-multilib && return 0
+
+  pkgdesc="The next-generation JACK with SMP support & mixed mode (for D-BUS interaction only)"
+  depends=('libsamplerate' 'lib32-celt' 'lib32-dbus-core' 'lib32-gcc-libs')
+  optdepends=('libffado: FireWire support'
+              'python2: jack_control')
+  conflicts=('jack' 'jack2' 'lib32-jack' 'jack2-multilib')
+  provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus'
+            'jack2-dbus' 'jack2-multilib' 'lib32-jack' 'lib32-jack2')
+
+  cd "$srcdir/$_tarname-$pkgver/$_tarname-dbus-$pkgver"
+
+  python2 waf install --destdir="$pkgdir"
+
+  _pyfix
+
+  install -Dm644 "$srcdir/99-audio.conf" \
+    "$pkgdir/etc/security/limits.d/99-audio.conf"
+
+  install -Dm644 "$srcdir/40-hpet-permissions.rules" \
+    "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules"
+
+  _mklinks
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/multilib-testing/jack2-multilib/ffado_setbuffsize-jack2.patch b/multilib-testing/jack2-multilib/ffado_setbuffsize-jack2.patch
new file mode 100644
index 000000000..0c74aad24
--- /dev/null
+++ b/multilib-testing/jack2-multilib/ffado_setbuffsize-jack2.patch
@@ -0,0 +1,139 @@
+From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001
+From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
+Date: Sat, 17 Mar 2012 22:36:30 +0100
+Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size
+
+This is a port of Jonathan Woithe's patch from jackd1.
+With sufficiently recent versions of FFADO, it allows to change
+the buffersize at runtime.
+---
+ linux/firewire/JackFFADODriver.cpp |   65 ++++++++++++++++++++++++++++++++----
+ linux/firewire/JackFFADODriver.h   |    6 ++++
+ 2 files changed, 65 insertions(+), 6 deletions(-)
+
+diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp
+index b33e1cd..085b78a 100644
+--- a/linux/firewire/JackFFADODriver.cpp
++++ b/linux/firewire/JackFFADODriver.cpp
+@@ -3,6 +3,7 @@
+ Copyright (C) 2004 Grame
+ Copyright (C) 2007 Pieter Palmers
+ Copyright (C) 2009 Devin Anderson
++Copyright (C) 2012 Jonathan Woithe, Adrian Knoth
+ 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -48,7 +49,10 @@
+ namespace Jack
+ {
+ 
++// Basic functionality requires API version 8.  If version 9 or later
++// is present the buffers can be resized at runtime.
+ #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8
++#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9
+ 
+ #define jack_get_microseconds GetMicroSeconds
+ 
+@@ -281,19 +285,68 @@
+ int
+ JackFFADODriver::SetBufferSize (jack_nframes_t nframes)
+ {
+-    printError("Buffer size change requested but not supported!!!");
++    ffado_driver_t* driver = (ffado_driver_t*)fDriver;
++    signed int chn;
++
++    // The speed of this function isn't critical; we can afford the
++    // time to check the FFADO API version.
++    if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE ||
++		    ffado_streaming_set_period_size == NULL) {
++	    printError("unsupported on current version of FFADO; please upgrade FFADO");
++	    return -1;
++    }
+ 
+-    /*
+     driver->period_size = nframes;
+     driver->period_usecs =
+             (jack_time_t) floor ((((float) nframes) / driver->sample_rate)
+                                  * 1000000.0f);
+-    */
++
++
++    // Reallocate the null and scratch buffers.
++    driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t));
++    if(driver->nullbuffer == NULL) {
++	    printError("could not allocate memory for null buffer");
++	    return -1;
++    }
++    driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t));
++    if(driver->scratchbuffer == NULL) {
++	    printError("could not allocate memory for scratch buffer");
++	    return -1;
++    }
++
++    // MIDI buffers need reallocating
++    for (chn = 0; chn < driver->capture_nchannels; chn++) {
++	    if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) {
++		    // setup the midi buffer
++		    if (driver->capture_channels[chn].midi_buffer != NULL)
++			    free(driver->capture_channels[chn].midi_buffer);
++		    driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t));
++	    }
++    }
++    for (chn = 0; chn < driver->playback_nchannels; chn++) {
++	    if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) {
++		    if (driver->playback_channels[chn].midi_buffer != NULL)
++			    free(driver->playback_channels[chn].midi_buffer);
++		    driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t));
++	    }
++    }
++
++    // Notify FFADO of the period size change
++    if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) {
++	    printError("could not alter FFADO device period size");
++	    return -1;
++    }
++
++    // This is needed to give the shadow variables a chance to
++    // properly update to the changes.
++    sleep(1);
+ 
+     /* tell the engine to change its buffer size */
+-    //driver->engine->set_buffer_size (driver->engine, nframes);
++    JackAudioDriver::SetBufferSize(nframes);  // Generic change, never fails
+ 
+-    return -1; // unsupported
++    UpdateLatencies();
++
++    return 0;
+ }
+ 
+ typedef void (*JackDriverFinishFunction) (jack_driver_t *);
+@@ -306,7 +359,7 @@
+ 
+     assert(params);
+ 
+-    if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) {
++    if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) {
+         printError("Incompatible libffado version! (%s)", ffado_get_version());
+         return NULL;
+     }
+diff --git a/linux/firewire/JackFFADODriver.h b/linux/firewire/JackFFADODriver.h
+index cb2a45d..790f4dd 100644
+--- a/linux/firewire/JackFFADODriver.h
++++ b/linux/firewire/JackFFADODriver.h
+@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver
+         int Read();
+         int Write();
+ 
++        // BufferSize can be changed
++        bool IsFixedBufferSize()
++        {
++            return false;
++        }
++
+         int SetBufferSize(jack_nframes_t nframes);
+ };
+ 
+-- 
+1.7.10
+
diff --git a/testing/dbus-core/PKGBUILD b/testing/dbus-core/PKGBUILD
index 5aa2d0e33..db816986a 100644
--- a/testing/dbus-core/PKGBUILD
+++ b/testing/dbus-core/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163851 2012-07-21 11:19:10Z andyrtr $
+# $Id: PKGBUILD 167221 2012-09-28 19:34:17Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus-core
-pkgver=1.6.4
+pkgver=1.6.6
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
@@ -13,10 +13,9 @@ depends=('expat' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 'systemd-tools')
 makedepends=('libx11')
 options=(!libtool)
 install=dbus.install
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc}
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz #{,.asc}
         dbus)
-md5sums=('5ec43dc4554cba638917317b2b4f7640'
-         '3d4482ee39b49da334441c76f83bf1cb'
+md5sums=('5a8b9093d356adfa937d216ea5eb8abc'
          'f0364f3f5dc5f653bb05d39aa36e3264')
 
 build() {
diff --git a/testing/dbus/PKGBUILD b/testing/dbus/PKGBUILD
index 02b2696d7..b34bc055e 100644
--- a/testing/dbus/PKGBUILD
+++ b/testing/dbus/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 163850 2012-07-21 11:19:03Z andyrtr $
+# $Id: PKGBUILD 167223 2012-09-28 19:36:52Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus
-pkgver=1.6.4
+pkgver=1.6.6
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
 depends=("dbus-core>=$pkgver" 'libx11')
-source=(http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.asc}
+source=(http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz #{,.asc}
         30-dbus)
-md5sums=('5ec43dc4554cba638917317b2b4f7640'
-         '3d4482ee39b49da334441c76f83bf1cb'
+md5sums=('5a8b9093d356adfa937d216ea5eb8abc'
          '9fafe8b28460aeaa6054309ef4c5ed92')
 
 build() {
diff --git a/testing/jack/40-hpet-permissions.rules b/testing/jack/40-hpet-permissions.rules
new file mode 100644
index 000000000..7af3780f9
--- /dev/null
+++ b/testing/jack/40-hpet-permissions.rules
@@ -0,0 +1,2 @@
+KERNEL=="rtc0", GROUP="audio"
+KERNEL=="hpet", GROUP="audio"
diff --git a/testing/jack/99-audio.conf b/testing/jack/99-audio.conf
new file mode 100644
index 000000000..eb76ef920
--- /dev/null
+++ b/testing/jack/99-audio.conf
@@ -0,0 +1,2 @@
+@audio 	- rtprio 	99
+@audio 	- memlock 	unlimited
diff --git a/testing/jack/PKGBUILD b/testing/jack/PKGBUILD
new file mode 100644
index 000000000..185e4d02f
--- /dev/null
+++ b/testing/jack/PKGBUILD
@@ -0,0 +1,65 @@
+# $Id: PKGBUILD 167217 2012-09-28 14:43:50Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: tobias <tobias@archlinux.net>
+# Contributor: Robert Emil Berge <robert@rebi.no>
+
+pkgname=jack
+_longname=jack-audio-connection-kit
+pkgver=0.121.3
+pkgrel=7
+pkgdesc="A low-latency audio server"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL')
+depends=('libsamplerate' 'readline')
+makedepends=('doxygen' 'libffado' 'celt')
+optdepends=('libffado: FireWire support'
+            'celt: NetJACK driver')
+url="http://jackaudio.org/"
+backup=(etc/security/limits.d/99-audio.conf)
+options=('!libtool')
+provides=("$_longname=$pkgver")
+conflicts=("$_longname")
+replaces=("$_longname")
+install=$pkgname.install
+source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz"
+        '99-audio.conf'
+        '40-hpet-permissions.rules'
+        'ffado_setbuffsize-jack1.patch')
+md5sums=('35f470f7422c37b33eb965033f7a42e8'
+         'ae65b7c9ebe0fff6c918ba9d97ae342d'
+         '471aad533ff56c5d3cbbf65ce32cadef'
+         'c1f78ee7847c6d5e471d90626623ffb4')
+
+build() {
+  cd "$srcdir/$_longname-$pkgver"
+
+  # backport firewire stuff
+  #   - needed for setbuffsize feature in latest stable ffado
+  # from https://github.com/jackaudio/jack1/commit/025d3ad
+  patch -Np1 -i "$srcdir/ffado_setbuffsize-jack1.patch"
+
+  ./configure --prefix=/usr \
+              --libdir=/usr/lib
+  make
+}
+
+package() {
+  cd "$srcdir/$_longname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  # configure realtime access/scheduling
+  # see https://bugs.archlinux.org/task/26343
+  install -Dm644 "$srcdir/99-audio.conf" \
+    "$pkgdir/etc/security/limits.d/99-audio.conf"
+
+  install -Dm644 "$srcdir/40-hpet-permissions.rules" \
+    "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules"
+
+  # install a missing header forgotten by upstream
+  # see https://bugs.archlinux.org/task/26865
+  install -Dm644 "$srcdir/$_longname-$pkgver/jack/jslist.h" \
+    "$pkgdir/usr/include/jack/jslist.h"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/jack/ffado_setbuffsize-jack1.patch b/testing/jack/ffado_setbuffsize-jack1.patch
new file mode 100644
index 000000000..7e43962ee
--- /dev/null
+++ b/testing/jack/ffado_setbuffsize-jack1.patch
@@ -0,0 +1,124 @@
+From 025d3ad4d5adeff00e97b6fafdf32d6d199d0baa Mon Sep 17 00:00:00 2001
+From: Jonathan Woithe <jwoithe@just42.net>
+Date: Tue, 13 Mar 2012 15:43:03 +1030
+Subject: [PATCH] Support setbufsize in firewire driver
+
+---
+ drivers/firewire/ffado_driver.c |   69 ++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 60 insertions(+), 9 deletions(-)
+
+diff --git a/drivers/firewire/ffado_driver.c b/drivers/firewire/ffado_driver.c
+index a8ad1ea..6035af3 100644
+--- a/drivers/firewire/ffado_driver.c
++++ b/drivers/firewire/ffado_driver.c
+@@ -7,6 +7,7 @@
+  *   http://www.jackaudio.org
+  *
+  *   Copyright (C) 2005-2007 Pieter Palmers
++ *   Copyright (C) 2012 Jonathan Woithe
+  *
+  *   This program is free software; you can redistribute it and/or modify
+  *   it under the terms of the GNU General Public License as published by
+@@ -50,7 +51,10 @@
+ 
+ static int ffado_driver_stop (ffado_driver_t *driver);
+ 
++// Basic functionality requires API version 8.  If version 9 or later
++// is present the buffers can be resized at runtime.
+ #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8
++#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9
+ 
+ // enable verbose messages
+ static int g_verbose=0;
+@@ -675,24 +679,71 @@
+ static int
+ ffado_driver_bufsize (ffado_driver_t* driver, jack_nframes_t nframes)
+ {
+-	printError("Buffer size change requested but not supported!!!");
++	signed int chn;
++
++	// The speed of this function isn't critical; we can afford the
++	// time to check the FFADO API version.
++	if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE ||
++            ffado_streaming_set_period_size == NULL) {
++	        printError("unsupported on current version of FFADO; please upgrade FFADO");
++	        return -1;
++	}
+ 
+-	/*
+-	 driver->period_size = nframes;  
++	driver->period_size = nframes;
+ 	driver->period_usecs =
+ 		(jack_time_t) floor ((((float) nframes) / driver->sample_rate)
+ 				     * 1000000.0f);
+-	*/
+-	
++
++	// Reallocate the null and scratch buffers.
++	driver->nullbuffer = calloc(driver->period_size, sizeof(ffado_sample_t));
++	if(driver->nullbuffer == NULL) {
++		printError("could not allocate memory for null buffer");
++		return -1;
++	}
++	driver->scratchbuffer = calloc(driver->period_size, sizeof(ffado_sample_t));
++	if(driver->scratchbuffer == NULL) {
++		printError("could not allocate memory for scratch buffer");
++		return -1;
++	}
++
++	// MIDI buffers need reallocating
++	for (chn = 0; chn < driver->capture_nchannels; chn++) {
++		if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) {
++			// setup the midi buffer
++			if (driver->capture_channels[chn].midi_buffer != NULL)
++			        free(driver->capture_channels[chn].midi_buffer);
++			driver->capture_channels[chn].midi_buffer = calloc(driver->period_size, sizeof(uint32_t));
++		}
++	}
++	for (chn = 0; chn < driver->playback_nchannels; chn++) {
++		if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) {
++		        if (driver->playback_channels[chn].midi_buffer != NULL)
++		                free(driver->playback_channels[chn].midi_buffer);
++			driver->playback_channels[chn].midi_buffer = calloc(driver->period_size, sizeof(uint32_t));
++		}
++	}
++
++	// Notify FFADO of the period size change
++	if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) {
++	        printError("could not alter FFADO device period size");
++	        return -1;
++	}
++
++	// This is needed to give the shadow variables a chance to
++	// properly update to the changes.
++	sleep(1);
++
+ 	/* tell the engine to change its buffer size */
+-#if 0
+ 	if (driver->engine->set_buffer_size (driver->engine, nframes)) {
+ 		jack_error ("FFADO: cannot set engine buffer size to %d (check MIDI)", nframes);
+ 		return -1;
+ 	}
+-#endif
+ 
+-	return -1; // unsupported
++	// Other drivers (eg: ALSA) don't seem to adjust latencies via
++	// jack_port_set_latency_range() from the bufsize() callback, so we
++	// won't either.  Is this right?
++
++        return 0;
+ }
+ 
+ typedef void (*JackDriverFinishFunction) (jack_driver_t *);
+@@ -704,7 +755,7 @@
+ {
+ 	ffado_driver_t *driver;
+ 
+-	if(ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) {
++	if(ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) {
+ 		printError("Incompatible libffado version! (%s)", ffado_get_version());
+ 		return NULL;
+ 	}
+-- 
+1.7.10
+
diff --git a/testing/jack/jack.install b/testing/jack/jack.install
new file mode 100644
index 000000000..8be532f6d
--- /dev/null
+++ b/testing/jack/jack.install
@@ -0,0 +1,5 @@
+post_upgrade() {
+	rm -f etc/security/limits.d/99-realtime.conf
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/libffado/PKGBUILD b/testing/libffado/PKGBUILD
index 2537c7a73..7b0928606 100644
--- a/testing/libffado/PKGBUILD
+++ b/testing/libffado/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 166937 2012-09-22 19:34:15Z schiv $
+# $Id: PKGBUILD 167215 2012-09-28 14:21:22Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: galiyosha@gmail.com
 # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com>
 
 pkgname=libffado
 pkgver=2.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Driver for FireWire audio devices"
 arch=('i686' 'x86_64')
 url="http://www.ffado.org/"
@@ -26,7 +26,6 @@ _scons-conf() {
         PREFIX=/usr \
         MANDIR=/usr/share/man \
         UDEVDIR=/usr/lib/udev/rules.d \
-        ENABLE_SETBUFFERSIZE_API_VER=false \
         COMPILE_FLAGS="$CFLAGS" $@
 }
 
diff --git a/testing/patch/PKGBUILD b/testing/patch/PKGBUILD
index 7266d17e2..fa4b51469 100644
--- a/testing/patch/PKGBUILD
+++ b/testing/patch/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 166613 2012-09-13 04:53:23Z allan $
+# $Id: PKGBUILD 167233 2012-09-28 23:02:27Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=patch
-pkgver=2.7
+pkgver=2.7.1
 pkgrel=1
 pkgdesc="A utility to apply patch files to original sources"
 arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@ depends=('glibc')
 makedepends=('ed')
 optdepends=('ed: for patch -e functionality')
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('d443f9d9a7d1bf1715831883917699d9'
-         '874fb55b72bc5c3c44794645b04e69a9')
+md5sums=('e9ae5393426d3ad783a300a338c09b72'
+         'b12189e0de3cb2af25268441647ec517')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}