audio/non: Updated for version 1.3.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 33 insertions, 23 deletions

diff --git a/audio/non/README b/audio/non/README
index 09713cd981..836da716be 100644
--- a/audio/non/README
+++ b/audio/non/README
@@ -1,12 +1,5 @@
-Non is designed to be simple and efficient. Written entirely in C/C++
-for high performance. Non is fast enough to run on low-end
-processors--while other DAWs require huge investments in hardware. The
-NTK toolkit provides lightning fast GUI to all the Non components.
-
-Non is a modular (in the Unix sense) DAW. Other DAWs, even in the
-free-software realm, are large, bloated, and, as a rule,
-monolithic. This goes against the Unix philosophy and fails to take
-full advantage of the power and flexibility of JACK.
+Non is a modular (in the Unix sense) DAW, and is designed
+to be fast enough to run on low-end processors.
 
 MODULES:
 
@@ -24,3 +17,10 @@ mixer|sequencer|timeline|session-manager
 
 By default, this SlackBuild builds everything, so the result is a
 complete, traditional DAW-like suite.
+
+OPTIONAL DEPENDENCY:
+
+The `import-ardour-session` script requires Python2.
+This script hasn't been updated in years, and may not successfully
+import a modern Ardour project file, so this is an optional
+dependency and subject to your own experimentation.
\ No newline at end of file
diff --git a/audio/non/non.SlackBuild b/audio/non/non.SlackBuild
index 2af750d529..aec94eacc1 100644
--- a/audio/non/non.SlackBuild
+++ b/audio/non/non.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Slackware build script for non
-# Copyright 2019 Klaatu | Lawrence, NZ | Klaatu@member.fsf.org
+# Copyright 2019-22 Klaatu | Lawrence, NZ | Klaatu@member.fsf.org
 
 # GNU All-Permissive License
 # Copying and distribution of this file, with or without modification,
@@ -11,12 +11,12 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=non
-VERSION=${VERSION:-20200928}
+VERSION=${VERSION:-1.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-#determine what components we are building
+# determine what components we are building
 if [ "X$PROJECT" != "X" ]; then
     DAW="--project=${PROJECT}"
 else
@@ -61,10 +61,14 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-git-$VERSION
-tar xvf $CWD/$PRGNAM-git-$VERSION.tar.bz2
-cd $PRGNAM-git-$VERSION
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-daw-v"$VERSION".tar.gz \
+    -C $PRGNAM-$VERSION --strip-components 1
+
+cd $PRGNAM-$VERSION
 rm nonlib/nonlib
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -81,9 +85,15 @@ CXXFLAGS="$SLKCFLAGS -std=c++11" \
     --localstatedir=/var \
     --mandir=/usr/man \
     --docdir=/usr/doc/$PRGNAM-$VERSION
-./waf -j1
+./waf
 ./waf install --destdir=$PKG
 
+if [ "X$PROJECT" = "Xtimeline" -o "X$PROJECT" = "X" ]; then
+    # fix nested bin directory
+    mv $PKG/usr/bin/bin/import-ardour-session $PKG/usr/bin
+    rmdir $PKG/usr/bin/bin/
+fi
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/audio/non/non.info b/audio/non/non.info
index b517436a49..b8be7e6524 100644
--- a/audio/non/non.info
+++ b/audio/non/non.info
@@ -1,8 +1,8 @@
 PRGNAM="non"
-VERSION="20200928"
-HOMEPAGE="http://non.tuxfamily.org"
-DOWNLOAD="http://slackermedia.info/slackbuilds/non/non-git-20200928.tar.bz2"
-MD5SUM="b25f09108c09a885e18637f557ac2e02"
+VERSION="1.3.0"
+HOMEPAGE="https://git.kx.studio/non"
+DOWNLOAD="https://git.kx.studio/non/non/archive/non-daw-v1.3.0.tar.gz"
+MD5SUM="b731af444507f3888d7a931ed7d43bbf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack liblo liblrdf ntk"
diff --git a/audio/non/slack-desc b/audio/non/slack-desc
index d3374de36c..3539f9551f 100644
--- a/audio/non/slack-desc
+++ b/audio/non/slack-desc
@@ -12,8 +12,8 @@ non: Non is a collection of applications that together create a digital
 non: audio workstation, consisting of a timeline, sequencer, mixer, and
 non: session manager.
 non:
-non: Non was built entirely from scratch by one programmer, and it is
-non: intended as a lightweight, reliable, fast audio editing environment.
+non: https://git.kx.studio/non
+non:
+non:
 non:
-non: http://non.tuxfamily.org
 non: