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

David Runge dvzrv at archlinux.org
Mon Aug 26 22:25:58 UTC 2019


    Date: Monday, August 26, 2019 @ 22:25:57
  Author: dvzrv
Revision: 502321

upgpkg: jack2 1.9.12-11

Switching to waf in makedepends and moving custom waf scripts, so they can be used by waf specifically.

Modified:
  jack2/trunk/PKGBUILD

----------+
 PKGBUILD |   23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-26 21:40:00 UTC (rev 502320)
+++ PKGBUILD	2019-08-26 22:25:57 UTC (rev 502321)
@@ -7,13 +7,12 @@
 pkgname=jack2
 pkgdesc="C++ version of the JACK low-latency audio server for multi-processor machines"
 pkgver=1.9.12
-pkgrel=10
+pkgrel=11
 arch=('x86_64')
 url="http://jackaudio.org/"
 license=('GPL2' 'LGPL2.1')
 depends=('celt' 'libsamplerate' 'opus')
-# in 1.9.12 waf is broken with python 3.7: https://github.com/jackaudio/jack2/issues/366
-makedepends=('doxygen' 'libffado' 'portaudio' 'python2')
+makedepends=('doxygen' 'libffado' 'portaudio' 'waf')
 optdepends=('a2jmidid: Expose ALSA MIDI in JACK MIDI'
             'libffado: Firewire support'
             'portaudio: Portaudio support'
@@ -27,7 +26,17 @@
 
 prepare() {
   cd "${pkgname}-${pkgver}"
-
+  # copying relevant custom waf scripts and loading them specifically using
+  # wscript
+  (
+    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
+  )
   # https://github.com/jackaudio/jack2/issues/308
   sed -i 's:bin/env python:bin/env python2:' \
     "example-clients/jack_control"
@@ -35,16 +44,16 @@
 
 build() {
   cd "${pkgname}-${pkgver}"
-  python2 waf configure --prefix=/usr \
+  waf configure --prefix=/usr \
                         --htmldir="/usr/share/doc/${pkgbase}/" \
                         --freebob=no \
                         --classic \
                         --dbus
-  python2 waf build
+  waf build
 }
 
 package() {
   cd "${pkgname}-${pkgver}"
-  python2 waf install --destdir="${pkgdir}"
+  waf install --destdir="${pkgdir}"
 }
 # vim:set ts=2 sw=2 et:


More information about the arch-commits mailing list