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

[David Runge]

    Date: Saturday, January 15, 2022 @ 17:05:29
  Author: dvzrv
Revision: 434496

upgpkg: jack2 1.9.20-1: Upgrade to 1.9.20.

Simplify splitting out of jack2-dbus.
Add jack2-docs to provide optional developer documentation.
Do not build/install libraries/executables provided by jack-example-tools.
Add jack-example-tools and jack2-docs as new optdepends for jack2.
Remove all depends/makedepends that were only required for jack-example-tools.

Modified:
  jack2/trunk/PKGBUILD

----------+
 PKGBUILD |   97 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 52 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-15 13:47:59 UTC (rev 434495)
+++ PKGBUILD	2022-01-15 17:05:29 UTC (rev 434496)
@@ -5,31 +5,34 @@
 # Contributor: Thomas Bahn <thomas-bahn at gmx dot net>
 
 pkgbase=jack2
-pkgname=('jack2' 'jack2-dbus')
+pkgname=(jack2 jack2-dbus jack2-docs)
 pkgdesc="The JACK low-latency audio server"
-pkgver=1.9.19
-pkgrel=2
-arch=('x86_64')
+pkgver=1.9.20
+pkgrel=1
+arch=(x86_64)
 url="https://github.com/jackaudio/jack2"
-license=('GPL2' 'LGPL2.1')
-makedepends=('alsa-lib' 'celt' 'dbus' 'expat' 'git' 'libffado' 'libsamplerate'
-'libsndfile' 'zita-alsa-pcmi' 'zita-resampler' 'readline' 'systemd' 'waf')
+license=(GPL2)
+makedepends=(alsa-lib dbus doxygen expat git libffado libsamplerate opus systemd waf)
 source=("${pkgbase}::git+https://github.com/jackaudio/${pkgname}.git#tag=v${pkgver}?signed")
 validpgpkeys=('62B11043D2F6EB6672D93103CDBAA37ABC74FBA0') # falkTX <falktx at falktx.com>
 sha512sums=('SKIP')
 
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
+}
+
 prepare() {
   cd "${pkgbase}"
-  # copying relevant custom waf scripts and loading them specifically using
-  # wscript
+  # remove custom waflib, as we are using system provided waf
   (
     touch __init__.py
-    mkdir -vp tools
-    cp -v waflib/extras/xcode*.py tools
     rm -rv waflib
-    sed -e "s/load('xcode'/load('xcode', tooldir='tools'/g" \
-        -e "s/load('xcode6'/load('xcode6', tooldir='tools'/g" \
-        -i wscript
   )
 }
 
@@ -38,8 +41,10 @@
   export LINKFLAGS="$LDFLAGS"
   export PYTHONPATH="${PWD}:${PYTHONPATH}"
   waf configure --prefix=/usr \
-                --htmldir="/usr/share/doc/${pkgbase}/" \
+                --htmldir="/usr/share/doc/${pkgbase}/html" \
                 --autostart=none \
+                --doxygen=yes \
+                --example-tools=no \
                 --systemd-unit \
                 --classic \
                 --dbus
@@ -47,44 +52,46 @@
 }
 
 package_jack2() {
-  depends=('db' 'gcc-libs' 'glibc' 'opus' 'libasound.so' 'libcelt0.so'
-  'libdbus-1.so' 'libreadline.so' 'libsamplerate.so' 'libsndfile.so'
-  'libsystemd.so' 'libzita-alsa-pcmi.so' 'libzita-resampler.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')
-  conflicts=('jack')
-  provides=('jack' 'libjack.so' 'libjacknet.so' 'libjackserver.so')
-  replaces=('jack')
+  license+=(LGPL2.1)
+  depends=(db gcc-libs glibc opus libasound.so libdbus-1.so libsamplerate.so
+  libsystemd.so )
+  optdepends=(
+    'a2jmidid: for ALSA MIDI to JACK MIDI bridging'
+    'libffado: for firewire support using FFADO'
+    'jack-example-tools: for official JACK example-clients and tools'
+    'jack2-dbus: for dbus integration'
+    'jack2-docs: for developer documentation'
+    'realtime-privileges: for realtime privileges'
+    'zita-ajbridge: for using multiple ALSA devices'
+  )
+  conflicts=(jack)
+  provides=(jack libjack.so libjacknet.so libjackserver.so)
+  replaces=(jack)
 
   cd "${pkgbase}"
   export PYTHONPATH="${PWD}:${PYTHONPATH}"
   waf install --destdir="${pkgdir}"
-  rm -rfv "${pkgdir}/usr/bin/jack"{dbus,_control} "${pkgdir}/usr/share/dbus-1/"
+
+  ( cd "$pkgdir"
+
+  _pick jack2-dbus usr/bin/jack{dbus,_control}
+  _pick jack2-dbus usr/share/dbus-1/services/*
+  _pick jack2-docs usr/share/doc/$pkgbase/html
+  )
 }
 
 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' 'libjackserver.so'
-  'python-dbus')
+  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
+  mv -v jack2-dbus/* "${pkgdir}"
 }
+
+package_jack2-docs() {
+  pkgdesc+=" (documentation)"
+
+  mv -v jack2-docs/* "${pkgdir}"
+}
+
 # vim:set ts=2 sw=2 et: