[arch-commits] Commit in jack/trunk (4 files)

[Antonio Rojas]

    Date: Monday, August 20, 2018 @ 19:54:08
  Author: arojas
Revision: 332714

Removing PAM limits.conf and udev rules (now taken care of in realtime-privileges). Adding realtime-privileges to optdepends. Fixing source array.

Modified:
  jack/trunk/PKGBUILD
Deleted:
  jack/trunk/40-hpet-permissions.rules
  jack/trunk/99-audio.conf
  jack/trunk/jack.install

---------------------------+
 40-hpet-permissions.rules |    2 -
 99-audio.conf             |    2 -
 PKGBUILD                  |   66 +++++++++++++++++++++-----------------------
 jack.install              |    5 ---
 4 files changed, 32 insertions(+), 43 deletions(-)

Deleted: 40-hpet-permissions.rules
===================================================================
--- 40-hpet-permissions.rules	2018-08-20 19:07:59 UTC (rev 332713)
+++ 40-hpet-permissions.rules	2018-08-20 19:54:08 UTC (rev 332714)
@@ -1,2 +0,0 @@
-KERNEL=="rtc0", GROUP="audio"
-KERNEL=="hpet", GROUP="audio"

Deleted: 99-audio.conf
===================================================================
--- 99-audio.conf	2018-08-20 19:07:59 UTC (rev 332713)
+++ 99-audio.conf	2018-08-20 19:54:08 UTC (rev 332714)
@@ -1,2 +0,0 @@
- at audio 	- rtprio 	99
- at audio 	- memlock 	unlimited

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-20 19:07:59 UTC (rev 332713)
+++ PKGBUILD	2018-08-20 19:54:08 UTC (rev 332714)
@@ -1,35 +1,47 @@
 # $Id$
 # Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: David Runge <dave at sleepmap.de>
 # Contributor: tobias <tobias at archlinux.net>
 # Contributor: Robert Emil Berge <robert at rebi.no>
 
 pkgname=jack
-_longname=jack-audio-connection-kit
 pkgver=0.125.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A low-latency audio server"
 arch=('x86_64')
 license=('GPL' 'LGPL')
+groups=('pro-audio')
 depends=('libsamplerate' 'db' 'zita-alsa-pcmi' 'zita-resampler')
-makedepends=('doxygen' 'libffado' 'celt')
-optdepends=('libffado: FireWire support'
-            'celt: NetJACK driver')
+makedepends=('celt' 'doxygen' 'git' 'libffado')
+optdepends=('celt: NetJACK driver'
+            'libffado: FireWire support'
+            'realtime-privileges: Acquire realtime privileges')
 url="http://jackaudio.org/"
-backup=(etc/security/limits.d/99-audio.conf)
-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')
-md5sums=('d9b7e230aeae2d5b45c7a822b2d2dd15'
-         'ae65b7c9ebe0fff6c918ba9d97ae342d'
-         '471aad533ff56c5d3cbbf65ce32cadef')
+provides=("${pkgname}=$pkgver")
+conflicts=("$pkgname")
+replaces=("$pkgname")
+source=("$pkgname::git+https://github.com/jackaudio/${pkgname}1.git#tag=${pkgver}"
+        "git+https://github.com/jackaudio/example-clients"
+        "git+https://github.com/jackaudio/headers"
+        "git+https://github.com/jackaudio/tools")
+md5sums=('SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP')
 
+prepare() {
+  mv -v "${pkgname}" "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
+  git submodule init
+  git config submodule.example-clients.url "${srcdir}/example-clients"
+  git config submodule.jack.url "${srcdir}/headers"
+  git config submodule.tools.url "${srcdir}/tools"
+  git submodule update
+  autoreconf -vfi
+}
+
 build() {
-  cd "$srcdir/$_longname-$pkgver"
-
+  cd "${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
               --libdir=/usr/lib
   make
@@ -36,22 +48,8 @@
 }
 
 package() {
-  cd "$srcdir/$_longname-$pkgver"
-
+  cd "${pkgname}-${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:
 
-# vim:set ts=2 sw=2 et:

Deleted: jack.install
===================================================================
--- jack.install	2018-08-20 19:07:59 UTC (rev 332713)
+++ jack.install	2018-08-20 19:54:08 UTC (rev 332714)
@@ -1,5 +0,0 @@
-post_upgrade() {
-	rm -f etc/security/limits.d/99-realtime.conf
-}
-
-# vim:set ts=2 sw=2 et: