guitarix: upgrade 0.39.0 -> 0.40.0+

* Get sources from github mirror to get post-release fixups
* Should fix https://github.com/schnitzeltony/meta-musicians/issues/12

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>

recipes-musicians/guitarix/guitarix.bb

@@ -3,24 +3,25 @@ HOMEPAGE = "http://guitarix.org/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=384f45fb7968a0fe30622ce6160d3b69"
 
-PV = "0.39.0"
 SRC_URI = " \
-    ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}2-${PV}.tar.xz \
-    file://0001-Fix-build-with-latest-LV2.patch \
+    git://github.com/brummer10/guitarix.git \
+    file://0001-Rework-messages-somehow-yes-or-no-is-missing.patch \
+    file://0002-Do-not-strip-LV2-plugins.patch \
 "
-SRC_URI[md5sum] = "04c22ff9baaa69d256e2ca84ba288936"
-SRC_URI[sha256sum] = "490ff3f856282f776456b8e27366dd074d663870c0a89fccded03d854305c8da"
+SRCREV = "9e6dbe30cb5fc226e5d3c02190f1bce0b3fde539"
+PV = "0.40.0+git${SRCPV}"
+S = "${WORKDIR}/git/trunk"
 
 inherit waf fontcache gettext
 
 DEPENDS += " \
     gperf-native \
     intltool-native \
-    faust-native \
+    sassc-native \
     boost \
     libeigen \
     avahi \
-    gtkmm \
+    gtkmm3 \
     jack \
     lilv \
     ladspa-sdk \
@@ -42,15 +43,21 @@ EXTRA_OECONF = " \
     --shared-lib \
     --lib-dev \
     --install-roboto-font \
+    --no-faust \
 "
 
 python waf_preconfigure() {
 }
 
+PATH_prepend = "${B}:"
+
 do_configure_prepend() {
-    for pfile in `grep -rl '/usr/bin/env python$' ${S}`; do
-        sed -i 's:/usr/bin/env python:/usr/bin/env python3:' $pfile
-    done
+    # link python -> python3
+    ln -sf `which python3` ${B}/python
+}
+
+do_compile_prepend() {
+    export STRIP=echo
 }
 
 do_install_append() {

recipes-musicians/guitarix/guitarix/0001-Rework-messages-somehow-yes-or-no-is-missing.patch

@@ -0,0 +1,33 @@
+From 6d873f6758321065756805d24a44aab5618a1955 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 11 Jun 2020 18:11:13 +0200
+Subject: [PATCH] Rework messages - somehow 'yes' or 'no' is missing
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ wscript | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/wscript b/wscript
+index 2699325f..c4882262 100644
+--- a/wscript
++++ b/wscript
+@@ -153,10 +153,9 @@ def display_msg(msg, status = None, color = None):
+     global g_maxlen
+     g_maxlen = max(g_maxlen, len(msg))
+     if status is not None:
+-        print_msg("%s :" % msg.ljust(g_maxlen),False)
+-        Logs.pprint(color, status)
++        print("%s : %s" % (msg, status))
+     else:
+-        print_msg("%s" % msg.ljust(g_maxlen))
++        print("%s" % msg)
+ 
+ def error_msg(msg):
+     Utils.eprint('RED', msg)
+-- 
+2.21.3
+

recipes-musicians/guitarix/guitarix/0002-Do-not-strip-LV2-plugins.patch

@@ -0,0 +1,28 @@
+From 8babbcc4b204d3ff2bf485ac48da1ce55b91741b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 11 Jun 2020 18:44:50 +0200
+Subject: [PATCH] Do not strip LV2 plugins
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ wscript | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/wscript b/wscript
+index 2699325f..f2d8f86d 100644
+--- a/wscript
++++ b/wscript
+@@ -375,7 +375,6 @@ def configure(conf):
+     conf.env['DESKAPPS_DIR'] = os.path.normpath(os.path.join(conf.env['SHAREDIR'], 'applications'))
+     conf.env['BIN_NAME'] = APPNAME
+     if opt.lv2:
+-        conf.gxload('strip')
+         conf.gxload('lv2')
+     conf.env['LADSPA'] = opt.ladspa
+     conf.env['NEW_LADSPA'] = opt.new_ladspa
+-- 
+2.21.3
+