From a77cc857dca31d059060fd34d7e4c8f9c99f4e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 14 Jan 2020 22:57:34 +0100
Subject: [PATCH] guitarix: upgrade 0.38.1 -> 0.39.0 / fix build without
 python2 in hosttools
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 recipes-musicians/guitarix/guitarix.bb        | 18 +++++-----
 ...-perform-link-test-durin-cross-build.patch | 33 -------------------
 2 files changed, 10 insertions(+), 41 deletions(-)
 delete mode 100644 recipes-musicians/guitarix/guitarix/0001-do-not-perform-link-test-durin-cross-build.patch

diff --git a/recipes-musicians/guitarix/guitarix.bb b/recipes-musicians/guitarix/guitarix.bb
index c65804e..e82c417 100644
--- a/recipes-musicians/guitarix/guitarix.bb
+++ b/recipes-musicians/guitarix/guitarix.bb
@@ -3,19 +3,17 @@ HOMEPAGE = "http://guitarix.org/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=384f45fb7968a0fe30622ce6160d3b69"
 
-PV = "0.38.1"
-SRC_URI = " \
-    ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}2-${PV}.tar.xz \
-    file://0001-do-not-perform-link-test-durin-cross-build.patch \
-"
-SRC_URI[md5sum] = "d9aec810bf164cbf040b298cb9c45d50"
-SRC_URI[sha256sum] = "00fda3e1ce1d5f1691665f9ff32bb3c9800381313d49b7c2e25618d0b3ed872f"
+PV = "0.39.0"
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}2-${PV}.tar.xz"
+SRC_URI[md5sum] = "04c22ff9baaa69d256e2ca84ba288936"
+SRC_URI[sha256sum] = "490ff3f856282f776456b8e27366dd074d663870c0a89fccded03d854305c8da"
 
-inherit wafold fontcache gettext
+inherit waf fontcache gettext
 
 DEPENDS += " \
     gperf-native \
     intltool-native \
+    faust-native \
     boost \
     libeigen \
     avahi \
@@ -41,6 +39,10 @@ EXTRA_OECONF = " \
     --install-roboto-font \
 "
 
+do_configure_prepend() {
+    sed -i 's:/usr/bin/env python:/usr/bin/env python3:' `grep -rl '/usr/bin/env python$' ${S}`
+}
+
 do_install_append() {
     # some corrections [dev-elf] - inspired by https://src.fedoraproject.org/rpms/guitarix/blob/master/f/guitarix.spec
     chmod 755 ${D}${libdir}/libgxw*.so.0.1
diff --git a/recipes-musicians/guitarix/guitarix/0001-do-not-perform-link-test-durin-cross-build.patch b/recipes-musicians/guitarix/guitarix/0001-do-not-perform-link-test-durin-cross-build.patch
deleted file mode 100644
index 3c614ad..0000000
--- a/recipes-musicians/guitarix/guitarix/0001-do-not-perform-link-test-durin-cross-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c2fca3345cfbcb0fc129ea23e8438057202604f2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Fri, 4 Aug 2017 22:01:03 +0200
-Subject: [PATCH] do not perform link test durin cross build
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [cross specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- src/ladspa/wscript | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/ladspa/wscript b/src/ladspa/wscript
-index be5f31d..2c43e2d 100644
---- a/src/ladspa/wscript
-+++ b/src/ladspa/wscript
-@@ -10,10 +10,6 @@ def configure(conf):
- def test_loadable(self):
-     def link_and_test(lib=self.link_task.outputs[0].bldpath(self.env), link=self.link_task.run):
-         link()
--        try:
--            ctypes.cdll.LoadLibrary(lib)
--        except Exception as e:
--            raise RuntimeError("LADSPA load test failed: %s" % e)
-     self.link_task.run = link_and_test
- 
- def build(bld):
--- 
-2.9.4
-