From e54745d653959230d4e7090227a7ef47d38088a2 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 8 Aug 2012 18:50:57 -0500
Subject: jack audo connection kit

---
 abs/core/jack/40-hpet-permissions.rules |  2 ++
 abs/core/jack/99-audio.conf             |  2 ++
 abs/core/jack/PKGBUILD                  | 35 +++++++++++++++++++++++++--------
 abs/core/jack/jack.changelog            | 21 --------------------
 abs/core/jack/jack.install              |  5 +++++
 5 files changed, 36 insertions(+), 29 deletions(-)
 create mode 100644 abs/core/jack/40-hpet-permissions.rules
 create mode 100644 abs/core/jack/99-audio.conf
 delete mode 100644 abs/core/jack/jack.changelog
 create mode 100644 abs/core/jack/jack.install

diff --git a/abs/core/jack/40-hpet-permissions.rules b/abs/core/jack/40-hpet-permissions.rules
new file mode 100644
index 0000000..7af3780
--- /dev/null
+++ b/abs/core/jack/40-hpet-permissions.rules
@@ -0,0 +1,2 @@
+KERNEL=="rtc0", GROUP="audio"
+KERNEL=="hpet", GROUP="audio"
diff --git a/abs/core/jack/99-audio.conf b/abs/core/jack/99-audio.conf
new file mode 100644
index 0000000..eb76ef9
--- /dev/null
+++ b/abs/core/jack/99-audio.conf
@@ -0,0 +1,2 @@
+@audio 	- rtprio 	99
+@audio 	- memlock 	unlimited
diff --git a/abs/core/jack/PKGBUILD b/abs/core/jack/PKGBUILD
index e9f7898..7515001 100644
--- a/abs/core/jack/PKGBUILD
+++ b/abs/core/jack/PKGBUILD
@@ -1,26 +1,32 @@
-# $Id$
+# $Id: PKGBUILD 157734 2012-04-29 05:10:29Z allan $
 # 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.2
-pkgrel=2
+pkgver=0.121.3
+pkgrel=6
 pkgdesc="A low-latency audio server"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
 depends=('libsamplerate' 'readline')
-makedepends=('doxygen' 'libffado' 'celt-0.7')
+makedepends=('doxygen' 'libffado' 'celt')
 optdepends=('libffado: FireWire support'
-            'celt-0.7: NetJACK driver')
+            'celt: NetJACK driver')
 url="http://jackaudio.org/"
+backup=(etc/security/limits.d/99-audio.conf)
 options=('!libtool')
 provides=("$_longname=$pkgver")
+conflicts=("$_longname")
 replaces=("$_longname")
-changelog=$pkgname.changelog
-source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz")
-md5sums=('06c080349455afd4d217d6a8f9393e01')
+install=$pkgname.install
+source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz"
+        '99-audio.conf'
+        '40-hpet-permissions.rules')
+md5sums=('35f470f7422c37b33eb965033f7a42e8'
+         'ae65b7c9ebe0fff6c918ba9d97ae342d'
+         '471aad533ff56c5d3cbbf65ce32cadef')
 
 build() {
   cd "$srcdir/$_longname-$pkgver"
@@ -34,6 +40,19 @@ 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/abs/core/jack/jack.changelog b/abs/core/jack/jack.changelog
deleted file mode 100644
index 54b9df6..0000000
--- a/abs/core/jack/jack.changelog
+++ /dev/null
@@ -1,21 +0,0 @@
-29 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 0.121.2-2:
-	Added celt support with celt-0.7 from community
-	Will not bring celt to extra as it's very unstable
-
-8 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 0.118.0-4 :
-	Built against libffado
-		- for FireWire support (see FS#19626)
-	Removed init scripts (no longer in tarball; unsupported).
-
-	* PKGBUILD :
-	URL updated.
-	Licenses now GPL, LGPL according to 2-or-later convention
-		- removed custom installation (both are common)
-
-	* jack.changelog :
-	Added this changelog.
-	Only important changes will be logged.
diff --git a/abs/core/jack/jack.install b/abs/core/jack/jack.install
new file mode 100644
index 0000000..8be532f
--- /dev/null
+++ b/abs/core/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:
-- 
cgit v0.12

