Sat Sep 29 00:54:37 PDT 2012

9 files changed, 212 insertions, 17 deletions

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}