Compilation fix and PKGBUILD rewritten for realtime-privileges package

6 files changed, 39 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 66ad6a7fcee7..49a724b89c07 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,36 @@
+# Generated by mksrcinfo v8
+# Wed Aug 29 13:00:48 UTC 2018
 pkgbase = jack2-no-dbus-git
 	pkgdesc = Classic jack2 without dbus enabled. For starting as daemon with systemd.
-	pkgver = 1.9.10.151.g22e843f
+	pkgver = 1.9.12.r17.g21f67b38
 	pkgrel = 2
 	url = http://jackaudio.org/
-	install = install
 	arch = x86_64
 	arch = i686
-	license = GPL2
-	makedepends = python
+	license = GPL
+	makedepends = python2
+	makedepends = celt
+	makedepends = opus
+	makedepends = libsamplerate
 	makedepends = git
-	makedepends = gcc
-	depends = libsamplerate
-	optdepends = opus: opus codec support over network (install *before* building)
+	makedepends = libffado
+	depends = celt
+	depends = libffado
+	depends = opus
+	optdepends = a2jmidid: Expose legacy ALSA sequencer applications in JACK MIDI
+	optdepends = realtime-privileges: Acquire realtime privileges
 	provides = jack2
 	provides = jack
 	provides = jack2-git
-	provides = jackmp
-	provides = jackdmp
 	conflicts = jack2
 	conflicts = jack
 	conflicts = jack2-git
 	conflicts = jack2-dbus
-	source = jack2-no-dbus-git::git+http://github.com/jackaudio/jack2.git
-	source = 99-audio.conf
-	source = 40-hpet-permissions.rules
+	source = jack2-no-dbus-git::git+https://github.com/jackaudio/jack2
 	source = jackd@.service
 	source = jackd.conf
 	md5sums = SKIP
-	md5sums = ae65b7c9ebe0fff6c918ba9d97ae342d
-	md5sums = 471aad533ff56c5d3cbbf65ce32cadef
-	md5sums = 42668787a9faf9cf4e2f6c49be53c37e
+	md5sums = 539000cbbc78a3fc170fbc3cc1de5bd7
 	md5sums = adec71667ca43e9f5297541cc51a99ef
 
 pkgname = jack2-no-dbus-git
diff --git a/40-hpet-permissions.rules b/40-hpet-permissions.rules
deleted file mode 100644
index 7af3780f9d9b..000000000000
--- a/40-hpet-permissions.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-KERNEL=="rtc0", GROUP="audio"
-KERNEL=="hpet", GROUP="audio"
diff --git a/99-audio.conf b/99-audio.conf
deleted file mode 100644
index eb76ef92030b..000000000000
--- a/99-audio.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-@audio 	- rtprio 	99
-@audio 	- memlock 	unlimited
diff --git a/PKGBUILD b/PKGBUILD
index 5de6305fb9f8..d10018f50dff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,58 +2,53 @@
 # Contributor: farwayer <farwayer@gmail.com>
 
 pkgname=jack2-no-dbus-git
-pkgver=1.9.10.151.g22e843f
+pkgver=1.9.12.r17.g21f67b38
 pkgrel=2
 pkgdesc='Classic jack2 without dbus enabled. For starting as daemon with systemd.'
 arch=('x86_64' 'i686')
 url='http://jackaudio.org/'
-license=('GPL2')
-depends=('libsamplerate')
-makedepends=('python' 'git' 'gcc')
-optdepends=(
-	'opus: opus codec support over network (install *before* building)'
-)
-provides=('jack2' 'jack' 'jack2-git' 'jackmp' 'jackdmp')
+license=('GPL')
+depends=('celt' 'libffado' 'opus')
+makedepends=('python2' 'celt' 'opus' 'libsamplerate' 'git' 'libffado')
+optdepends=('a2jmidid: Expose legacy ALSA sequencer applications in JACK MIDI'
+            'realtime-privileges: Acquire realtime privileges')
+provides=('jack2' 'jack' 'jack2-git')
 conflicts=('jack2' 'jack' 'jack2-git' 'jack2-dbus')
 source=(
-	"$pkgname::git+http://github.com/jackaudio/jack2.git"
-	'99-audio.conf'
-	'40-hpet-permissions.rules'
+	"$pkgname::git+https://github.com/jackaudio/jack2"
 	'jackd@.service'
 	'jackd.conf'
 )
 md5sums=(
 	'SKIP'
-	'ae65b7c9ebe0fff6c918ba9d97ae342d'
-        '471aad533ff56c5d3cbbf65ce32cadef'
-	'42668787a9faf9cf4e2f6c49be53c37e'
+	'539000cbbc78a3fc170fbc3cc1de5bd7'
 	'adec71667ca43e9f5297541cc51a99ef'
 )
-install=install
 
 pkgver() {
-  cd $pkgname
-
-  git describe | sed 's/^v//;s/-/./g'
+  cd ${pkgname[0]}
+  # get commits since last unannotated tag
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//g;'
 }
 
 build() {
   cd $pkgname
 
-  ./waf configure --classic --alsa --clients=128 --ports-per-application=1536 --prefix=/usr
-  ./waf $MAKEFLAGS build 
+  # configure jack2
+  python2 waf configure --prefix=/usr \
+                        --htmldir="/usr/share/doc/${pkgbase}/" \
+                        --freebob=no \
+                        --classic \
+
+  # build jack2
+  cd "${srcdir}/${pkgname[0]}"
+  python2 waf build
 }
 
 package() {
   cd $pkgname
 
-  ./waf install --destdir="$pkgdir"
-
-  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"
+  python2 waf install --destdir="$pkgdir"
     
   install -Dm644 "$srcdir/jackd@.service" \
     "$pkgdir/usr/lib/systemd/system/jackd@.service"
diff --git a/install b/install
deleted file mode 100644
index 1c33a08f78f0..000000000000
--- a/install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-  if ! getent group jackd >/dev/null; then
-    groupadd --system jackd 
-  fi
-  if ! getent passwd jackd >/dev/null; then
-    useradd --system -c 'jackd daemon user' -g jackd -G audio -d / -s /bin/nologin jackd 
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  if getent passwd jackd >/dev/null; then
-    userdel jackd
-  fi
-  if getent group jackd >/dev/null; then
-    groupdel jackd
-  fi
-}
diff --git a/jackd@.service b/jackd@.service
index 45267fe50fa6..1525a1a772e7 100644
--- a/jackd@.service
+++ b/jackd@.service
@@ -1,11 +1,9 @@
 [Unit]
-Description=JACK net
+Description=JACK low-latency audio server daemon
 After=sound.target
 
 [Service]
 EnvironmentFile=/etc/conf.d/jackd.conf
-LimitRTPRIO=infinity
-LimitMEMLOCK=infinity
 User=%I
 ExecStart=/usr/bin/jackd $OPTIONS