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

[David Runge]

    Date: Monday, August 19, 2019 @ 14:56:26
  Author: dvzrv
Revision: 500169

upgpkg: jack2 1.9.12-10

Deprecating jack2-dbus (it's included in jack2). Switching to correct licenses (GPL2 and LGPL2.1). Adding shared libraries to provides. Moving python2-dbus to optdepends.

Modified:
  jack2/trunk/PKGBUILD

----------+
 PKGBUILD |   61 ++++++++++++++++---------------------------------------------
 1 file changed, 16 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-19 14:18:55 UTC (rev 500168)
+++ PKGBUILD	2019-08-19 14:56:26 UTC (rev 500169)
@@ -4,76 +4,47 @@
 # Contributor: Philipp Überbacher <hollunder at gmx dot at>
 # Contributor: Thomas Bahn <thomas-bahn at gmx dot net>
 
-pkgbase=jack2
-pkgname=('jack2' 'jack2-dbus')
-pkgdesc="The next-generation JACK with SMP support"
+pkgname=jack2
+pkgdesc="C++ version of the JACK low-latency audio server for multi-processor machines"
 pkgver=1.9.12
-pkgrel=9
+pkgrel=10
 arch=('x86_64')
 url="http://jackaudio.org/"
-license=('GPL')
-# currently waf is broken with python 3.7: https://github.com/jackaudio/jack2/issues/366
-makedepends=('celt' 'doxygen' 'libffado' 'libsamplerate' 'opus' 'portaudio'
-'python2-dbus')
-optdepends=('a2jmidid: Expose legacy ALSA sequencer applications in JACK MIDI'
+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')
+optdepends=('a2jmidid: Expose ALSA MIDI in JACK MIDI'
             'libffado: Firewire support'
             'portaudio: Portaudio support'
+            'python2-dbus: For jack_control'
             'realtime-privileges: Acquire realtime privileges')
-source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/jackaudio/${pkgbase}/archive/v${pkgver}.tar.gz")
+provides=('jack' 'libjack.so' 'libjacknet.so' 'libjackserver.so')
+conflicts=('jack')
+replaces=('jack2-dbus')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jackaudio/${pkgname}/archive/v${pkgver}.tar.gz")
 sha512sums=('f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa')
 
 prepare() {
-  cd "${pkgbase}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
 
   # https://github.com/jackaudio/jack2/issues/308
   sed -i 's:bin/env python:bin/env python2:' \
     "example-clients/jack_control"
-
-  # copy of the source for jack2-dbus
-  cp -r "${srcdir}/${pkgbase}-${pkgver}" "${srcdir}/${pkgname[1]}-${pkgver}"
 }
 
 build() {
-  cd "${pkgbase}-${pkgver}"
-  # configure jack2
+  cd "${pkgname}-${pkgver}"
   python2 waf configure --prefix=/usr \
                         --htmldir="/usr/share/doc/${pkgbase}/" \
                         --freebob=no \
                         --classic \
                         --dbus
-
-  # configure jack2-dbus
-  cd "${srcdir}/${pkgname[1]}-${pkgver}"
-  python2 waf configure --prefix=/usr \
-                        --htmldir="/usr/share/doc/${pkgbase}/" \
-                        --freebob=no \
-                        --dbus
-  # build jack2
-  cd "${srcdir}/${pkgname[0]}-${pkgver}"
   python2 waf build
-  # build jack2-dbus
-  cd "${srcdir}/${pkgname[1]}-${pkgver}"
-  python2 waf build
 }
 
-package_jack2() {
-  pkgdesc="JACK low-latency audio server for multi-processor machines (daemon activation)"
-  depends=('celt' 'libsamplerate' 'opus' 'python2-dbus')
-  conflicts=('jack' 'jack2-dbus')
-  provides=('jack')
-
+package() {
   cd "${pkgname}-${pkgver}"
   python2 waf install --destdir="${pkgdir}"
 }
-
-package_jack2-dbus() {
-  pkgdesc="JACK low-latency audio server for multi-processor machines (only dbus activation)"
-  depends=('celt' 'libsamplerate' 'opus' 'python2-dbus')
-  conflicts=('jack' 'jack2')
-  provides=('jack' 'jack2')
-
-  cd "${pkgname}-${pkgver}"
-  python2 waf install --destdir="${pkgdir}"
-}
-
 # vim:set ts=2 sw=2 et: