[arch-commits] Commit in jack2/trunk (PKGBUILD)

[David Runge]

    Date: Friday, January 15, 2021 @ 22:59:38
  Author: dvzrv
Revision: 821038

upgpkg: jack2 1.9.17-1: Upgrade to 1.9.17.

Split out the dbus integration to a jack2-dbus package to make life easier for
people not requiring it (and users of pipewire):
https://bugs.archlinux.org/task/68745
Update jack2 optdepends to include jack2-dbus.

Modified:
  jack2/trunk/PKGBUILD

----------+
 PKGBUILD |   65 ++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 45 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-15 22:00:18 UTC (rev 821037)
+++ PKGBUILD	2021-01-15 22:59:38 UTC (rev 821038)
@@ -4,30 +4,22 @@
 # Contributor: Philipp Überbacher <hollunder at gmx dot at>
 # Contributor: Thomas Bahn <thomas-bahn at gmx dot net>
 
-pkgname=jack2
-pkgdesc="C++ version of the JACK low-latency audio server for multi-processor machines"
-pkgver=1.9.16
+pkgbase=jack2
+pkgname=('jack2' 'jack2-dbus')
+pkgdesc="The JACK low-latency audio server"
+pkgver=1.9.17
 pkgrel=1
 arch=('x86_64')
 url="https://github.com/jackaudio/jack2"
 license=('GPL2' 'LGPL2.1')
-depends=('db' 'expat' 'gcc-libs' 'glibc' 'opus')
-makedepends=('alsa-lib' 'celt' 'dbus' 'git' 'libffado' 'libsamplerate'
+makedepends=('alsa-lib' 'celt' 'dbus' 'expat' 'git' 'libffado' 'libsamplerate'
 'libsndfile' 'readline' 'systemd' 'waf')
-optdepends=('a2jmidid: Expose ALSA MIDI in JACK MIDI'
-            'libffado: Firewire support'
-            'python-dbus: For jack_control'
-            'realtime-privileges: Acquire realtime privileges'
-            'zita-ajbridge: for using multiple ALSA devices')
-provides=('jack' 'libjack.so' 'libjacknet.so' 'libjackserver.so')
-conflicts=('jack')
-replaces=('jack2-dbus')
-source=("git+https://github.com/jackaudio/${pkgname}.git#tag=v${pkgver}?signed")
+source=("${pkgbase}::git+https://github.com/jackaudio/${pkgname}.git#tag=v${pkgver}?signed")
 validpgpkeys=('62B11043D2F6EB6672D93103CDBAA37ABC74FBA0') # falkTX <falktx at falktx.com>
 sha512sums=('SKIP')
 
 prepare() {
-  cd "${pkgname}"
+  cd "${pkgbase}"
   # copying relevant custom waf scripts and loading them specifically using
   # wscript
   (
@@ -42,7 +34,7 @@
 }
 
 build() {
-  cd "${pkgname}"
+  cd "${pkgbase}"
   export PYTHONPATH="${PWD}:${PYTHONPATH}"
   waf configure --prefix=/usr \
                 --htmldir="/usr/share/doc/${pkgbase}/" \
@@ -52,11 +44,44 @@
   waf build
 }
 
-package() {
-  depends+=('libasound.so' 'libcelt0.so' 'libdbus-1.so' 'libreadline.so'
-  'libsamplerate.so' 'libsndfile.so' 'libsystemd.so')
-  cd "${pkgname}"
+package_jack2() {
+  depends=('db' 'gcc-libs' 'glibc' 'opus' 'libasound.so' 'libcelt0.so'
+  'libdbus-1.so' 'libreadline.so' 'libsamplerate.so' 'libsndfile.so'
+  'libsystemd.so')
+  optdepends=('a2jmidid: for ALSA MIDI to JACK MIDI bridging'
+              'libffado: for firewire support using FFADO'
+              'jack2-dbus: for dbus integration'
+              'realtime-privileges: for realtime privileges'
+              'zita-ajbridge: for using multiple ALSA devices')
+  provides=('jack' 'libjack.so' 'libjacknet.so' 'libjackserver.so')
+  conflicts=('jack')
+
+  cd "${pkgbase}"
   export PYTHONPATH="${PWD}:${PYTHONPATH}"
   waf install --destdir="${pkgdir}"
+  rm -rfv "${pkgdir}/usr/bin/jack"{dbus,_control} "${pkgdir}/usr/share/dbus-1/"
 }
+
+package_jack2-dbus() {
+  local _names=( 'alias' 'bufsize' 'connect' 'cpu' 'cpu_load' 'disconnect'
+  'evmon' 'freewheel' 'iodelay' 'latent_client' 'load' 'lsp' 'metro'
+  'midi_dump' 'midi_latency_test' 'midiseq' 'midisine' 'monitor_client'
+  'multiple_metro' 'net_master' 'net_slave' 'netsource' 'property' 'rec'
+  'samplerate' 'server_control' 'session_notify' 'showtime' 'simdtests'
+  'simple_client' 'simple_session_client' 'test' 'thru' 'transport' 'unload'
+  'wait' 'zombie')
+
+  pkgdesc+=" (dbus integration)"
+  depends=('gcc-libs' 'glibc' 'jack2' 'libdbus-1.so' 'libexpat.so'
+  'libjackserver.so' 'python-dbus')
+
+  cd "${pkgbase}"
+  export PYTHONPATH="${PWD}:${PYTHONPATH}"
+  waf install --destdir="${pkgdir}"
+  rm -rfv "${pkgdir}/etc/" "${pkgdir}/usr/include/" "${pkgdir}/usr/lib/" \
+    "${pkgdir}/usr/share/man/" "${pkgdir}/usr/bin/alsa"* "${pkgdir}/usr/bin/jackd"
+  for _name in "${_names[@]}"; do
+    rm -v "${pkgdir}/usr/bin/jack_${_name}"
+  done
+}
 # vim:set ts=2 sw=2 et: