summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-01 10:50:46 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-01 10:50:46 -0300
commit3aff11a8581ae7e5a8ccea02062cd92f873c44c5 (patch)
tree05623159a5ae88f6eed2414db216bc9a0d2d71c5 /testing
parentd4157e6db6dd7e03802aa9c361a1902e81c2545a (diff)
parent9b6be78b0c13a61c14d5278f1363eaf9c6388e4c (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/geany/PKGBUILD community/linux-tools/PKGBUILD community/linux-tools/cpupower.conf community/linux-tools/cpupower.rc community/stk/PKGBUILD core/patch/PKGBUILD core/systemd/PKGBUILD extra/lftp/PKGBUILD extra/lftp/lftp-4.3.8-gets.patch extra/mysql/PKGBUILD extra/qt/PKGBUILD extra/transmission/PKGBUILD gnome-unstable/gcr/PKGBUILD gnome-unstable/glibmm/PKGBUILD gnome-unstable/gnome-session/PKGBUILD gnome-unstable/libgdata/PKGBUILD gnome-unstable/libgnome-keyring/PKGBUILD gnome-unstable/pango/PKGBUILD gnome-unstable/polkit/PKGBUILD gnome-unstable/telepathy-glib/PKGBUILD libre/linux-libre/PKGBUILD multilib/lib32-libphobos-ldc/PKGBUILD multilib/wine/PKGBUILD testing/dbus-core/PKGBUILD testing/dbus/PKGBUILD testing/libusbx/PKGBUILD testing/systemd/PKGBUILD testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'testing')
-rw-r--r--testing/brltty/PKGBUILD50
-rwxr-xr-xtesting/brltty/brltty68
-rw-r--r--testing/brltty/brltty.conf2
-rw-r--r--testing/brltty/brltty.install20
-rw-r--r--testing/brltty/brltty.service12
-rw-r--r--testing/fssos-nsvs/PKGBUILD33
-rw-r--r--testing/fssos-nsvs/fssos-nsvs.install17
-rwxr-xr-xtesting/fssos-nsvs/nsvsd36
-rw-r--r--testing/fssos-nsvs/nsvsd.service8
-rw-r--r--testing/hdparm/PKGBUILD42
-rw-r--r--testing/hdparm/wiper.sh.2_6.max-ranges.patch84
-rw-r--r--testing/jack/40-hpet-permissions.rules2
-rw-r--r--testing/jack/99-audio.conf2
-rw-r--r--testing/jack/PKGBUILD65
-rw-r--r--testing/jack/ffado_setbuffsize-jack1.patch124
-rw-r--r--testing/jack/jack.install5
-rw-r--r--testing/libffado/PKGBUILD5
-rw-r--r--testing/patch/PKGBUILD8
-rw-r--r--testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch30
19 files changed, 606 insertions, 7 deletions
diff --git a/testing/brltty/PKGBUILD b/testing/brltty/PKGBUILD
new file mode 100644
index 000000000..76d9f9466
--- /dev/null
+++ b/testing/brltty/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 167187 2012-09-26 22:24:47Z tomegun $
+# Maintainer:
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+pkgname=brltty
+pkgver=4.3
+pkgrel=6
+pkgdesc="Braille display driver for Linux/Unix"
+arch=('i686' 'x86_64')
+url="http://mielke.cc/brltty"
+license=('GPL' 'LGPL')
+depends=('libxaw' 'at-spi2-core' 'gpm' 'icu' 'python2' 'tcl' 'atk' 'libxtst' 'pyrex')
+makedepends=('bluez')
+optdepends=('bluez: bluetooth support')
+backup=(etc/brltty.conf etc/conf.d/brltty.conf)
+options=('!makeflags' '!emptydirs')
+install=brltty.install
+source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz
+ 'brltty'
+ 'brltty.conf'
+ 'brltty.service')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --with-screen-driver=a2 \
+ --enable-gpm \
+ --disable-java-bindings \
+ --disable-caml-bindings \
+ PYTHON=/usr/bin/python2
+
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make INSTALL_ROOT="$pkgdir" install
+ install -D -m755 "$srcdir/brltty" "$pkgdir/etc/rc.d/brltty"
+ install -D -m644 "$srcdir/brltty.conf" "$pkgdir/etc/conf.d/brltty.conf"
+ install -D -m644 Documents/brltty.conf "$pkgdir/etc/brltty.conf"
+ install -D -m644 "$srcdir/brltty.service" "$pkgdir/usr/lib/systemd/system/brltty.service"
+}
+md5sums=('5ada573f88df32b6150db3b9a620e20b'
+ '831ebaf0c56091702929c68805d20c4f'
+ 'a8ab8b3dd059e96e1734bc9cdcf844fc'
+ '7acecd700b9f94d76fe4a6ad56cb0448')
diff --git a/testing/brltty/brltty b/testing/brltty/brltty
new file mode 100755
index 000000000..5ed21a52d
--- /dev/null
+++ b/testing/brltty/brltty
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+daemon_name=brltty
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/$daemon_name.conf
+
+get_pid() {
+ pidof -o %PPID $daemon_name
+}
+
+case "$1" in
+ start)
+ stat_busy "Starting $daemon_name daemon"
+
+ PID=$(get_pid)
+ if [ -z "$PID" ]; then
+ [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
+ # RUN
+ $daemon_name $brltty_args
+ #
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ else
+ echo $(get_pid) > /var/run/$daemon_name.pid
+ add_daemon $daemon_name
+ stat_done
+ fi
+ else
+ stat_fail
+ exit 1
+ fi
+ ;;
+
+ stop)
+ stat_busy "Stopping $daemon_name daemon"
+ PID=$(get_pid)
+ # KILL
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ #
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ else
+ rm -f /var/run/$daemon_name.pid &> /dev/null
+ rm_daemon $daemon_name
+ stat_done
+ fi
+ ;;
+
+ restart)
+ $0 stop
+ sleep 3
+ $0 start
+ ;;
+
+ status)
+ stat_busy "Checking $daemon_name status";
+ ck_status $daemon_name
+ ;;
+
+ *)
+ echo "usage: $0 {start|stop|restart|status}"
+esac
+
+exit 0
diff --git a/testing/brltty/brltty.conf b/testing/brltty/brltty.conf
new file mode 100644
index 000000000..94115e1d5
--- /dev/null
+++ b/testing/brltty/brltty.conf
@@ -0,0 +1,2 @@
+# Specify any arguments to pass to brltty here.
+brltty_args="" \ No newline at end of file
diff --git a/testing/brltty/brltty.install b/testing/brltty/brltty.install
new file mode 100644
index 000000000..952ae58ff
--- /dev/null
+++ b/testing/brltty/brltty.install
@@ -0,0 +1,20 @@
+post_install () {
+ getent group brlapi &>/dev/null || groupadd -r brlapi
+ if [ ! -e /etc/brlapi.key ]; then
+ mcookie >/etc/brlapi.key
+ chmod 0640 /etc/brlapi.key
+ chgrp brlapi /etc/brlapi.key
+ echo "Please add your user to the brlapi group."
+ fi
+}
+
+post_upgrade () {
+ post_install
+}
+
+post_remove () {
+ getent group brlapi >/dev/null 2>&1 && groupdel brlapi
+ if [ -e /etc/brlapi.key ]; then
+ rm -f /etc/brlapi.key
+ fi
+}
diff --git a/testing/brltty/brltty.service b/testing/brltty/brltty.service
new file mode 100644
index 000000000..1b9d55e32
--- /dev/null
+++ b/testing/brltty/brltty.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Braille Console Driver
+DefaultDependencies=no
+Before=sysinit.target
+
+[Service]
+ExecStart=/usr/bin/brltty --pid-file=/run/brltty.pid
+Type=forking
+PIDFile=/run/brltty.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/testing/fssos-nsvs/PKGBUILD b/testing/fssos-nsvs/PKGBUILD
new file mode 100644
index 000000000..aca81ddc4
--- /dev/null
+++ b/testing/fssos-nsvs/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 167185 2012-09-26 22:19:44Z tomegun $
+# Maintainer: Dale Blount <dale@archlinux.org>
+
+pkgname=fssos-nsvs
+pkgver=0.5
+pkgrel=9
+pkgdesc="NSVS for FSSOS"
+arch=('i686' 'x86_64')
+url="http://fssos.sourceforge.net/"
+license=('GPL')
+depends=('bash' 'mysql')
+backup=('etc/nsvsd.conf')
+options=('!libtool' '!makeflags')
+install=$pkgname.install
+source=("http://downloads.sourceforge.net/sourceforge/fssos/nsvs-$pkgver.tar.gz"
+ 'nsvsd'
+ 'nsvsd.service')
+
+build() {
+ cd $srcdir/nsvs-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc
+ make CFLAGS="${CFLAGS} -D_GNU_SOURCE"
+}
+
+package() {
+ cd $srcdir/nsvs-$pkgver
+ make DESTDIR=$pkgdir install
+ install -D -m755 "$srcdir/nsvsd" "$pkgdir/etc/rc.d/nsvsd"
+ install -D -m644 "$srcdir/nsvsd.service" "$pkgdir/usr/lib/systemd/system/nsvsd.service"
+}
+md5sums=('3f17c2f6339f1a322b712b467023d825'
+ '4dfd9dc0d69b375587e39ab2621d9ea9'
+ '61e970d0704875b1da83cb4e9fc0eef5')
diff --git a/testing/fssos-nsvs/fssos-nsvs.install b/testing/fssos-nsvs/fssos-nsvs.install
new file mode 100644
index 000000000..253ae64d2
--- /dev/null
+++ b/testing/fssos-nsvs/fssos-nsvs.install
@@ -0,0 +1,17 @@
+post_install() {
+ if [ -z "`grep '^nsvsd::' /etc/group`" ]; then
+ groupadd -g 83 nsvsd
+ fi
+ if [ -z "`grep '^nsvsd:' /etc/passwd`" ]; then
+ useradd -u 83 -d /tmp -g nsvsd -s /bin/false nsvsd
+ fi
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ userdel nsvsd &> /dev/null
+ groupdel nsvsd &> /dev/null
+}
diff --git a/testing/fssos-nsvs/nsvsd b/testing/fssos-nsvs/nsvsd
new file mode 100755
index 000000000..f9b4845ab
--- /dev/null
+++ b/testing/fssos-nsvs/nsvsd
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+ start)
+ stat_busy "Starting nsvsd"
+ /usr/sbin/nsvsd -f /etc/nsvsd.conf
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon nsvsd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping nsvsd"
+ kill `cat /var/run/nsvsd.pid` &>/dev/null
+ rm -f /var/run/nsvsd.pid
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon nsvsd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 3
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
diff --git a/testing/fssos-nsvs/nsvsd.service b/testing/fssos-nsvs/nsvsd.service
new file mode 100644
index 000000000..0df5444ab
--- /dev/null
+++ b/testing/fssos-nsvs/nsvsd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Name Service Via Sockets Daemon
+
+[Service]
+ExecStart=/usr/sbin/nsvsd -f /etc/nsvsd.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/testing/hdparm/PKGBUILD b/testing/hdparm/PKGBUILD
new file mode 100644
index 000000000..062bd6008
--- /dev/null
+++ b/testing/hdparm/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 167301 2012-09-30 19:26:10Z tpowa $
+# Maintainer: Paul Mattal <paul@archlinux.org>
+
+pkgname=hdparm
+pkgver=9.42
+pkgrel=1
+pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters"
+arch=(i686 x86_64)
+depends=('glibc')
+optdepends=('sh: required by idectl and ultrabayd')
+source=(http://downloads.sourceforge.net/sourceforge/hdparm/${pkgname}-${pkgver}.tar.gz
+ wiper.sh.2_6.max-ranges.patch)
+license=('BSD')
+url="http://sourceforge.net/projects/hdparm/"
+optdepends=('bash: for wiper.sh script')
+options=('emptydirs')
+md5sums=('0af5a38b212fe08f5afbe5e37f34b40b'
+ '74e368f384166a7710b447573cda120a')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ # Fix Range input/output error when wiping Intel G2 and OCZ drives
+ patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch
+
+ # build
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ # install
+ mkdir -p ${pkgdir}/{usr,sbin}
+ make DESTDIR=${pkgdir} install
+ install -m755 contrib/idectl ${pkgdir}/sbin
+ install -m755 contrib/ultrabayd ${pkgdir}/sbin
+
+ install -D -m 0644 $srcdir/$pkgname-$pkgver/wiper/README.txt $pkgdir/usr/share/doc/wiper/README.txt
+ install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/sbin/wiper.sh
+
+ #install license file
+ install -D -m 644 LICENSE.TXT $pkgdir/usr/share/licenses/hdparm/LICENSE.TXT
+}
diff --git a/testing/hdparm/wiper.sh.2_6.max-ranges.patch b/testing/hdparm/wiper.sh.2_6.max-ranges.patch
new file mode 100644
index 000000000..c55f7b149
--- /dev/null
+++ b/testing/hdparm/wiper.sh.2_6.max-ranges.patch
@@ -0,0 +1,84 @@
+--- hdparm-9.28/wiper/wiper.sh.orig 2010-03-09 06:17:37.000000000 -0800
+--- hdparm-9.28/wiper/wiper.sh 2010-05-15 03:08:02.182856971 -0700
+@@ -29,7 +29,7 @@
+ function usage_error(){
+ echo >&2
+ echo "Linux tune-up (TRIM) utility for SATA SSDs"
+- echo "Usage: $0 [--verbose] [--commit] <mount_point|block_device>" >&2
++ echo "Usage: $0 [--max-ranges <num>] [--verbose] [--commit] <mount_point|block_device>" >&2
+ echo " Eg: $0 /dev/sda1" >&2
+ echo >&2
+ exit 1
+@@ -44,6 +44,7 @@
+
+ export verbose=0
+ commit=""
++max_ranges=-1
+ destroy_me=""
+ argc=$#
+ arg=""
+@@ -51,6 +52,10 @@
+ commit=yes
+ elif [ "$1" = "--verbose" ]; then
+ verbose=$((verbose + 1))
++ elif [ "$1" = "--max-ranges" -a $argc -gt 1 ]; then
++ max_ranges=$2
++ argc=$((argc - 1))
++ shift
+ elif [ "$1" = "" ]; then
+ usage_error
+ else
+@@ -499,6 +550,18 @@
+ fi
+ fi
+
++## Different SSD's have a different maximum number of ranges they'll accept
++## in a single TRIM command.
++if [ $max_ranges -le 0 ] ; then
++ model=`$HDPARM -I $rawdev | $GAWK '/Model Number/ { print $NF }'`
++ case "$model" in
++ SSDSA[12]*) max_ranges=512 ;; # Intel X18-M/X25-M
++ OCZ-VERTEX2) max_ranges=64 ;; # OCZ Vertex2
++ *) max_ranges=65535
++ esac
++fi
++[ $verbose -gt 0 ] && echo "max-ranges = $max_ranges"
++
+ ## All ready. Now let the user know exactly what we intend to do:
+ ##
+ mountstatus="$fstype non-mounted"
+@@ -608,7 +671,7 @@
+ nsectors += count;
+ while (count > 0) {
+ this_count = (count > 65535) ? 65535 : count
+- printf "%u:%u ", lba, this_count
++ printf "%u:%u \n", lba, this_count
+ if (verbose > 1)
+ printf "%u:%u ", lba, this_count > "/dev/stderr"
+ lba += this_count
+@@ -695,6 +758,22 @@
+ -v verbose="$verbose" \
+ -v xfs_blksects="$xfs_blksects" \
+ -v xfs_agoffsets="$xfs_agoffsets" \
+- "$GAWKPROG" | $TRIM
++ "$GAWKPROG" | (
++ i=0
++ while read range ; do
++ ranges=$ranges" "$range
++ ((i++))
++ if [ $i -ge $max_ranges ] ; then
++ [ $verbose -gt 0 ] && echo -e "Trim ranges:"$ranges"\n"
++ echo $ranges | $TRIM
++ ranges=""
++ i=0
++ fi
++ done
++ if [ $i -gt 0 ] ; then
++ [ $verbose -gt 0 ] && echo -e "Trim ranges:"$ranges"\n"
++ echo $ranges | $TRIM
++ fi
++ )
+
+ do_cleanup $?
+
+
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}
diff --git a/testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch b/testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch
new file mode 100644
index 000000000..9be6ef28f
--- /dev/null
+++ b/testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch
@@ -0,0 +1,30 @@
+From 1845fdd967d3a4c06f895413505de3c2429955b0 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Thu, 27 Sep 2012 20:48:13 -0400
+Subject: [PATCH] tmpfiles: restore previous behavior for F/f
+
+d4e9eb91ea changed the behavior for the F and f actions, wrongly sending
+them to glob_item(). Restore the old behavior and shortcut straight to
+write_one_file().
+---
+ src/tmpfiles/tmpfiles.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
+index f10f908..bf900fa 100644
+--- a/src/tmpfiles/tmpfiles.c
++++ b/src/tmpfiles/tmpfiles.c
+@@ -673,6 +673,10 @@ static int create_item(Item *i) {
+
+ case CREATE_FILE:
+ case TRUNCATE_FILE:
++ r = write_one_file(i, i->path);
++ if (r < 0)
++ return r;
++ break;
+ case WRITE_FILE:
+ r = glob_item(i, write_one_file);
+ if (r < 0)
+--
+1.7.12.1
+