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

[David Runge]

    Date: Saturday, January 15, 2022 @ 18:05:33
  Author: dvzrv
Revision: 1104533

upgpkg: lib32-jack2 1.9.20-1: Upgrade to 1.9.20.

Simplify quoting in file.
Remove unnecessary waflib modifications.
Do not build files provided by jack-example-tools.
Simplify file removals and provide libjackserver.so and libjacknet.so.

Modified:
  lib32-jack2/trunk/PKGBUILD

----------+
 PKGBUILD |   37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-15 17:53:40 UTC (rev 1104532)
+++ PKGBUILD	2022-01-15 18:05:33 UTC (rev 1104533)
@@ -3,18 +3,17 @@
 
 _name=jack2
 pkgname=lib32-jack2
-pkgver=1.9.19
-pkgrel=2
+pkgver=1.9.20
+pkgrel=1
 pkgdesc="The JACK low-latency audio server (32 bit)"
-arch=('x86_64')
+arch=(x86_64)
 url="https://github.com/jackaudio/jack2"
-license=('GPL2' 'LGPL2.1')
-depends=('lib32-gcc-libs' 'lib32-glibc' 'lib32-opus' "jack2=${pkgver}")
-makedepends=('git' 'lib32-alsa-lib' 'lib32-celt' 'lib32-dbus' 'lib32-expat'
-'lib32-readline' 'lib32-libsamplerate' 'lib32-libsndfile' 'waf')
-conflicts=('lib32-jack')
-provides=('lib32-jack' 'libjack.so')
-replaces=('lib32-jack')
+license=(GPL2 LGPL2.1)
+depends=(lib32-gcc-libs lib32-glibc lib32-opus "jack2=${pkgver}")
+makedepends=(git lib32-alsa-lib lib32-dbus lib32-expat lib32-libsamplerate waf)
+conflicts=(lib32-jack)
+provides=(lib32-jack libjack.so libjackserver.so libjacknet.so)
+replaces=(lib32-jack)
 source=("git+https://github.com/jackaudio/${_name}.git#tag=v${pkgver}?signed")
 sha512sums=('SKIP')
 validpgpkeys=('62B11043D2F6EB6672D93103CDBAA37ABC74FBA0') # falkTX <falktx at falktx.com>
@@ -21,15 +20,9 @@
 
 prepare() {
   cd "${_name}"
-  # copying relevant custom waf scripts and loading them specifically using
-  # wscript
   touch __init__.py
-  mkdir -vp tools
-  cp -v waflib/extras/xcode*.py tools
+  # remove custom waflib, as we are using system provided waf
   rm -rv waflib
-  sed -e "s/load('xcode'/load('xcode', tooldir='tools'/g" \
-      -e "s/load('xcode6'/load('xcode6', tooldir='tools'/g" \
-      -i wscript
 }
 
 build() {
@@ -43,6 +36,7 @@
   export CFLAGS+=' -m32'
   waf configure --prefix=/usr \
                 --libdir=/usr/lib32 \
+                --example-tools=no \
                 --classic \
                 --dbus
   waf build
@@ -49,13 +43,12 @@
 }
 
 package() {
-  depends+=('libcelt0.so')
+  depends+=(libasound.so libsamplerate.so)
+
   cd "${_name}"
   export PYTHONPATH="${PWD}:${PYTHONPATH}"
   waf install --destdir="${pkgdir}"
-  # remove all non-32bit and those provided by jack2
-  rm -rf "${pkgdir}"/usr/{bin,lib,include,share}
-  rm -rf "${pkgdir}/usr/lib32/jack/"
-  rm -rf "${pkgdir}/usr/lib32/libjack"{net,server}*
+  # remove all files provided by jack2
+  rm -rf "${pkgdir}"/usr/{bin,include,share}
 }
 # vim:set ts=2 sw=2 et: