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

[David Runge]

    Date: Friday, December 27, 2019 @ 20:43:47
  Author: dvzrv
Revision: 543289

upgpkg: non-daw 1.2.0-3: Updating maintainer info. Adding all direct library dependencies.
Switching to system waf by using an upstream waf library. Fixing waf issues with python >3.7 and reporting issues upstream. Minor fixes.

Modified:
  non-daw/trunk/PKGBUILD

----------+
 PKGBUILD |   79 ++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 57 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-27 20:26:23 UTC (rev 543288)
+++ PKGBUILD	2019-12-27 20:43:47 UTC (rev 543289)
@@ -1,19 +1,41 @@
-# Maintainer: David Runge <dave at sleepmap.de>
+# Maintainer: David Runge <dvzrv at archlinux.org>
 pkgbase=non-daw
 pkgname=('non-mixer' 'non-session-manager' 'non-timeline')
 pkgver=1.2.0
-pkgrel=2
-pkgdesc=""
+pkgrel=3
+pkgdesc="Non DAW"
 arch=('x86_64')
 url="https://non.tuxfamily.org/"
 license=('GPL3')
 groups=('non-daw' 'pro-audio')
-makedepends=('jack' 'ladspa' 'liblo' 'liblrdf' 'libxpm' 'ntk' 'python')
-source=("$pkgbase-$pkgver.tar.gz::https://git.tuxfamily.org/non/non.git/snapshot/${pkgbase}-v${pkgver}.tar.gz")
-sha512sums=('0f6f93032a546ea85af5554249e8a88bce0808bf6c852ba922d9f570f82d09052d1242dd579d427b59234c3991b8d8d665d3920ffff3170dc7f8d30556bde005')
+makedepends=('ladspa' 'libjack.so' 'liblo.so' 'liblrdf.so' 'libxpm' 'libntk.so'
+'libntk_images.so' 'waf')
+source=("$pkgbase-$pkgver.tar.gz::https://git.tuxfamily.org/non/non.git/snapshot/${pkgbase}-v${pkgver}.tar.gz"
+        "non-timeline-1.2.0-install-script.patch::https://github.com/original-male/non/commit/ea6ff30ceadda31b613ad16f919bba8fc3e59af0.patch"
+        "https://raw.githubusercontent.com/original-male/non/d958df0486c7397c243f5ac36bf4acbc461a1e50/tools.waf/ntk_fluid.py")
+sha512sums=('0f6f93032a546ea85af5554249e8a88bce0808bf6c852ba922d9f570f82d09052d1242dd579d427b59234c3991b8d8d665d3920ffff3170dc7f8d30556bde005'
+            'f58a0a0791c5bb246f56abfc452140cd17b00483f32c0de0c061f6071d5a25af6ca96f44ab143c4d6d5e350192f2488efe06692394805b1f7c2e45a695e14e02'
+            '9f45474fa51a8c3eed672d633a77d968ddee6b841589764378f08386f711ae1a6801c795c19d8987f1af9a36b5a6bcdaab2230db5359004ad73e791dbac50bc4')
 
 prepare() {
   mv -v "${pkgbase}-v${pkgver}" "${pkgbase}-${pkgver}"
+  (
+    cd "${pkgbase}-${pkgver}"
+    # fix broken installation of import-ardour-session:
+    # https://github.com/original-male/non/issues/244
+    patch -Np1 -i "../non-timeline-1.2.0-install-script.patch"
+    # import-ardour-session is actually python3 compatible
+    # https://github.com/original-male/non/issues/257
+    sed -e 's/python2/python/' -i timeline/bin/import-ardour-session
+    # let wscript find the custom waf module
+    mkdir -pv tools
+    # ntk_fluid.py is not published in 1.2.0:
+    # https://github.com/original-male/non/issues/253
+    ln -sv "${srcdir}/ntk_fluid.py" tools/
+    touch __init__.py
+    sed -e "s/load('ntk_fluid'/load('ntk_fluid', tooldir='tools'/g" \
+        -i wscript
+  )
   cp -av "${pkgbase}-${pkgver}" "${pkgname[0]}-${pkgver}"
   cp -av "${pkgbase}-${pkgver}" "${pkgname[1]}-${pkgver}"
   cp -av "${pkgbase}-${pkgver}" "${pkgname[2]}-${pkgver}"
@@ -20,35 +42,48 @@
 }
 
 build() {
-  cd "${pkgname[0]}-${pkgver}"
-  ./waf configure --prefix=/usr --project=mixer
-  ./waf
-  cd ../"${pkgname[1]}-${pkgver}"
-  ./waf configure --prefix=/usr --project=session-manager
-  ./waf
-  cd ../"${pkgname[2]}-${pkgver}"
-  ./waf configure --prefix=/usr --project=timeline
-  ./waf
+  (
+    cd "${pkgname[0]}-${pkgver}"
+    waf configure --prefix=/usr --project=mixer
+    waf build -vv
+  )
+  (
+    cd "${pkgname[1]}-${pkgver}"
+    waf configure --prefix=/usr --project=session-manager
+    waf build -vv
+  )
+  (
+    cd "${pkgname[2]}-${pkgver}"
+    waf configure --prefix=/usr --project=timeline
+    waf build -vv
+  )
 }
 
 package_non-mixer() {
   pkgdesc="A powerful, reliable and fast modular Digital Audio Mixer"
-  depends=('hicolor-icon-theme' 'jack' 'liblo' 'liblrdf' 'ntk')
+  depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'libjack.so' 'liblo.so'
+  'liblrdf.so' 'libntk.so' 'libntk_images.so')
   cd "$pkgname-$pkgver"
-  ./waf --destdir="${pkgdir}" install
+  waf --destdir="${pkgdir}" install -vv
 }
 
 package_non-session-manager() {
   pkgdesc="An API and an implementation for session management in the context of Linux Audio"
-  depends=('hicolor-icon-theme' 'jack' 'liblo' 'ntk')
+  depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'libjack.so' 'liblo.so'
+  'libntk.so' 'libntk_images.so')
   cd "$pkgname-$pkgver"
-  ./waf --destdir="${pkgdir}" install
+  waf --destdir="${pkgdir}" install -vv
 }
 
 package_non-timeline() {
   pkgdesc="A powerful, reliable and fast modular Digital Audio Timeline arranger"
-  depends=('hicolor-icon-theme' 'jack' 'liblo' 'ntk')
-  optdepends=('python2: For import-ardour-session')
+  depends=('cairo' 'gcc-libs' 'glibc' 'hicolor-icon-theme' 'libjack.so'
+  'liblo.so' 'libntk.so' 'libntk_images.so' 'libsndfile')
+  optdepends=('python: For import-ardour-session')
   cd "$pkgname-$pkgver"
-  ./waf --destdir="${pkgdir}" install
+  waf --destdir="${pkgdir}" install -vv
+  # the wscript installs import-ardour-session to a wrong location:
+  # https://github.com/original-male/non/issues/256
+  mv -v "${pkgdir}/usr/bin/bin/import-ardour-session" "${pkgdir}/usr/bin/import-ardour-session"
+  rmdir -v "${pkgdir}/usr/bin/bin"
 }