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

[Ray Rashif]

    Date: Wednesday, November 23, 2011 @ 11:13:17
  Author: schiv
Revision: 143224

upgpkg: jack 0.121.3-3

go with KISS: just use audio group; see #26343

Added:
  jack/trunk/99-audio.conf
    (from rev 142838, jack/trunk/99-realtime.conf)
Modified:
  jack/trunk/PKGBUILD
Deleted:
  jack/trunk/99-realtime.conf
  jack/trunk/jack.install

------------------+
 99-audio.conf    |    2 +
 99-realtime.conf |    2 -
 PKGBUILD         |   22 ++++++++++++--------
 jack.install     |   57 -----------------------------------------------------
 4 files changed, 15 insertions(+), 68 deletions(-)

Copied: jack/trunk/99-audio.conf (from rev 142838, jack/trunk/99-realtime.conf)
===================================================================
--- 99-audio.conf	                        (rev 0)
+++ 99-audio.conf	2011-11-23 16:13:17 UTC (rev 143224)
@@ -0,0 +1,2 @@
+ at audio 	- rtprio 	99
+ at audio 	- memlock 	unlimited

Deleted: 99-realtime.conf
===================================================================
--- 99-realtime.conf	2011-11-23 16:04:33 UTC (rev 143223)
+++ 99-realtime.conf	2011-11-23 16:13:17 UTC (rev 143224)
@@ -1,2 +0,0 @@
- at realtime 	- rtprio 	99
- at realtime 	- memlock 	unlimited

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-23 16:04:33 UTC (rev 143223)
+++ PKGBUILD	2011-11-23 16:13:17 UTC (rev 143224)
@@ -6,7 +6,7 @@
 pkgname=jack
 _longname=jack-audio-connection-kit
 pkgver=0.121.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A low-latency audio server"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
@@ -15,17 +15,16 @@
 optdepends=('libffado: FireWire support'
             'celt: NetJACK driver')
 url="http://jackaudio.org/"
-backup=(etc/security/limits.d/99-realtime.conf)
+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-realtime.conf"
-        "40-hpet-permissions.rules")
+        '99-audio.conf'
+        '40-hpet-permissions.rules')
 md5sums=('35f470f7422c37b33eb965033f7a42e8'
-         'bb312fa74956066046d6a599ac623c98'
+         'ae65b7c9ebe0fff6c918ba9d97ae342d'
          '6a1017041c024cea57da9bd726b664d7')
 
 build() {
@@ -43,11 +42,16 @@
 
   # configure realtime access/scheduling
   # see https://bugs.archlinux.org/task/26343
-  install -Dm644 "$srcdir/99-realtime.conf" \
-    "$pkgdir/etc/security/limits.d/99-realtime.conf"
+  install -Dm644 "$srcdir/99-audio.conf" \
+    "$pkgdir/etc/security/limits.d/99-audio.conf"
 
   install -Dm644 "$srcdir/40-hpet-permissions.rules" \
-    "$srcdir/lib/udev/rules.d/40-hpet-permissions.rules"
+    "$pkgdir/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:

Deleted: jack.install
===================================================================
--- jack.install	2011-11-23 16:04:33 UTC (rev 143223)
+++ jack.install	2011-11-23 16:13:17 UTC (rev 143224)
@@ -1,57 +0,0 @@
-_addgroup() {
-  # _addgroup $GROUPNAME $GID
-  [ ${#@} -ne 2 ] && return 1
-
-  echo -n "  > Checking if '$1' group exists..."
-  if ! getent group $1 > /dev/null; then
-    echo "no"
-    echo "  > Add '$1' group"
-    echo -n "    >> checking if GID is in use..."
-		# no other package or user is supposed to use this gid
-		# delete the group and re-add it at the end without static gid
-		if getent group $2 > /dev/null; then
-      echo "yes"
-			firstgroup=$(getent group $2 | sed 's/:.*//')
-      firstusers=$(getent group $2 | sed 's/.*://')
-      echo "    >> delete group '$firstgroup'"
-			groupdel $firstgroup
-    else
-      echo "no"
-		fi
-
-    echo "    >> add our group with proper GID"
-		groupadd -g $2 $1
-
-		if [ -n "$firstgroup" ]; then
-      echo "    >> restore group '$firstgroup' with dynamic GID"
-      groupadd $firstgroup
-      [ -n "$firstusers" ] && gpasswd -M $firstusers $firstgroup
-    fi
-  else
-    echo "yes (all good)"
-  fi
-}
-
-post_install() {
-  _addgroup realtime 112
-  echo
-  echo "  * You must be part of the 'realtime' group to use RT scheduling"
-  echo "  * You don't need an 'RT kernel' to use RT scheduling"
-  echo "  * If you don't need RT start jack with '--no-realtime'"
-  echo "  * If you don't record or sequence audio you don't need RT"
-}
-
-post_upgrade() {
-  _addgroup realtime 112
-  echo
-  echo "  * You must be part of the 'realtime' group to use RT scheduling"
-  echo "  * Configuring RT through limits.conf has been deprecated"
-  echo "  * See /etc/security/limits.d/99-realtime.conf instead"
-}
-
-post_remove() {
-	[ "$(getent group realtime | cut -d ':' -f 3)" = '112' ] && \
-		groupdel realtime || true
-}
-
-# vim:set ts=2 sw=2 et: