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

[David Runge]

    Date: Monday, August 20, 2018 @ 21:34:38
  Author: dvzrv
Revision: 372920

upgpkg: jack2 1.9.12-4

Switching to python2 for the waf scripts, because of python3.7 incompatibility. Cleaning up provides/conflicts mess between jack, jack2 and jack2-dbus.

Modified:
  jack2/trunk/PKGBUILD

----------+
 PKGBUILD |   37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-20 21:20:47 UTC (rev 372919)
+++ PKGBUILD	2018-08-20 21:34:38 UTC (rev 372920)
@@ -9,12 +9,13 @@
 pkgname=('jack2' 'jack2-dbus')
 pkgdesc="The next-generation JACK with SMP support"
 pkgver=1.9.12
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 url="http://jackaudio.org/"
 license=('GPL')
 groups=('pro-audio')
-makedepends=('celt' 'doxygen' 'libffado' 'opus' 'python' 'python2-dbus')
+# currently waf is broken with python 3.7: https://github.com/jackaudio/jack2/issues/366
+makedepends=('celt' 'doxygen' 'libffado' 'opus' 'python2')
 optdepends=('realtime-privileges: Acquire realtime privileges')
 source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/jackaudio/${pkgbase}/archive/v${pkgver}.tar.gz")
 sha512sums=('f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa')
@@ -29,37 +30,37 @@
   cp -r "${srcdir}/${pkgbase}-${pkgver}" "${srcdir}/${pkgname[1]}-${pkgver}"
 
   # configure jack2
-  python waf configure --prefix=/usr \
-                       --htmldir="/usr/share/doc/${pkgbase}/" \
-                       --freebob=no \
-                       --classic \
-                       --dbus
+  python2 waf configure --prefix=/usr \
+                        --htmldir="/usr/share/doc/${pkgbase}/" \
+                        --freebob=no \
+                        --classic \
+                        --dbus
 
   # configure jack2-dbus
   cd "${srcdir}/${pkgname[1]}-${pkgver}"
-  python waf configure --prefix=/usr \
-                       --htmldir="/usr/share/doc/${pkgbase}/" \
-                       --freebob=no \
-                       --dbus
+  python2 waf configure --prefix=/usr \
+                        --htmldir="/usr/share/doc/${pkgbase}/" \
+                        --freebob=no \
+                        --dbus
 }
 
 build() {
   # build jack2
   cd "${pkgname[0]}-${pkgver}"
-  python waf build
+  python2 waf build
   # build jack2-dbus
   cd "${srcdir}/${pkgname[1]}-${pkgver}"
-  python waf build
+  python2 waf build
 }
 
 package_jack2() {
   pkgdesc="JACK low-latency audio server for multi-processor machines (daemon activation)"
   depends=('celt' 'opus' 'libffado' 'python2-dbus')
-  conflicts=('jack')
-  provides=('jack' 'jackmp' 'jackdmp' 'jackdbus')
+  conflicts=('jack' 'jack2-dbus')
+  provides=('jack')
 
   cd "${pkgname}-${pkgver}"
-  python waf install --destdir="${pkgdir}"
+  python2 waf install --destdir="${pkgdir}"
 }
 
 package_jack2-dbus() {
@@ -66,10 +67,10 @@
   pkgdesc="JACK low-latency audio server for multi-processor machines (only dbus activation)"
   depends=('celt' 'opus' 'libffado' 'python2-dbus')
   conflicts=('jack' 'jack2')
-  provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus')
+  provides=('jack')
 
   cd "${pkgname}-${pkgver}"
-  python waf install --destdir="${pkgdir}"
+  python2 waf install --destdir="${pkgdir}"
 }
 
 # vim:set ts=2 sw=2 et: