Source Mage code commit list

[Thomas Orgis <scm AT sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 ChangeLog                        |    3 +
 audio-creation/ardour6/BUILD     |    7 +++
 audio-creation/ardour6/CONFIGURE |   13 ++++++
 audio-creation/ardour6/DEPENDS   |   75 
+++++++++++++++++++++++++++++++++++++++
 audio-creation/ardour6/DETAILS   |   18 +++++++++
 audio-creation/ardour6/HISTORY   |   45 +++++++++++++++++++++++
 audio-creation/ardour6/INSTALL   |    1 
 audio-drivers/libffado/BUILD     |    6 +--
 audio-drivers/libffado/DEPENDS   |    3 +
 audio-drivers/libffado/DETAILS   |    4 +-
 audio-drivers/libffado/HISTORY   |    6 +++
 devel/nodejs/DEPENDS             |    2 -
 devel/nodejs/HISTORY             |    3 +
 libs/icu/DETAILS                 |    6 ---
 libs/icu/HISTORY                 |    5 ++
 libs/icu/PREPARE                 |    2 -
 16 files changed, 186 insertions(+), 13 deletions(-)

New commits:
commit fedc2ea3d6cbe594ccbfe80ff3abe93c474ac70f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    ardour6: announced in ChangeLog

commit a2ceda36fc98d7e3fb3b554755cde2bf671cb886
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    libffado: version 2.4.1, fixing current build

commit 53f9f76666f495bce2a4710c1dd6eb027b89816a
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    icu: update to version 69.1 and drop devel/stable distinction
    
    There is no separate official development branch. We have one current
    version of ICU.

commit 48a34119afb8b9daf7c5fc77a632174b96ff4cf7
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    nodejs: work with any python

commit dba3c2e08dc9b07b1863c258c9f134ae8ab01f34
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    ardour6: branched off ardour5, series 6 of Ardour

diff --git a/ChangeLog b/ChangeLog
index 46ba20f..22323ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2021-05-18 Thomas Orgis <sobukus AT sourcemage.org>
+       * audio-creation/ardour6: added, version 6 of Ardour
+
 2021-05-16 Treeve Jelbert <treeve AT sourcemage.org>
        * qt5-cmake/dmidiplayer: added, MIDI player
 
diff --git a/audio-creation/ardour6/BUILD b/audio-creation/ardour6/BUILD
new file mode 100755
index 0000000..9f6ce6b
--- /dev/null
+++ b/audio-creation/ardour6/BUILD
@@ -0,0 +1,7 @@
+OPTS="--noconfirm \
+      --configdir=$INSTALL_ROOT/etc \
+      --optimize \
+      --with-backends=$(echo "$ARDOUR6_AUDIO" | tr ' ' ,) \
+      $ARDOUR6_OPTS \
+      $OPTS" &&
+waf_build
diff --git a/audio-creation/ardour6/CONFIGURE 
b/audio-creation/ardour6/CONFIGURE
new file mode 100755
index 0000000..1825ecc
--- /dev/null
+++ b/audio-creation/ardour6/CONFIGURE
@@ -0,0 +1,13 @@
+. $GRIMOIRE/config_query_multi.function &&
+
+config_query_option ARDOUR6_OPTS "Enable support for linuxVST plugins?" n \
+                                 "--lxvst" \
+                                 "--no-lxvst" &&
+
+config_query_option ARDOUR6_OPTS "Contact ardour.org at startup?" n \
+                                 "--phone-home" \
+                                 "--no-phone-home" &&
+
+config_query_multi ARDOUR6_AUDIO "Select audio backends:" \
+  jack alsa pulseaudio
+
diff --git a/audio-creation/ardour6/DEPENDS b/audio-creation/ardour6/DEPENDS
new file mode 100755
index 0000000..b98f7ea
--- /dev/null
+++ b/audio-creation/ardour6/DEPENDS
@@ -0,0 +1,75 @@
+# required for waf
+depends PYTHON &&
+
+depends -sub CXX gcc &&
+
+# New dependency list in order of checks in waf.
+depends boost &&
+depends glib2 &&
+depends glibmm &&
+depends libsndfile &&
+depends curl &&
+depends liblo &&
+depends taglib &&
+depends vamp-plugin-sdk &&
+depends rubberband &&
+depends -sub "SINGLE THREADS" fftw &&
+depends aubio &&
+depends libxml2 &&
+depends libsigc++3 &&
+depends liblrdf &&
+depends libsamplerate &&
+depends libogg &&
+depends flac &&
+depends gtk+2 &&
+depends libx11 &&
+depends fontconfig &&
+depends dbus &&
+depends cairomm &&
+
+# More dependencies that used to be directly mentioned here
+# are indirect ones (i.e. freetype2 being convered by
+# fontconfig). Hopefully they are all covered.
+
+if list_find "$ARDOUR6_AUDIO" jack; then
+  depends JACK-DRIVER
+fi &&
+if list_find "$ARDOUR6_AUDIO" alsa; then
+  depends alsa-lib
+fi &&
+if list_find "$ARDOUR6_AUDIO" pulseaudio; then
+  depends pulseaudio
+fi &&
+
+depends lv2 &&
+depends serd &&
+depends sord &&
+depends sratom-0 &&
+depends lilv-0 &&
+depends suil-0 &&
+
+# This doesn't do anything. Enable after hacking/verifying
+# that actually, some .desktop file is created.
+# In the sources, I only see ardour3.desktop.in, which
+# neither matches ardour4, nor is actually used, apparently.
+#optional_depends shared-mime-info \
+#                 "--freedesktop" \
+#                 "" \
+#                 "for icons, .desktop file etc." &&
+
+optional_depends doxygen \
+                 "--docs" \
+                 "" \
+                 "to build documentation" &&
+
+depends GETTEXT &&
+# Ardour 5.12 has a build bug with --no-nls
+#optional_depends GETTEXT \
+#                 "--nls" \
+#                 "--no-nls" \
+#                 "for native language support" &&
+
+optional_depends valgrind \
+                 "--grind" \
+                 "" \
+                 "to run tests in valgrind"
diff --git a/audio-creation/ardour6/DETAILS b/audio-creation/ardour6/DETAILS
new file mode 100755
index 0000000..fa3dd79
--- /dev/null
+++ b/audio-creation/ardour6/DETAILS
@@ -0,0 +1,18 @@
+           SPELL=ardour6
+          SPELLX=Ardour
+         VERSION=6.6.0
+          SOURCE="${SPELLX}-${VERSION}.tar.bz2"
+   SOURCE_URL[0]=https://community.ardour.org/src/Ardour-6.6.0.tar.bz2
+     
SOURCE_HASH=sha512:e175100bc03921865c5b387de68e30c21dd3e65dbf3868783092d165d5106a883aa4fca74e71b2e267e50b3c2f5c7b707a73967bbc93e66808d25aa3065b425f
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+        WEB_SITE="http://ardour.org";
+      LICENSE[0]=GPLv2
+         ENTERED=20131023
+           SHORT="multi-track, professional Digital Audio Workstation"
+cat << EOF
+Ardour is a digital audio workstation. You can use it to record, edit and
+mix multi-track audio. You can produce your own CDs, mix video soundtracks,
+or just experiment with new ideas about music and sound.
+
+This is version 6.
+EOF
diff --git a/audio-creation/ardour6/HISTORY b/audio-creation/ardour6/HISTORY
new file mode 100644
index 0000000..5ebfef7
--- /dev/null
+++ b/audio-creation/ardour6/HISTORY
@@ -0,0 +1,45 @@
+2021-05-17 Thomas Orgis <sobukus AT sourcemage.org>
+       * DETAILS: version 6.6.0
+       * DEPENDS, CONFIGURE: pulseaudio added, use new config vars,
+         python3 usable, lv2 non-optional
+
+2020-09-22 Thomas Orgis <sobukus AT sourcemage.org>
+       * DEPENDS: sub-dep on fftw2f_threads, hard-depend on GETTEXT
+         due to build failure (the latter to be changed again on
+         update to fixed version)
+
+2019-05-18 Ismael Luceno <ismael AT sourcemage.org>
+       * DEPENDS: Update dependency; s/gettext/GETTEXT/
+
+2017-03-24 Thomas Orgis <sobukus AT sourcemage.org>
+       * DETAILS: version 5.12
+
+2017-05-16 Thomas Orgis <sobukus AT sourcemage.org>
+       * DETAILS, BUILD, CONFIGURE, DEPENDS, INSTALL: copied from ardour4,
+         adapted for ardour5 version
+
+2016-05-05 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated mirror to ftp.sourcemage.us
+
+2016-03-13 Thomas Orgis <sobukus AT sourcemage.org>
+       * DETAILS: version 4.7
+
+2016-02-07 Thomas Orgis <sobukus AT sourcemage.org>
+       * DETAILS: version 4.6
+       * BUILD: enable C++11 mode since current glibmm requires that
+
+2015-10-21 Thomas Orgis <sobukus AT souremage.org>
+       * DETAILS: bump to 4.4
+
+2015-08-15 Thomas Orgis <sobukus AT souremage.org>
+       * DETAILS: bump to 4.2
+
+2015-06-26 Thomas Orgis <sobukus AT souremage.org>
+       * DETAILS: bump to 4.1
+
+2015-04-23 Thomas Orgis <sobukus AT sourcemage.org>
+       * DETAILS, CONFIGURE, BUILD, INSTALL: spell created,
+         starting with ardour3 one and adapting for the
+         new hotness
+       * DEPENDS: reworked, re-aligned with configure checks by waf,
+         added CXX
diff --git a/audio-creation/ardour6/INSTALL b/audio-creation/ardour6/INSTALL
new file mode 100755
index 0000000..0ea15cc
--- /dev/null
+++ b/audio-creation/ardour6/INSTALL
@@ -0,0 +1 @@
+waf_install
diff --git a/audio-drivers/libffado/BUILD b/audio-drivers/libffado/BUILD
index c87b2c9..086019a 100755
--- a/audio-drivers/libffado/BUILD
+++ b/audio-drivers/libffado/BUILD
@@ -1,4 +1,4 @@
 cd "$SOURCE_DIRECTORY" &&
-# note: this always compiles for current cpu
-scons COMPILE_FLAGS="$CXXFLAGS -std=gnu++11" \
-  PREFIX=/usr DEBUG=no ENABLE_OPTIMIZATIONS=yes
+scons CUSTOM_ENV=True \
+  PREFIX=/usr DEBUG=no ENABLE_OPTIMIZATIONS=yes \
+  $OPTS
diff --git a/audio-drivers/libffado/DEPENDS b/audio-drivers/libffado/DEPENDS
index 6164a36..0d37890 100755
--- a/audio-drivers/libffado/DEPENDS
+++ b/audio-drivers/libffado/DEPENDS
@@ -10,7 +10,8 @@ depends dbus-c++ &&
 depends -sub CXX gcc &&
 depends glib2 &&
 depends libsigc++3 &&
-optional_depends PYQT "" "" "for mixer GUI" &&
+optional_depends PYQT "BUILD_MIXER=true" "BUILD_MIXER=false" \
+  "for mixer GUI" &&
 depends dbus-python &&
 depends sip
 
diff --git a/audio-drivers/libffado/DETAILS b/audio-drivers/libffado/DETAILS
index ce5283f..4f97bba 100755
--- a/audio-drivers/libffado/DETAILS
+++ b/audio-drivers/libffado/DETAILS
@@ -8,10 +8,10 @@ if [[ "$LIBFFADO_BRANCH" == scm ]]; then
   FORCE_DOWNLOAD=1
   SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
 else
-         VERSION=2.2.1
+         VERSION=2.4.1
           SOURCE="$SPELL-$VERSION.tgz"
       SOURCE_URL="http://www.ffado.org/files/$SOURCE";
-     
SOURCE_HASH=sha512:310741703912dd273458d0ecc4aca43af1735e15a19704e39b0c660212a34875e9c6086a325914d70d2373ff56b888acb4d925778db8cc3b9b2e8866e0a7b042
+     
SOURCE_HASH=sha512:0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
 fi
         WEB_SITE=http://www.ffado.org
diff --git a/audio-drivers/libffado/HISTORY b/audio-drivers/libffado/HISTORY
index fef44cf..fba1ed9 100644
--- a/audio-drivers/libffado/HISTORY
+++ b/audio-drivers/libffado/HISTORY
@@ -1,3 +1,9 @@
+2019-09-01 Thomas Orgis <sobukus AT sourcemage.org>
+       * DETAILS: version 2.4.1, fixing build with current gcc
+       * PRE_BUILD, ffado-tests-errno.patch: gone
+       * BUILD: CXXFLAGS change not needed anymore
+       * DEPENDS: really disable mixer if no PYQT chosen
+
 2016-02-11 Thomas Orgis <sobukus AT sourcemage.org>
        * BUILD: C++11 mode because of libxml++, but the gnu++11 variant 
because
          plain c++11 breaks dbus-c++ usage in horrible ways
diff --git a/devel/nodejs/DEPENDS b/devel/nodejs/DEPENDS
index 982c0d2..f19c965 100755
--- a/devel/nodejs/DEPENDS
+++ b/devel/nodejs/DEPENDS
@@ -4,7 +4,7 @@ if ! is_depends_enabled ${SPELL} llvm; then
   depends -sub CXX gcc
 fi &&
 
-depends python &&
+depends PYTHON &&
 depends libuv '--shared-libuv' &&
 depends zlib '--shared-zlib' &&
 depends icu '--with-intl=system-icu' &&
diff --git a/devel/nodejs/HISTORY b/devel/nodejs/HISTORY
index 621d953..7327cac 100644
--- a/devel/nodejs/HISTORY
+++ b/devel/nodejs/HISTORY
@@ -1,3 +1,6 @@
+2021-05-18 Thomas Orgis <sobukus AT sourcemage.org>
+       * DEPENDS: any python does
+
 2021-05-08 Florian Franzmann <bwlf AT bandrate.org>
        * DETAILS: version 16.1.0, security update
        * BUILD: increase the max number of open files to prevent linking 
error
diff --git a/libs/icu/DETAILS b/libs/icu/DETAILS
index fc786d3..2d0cbc5 100755
--- a/libs/icu/DETAILS
+++ b/libs/icu/DETAILS
@@ -1,9 +1,5 @@
            SPELL=icu
-if [[ "$ICU_DEV" == 'y' ]]; then
-         VERSION=68.2
-else
-         VERSION=64.2
-fi
+         VERSION=69.1
         VERSIONX=${VERSION//./_}
           SOURCE="${SPELL}4c-${VERSIONX}-src.tgz"
              
URI="https://github.com/unicode-org/${SPELL}/releases/download/release-${VERSION/./-}";
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index bedc160..d1d8455 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,3 +1,8 @@
+2021-05-17 Thomas Orgis <sobukus AT sourcemage.org>
+       * DETAILS: version 69.1 and nothing else
+         There is no official development version unless we'd go for git
+         checkout.
+
 2020-12-27 Florian Franzmann <bwlf AT bandrate.org>
        * DETAILS: version 68.2
 
diff --git a/libs/icu/PREPARE b/libs/icu/PREPARE
index ddd2aa4..46717af 100755
--- a/libs/icu/PREPARE
+++ b/libs/icu/PREPARE
@@ -1,2 +1,2 @@
-config_query ICU_DEV 'Build the development version?' n &&
+persistent_remove ICU_DEV &&
 config_query ICU_DOC 'Install the documentation?' n