From 6d581d7458bf590e77f4a855ceb706ee029b9c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 17 Mar 2019 22:36:23 +0100 Subject: [PATCH] Revert "remove soundtouch - it remains in meta-qt5-extra" This reverts commit 105169b3b859abeae55c84bb58852c8f5998c261. --- .../0001-Fix-path-to-m4-macro-dir.patch | 52 +++++++++++++++++++ .../soundtouch/soundtouch_git.bb | 14 +++++ .../packagegroups/musicians-world.bb | 1 + 3 files changed, 67 insertions(+) create mode 100644 recipes-musicians/soundtouch/soundtouch/0001-Fix-path-to-m4-macro-dir.patch create mode 100644 recipes-musicians/soundtouch/soundtouch_git.bb diff --git a/recipes-musicians/soundtouch/soundtouch/0001-Fix-path-to-m4-macro-dir.patch b/recipes-musicians/soundtouch/soundtouch/0001-Fix-path-to-m4-macro-dir.patch new file mode 100644 index 0000000..44d66a2 --- /dev/null +++ b/recipes-musicians/soundtouch/soundtouch/0001-Fix-path-to-m4-macro-dir.patch @@ -0,0 +1,52 @@ +From e6a9d88cb4c1cd9b5ce09990acc4045acdfb00c9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 15 Nov 2018 19:51:30 +0100 +Subject: [PATCH] Fix path to m4 macro dir +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstrem-Status: Pending + +Signed-off-by: Andreas Müller +--- + Makefile.am | 4 ++-- + configure.ac | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 1394ce6..b3d148e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -40,7 +40,7 @@ m4data_DATA=soundtouch.m4 + # NOTE: wouldn't have to list the .TXT file if it were named without the .TXT + EXTRA_DIST= \ + soundtouch.m4 \ +- config/m4 \ ++ config \ + bootstrap \ + make-win.bat \ + COPYING.TXT \ +@@ -61,5 +61,5 @@ dist-hook: + + + # flag to aclocal where to find m4 macros for tests +-ACLOCAL_AMFLAGS = -I config/m4 ++ACLOCAL_AMFLAGS = -I config + AUTOMAKE_OPTIONS = foreign +diff --git a/configure.ac b/configure.ac +index bd8023c..c17de73 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -21,7 +21,7 @@ LIB_SONAME=1 + AC_SUBST(LIB_SONAME) + + AC_CONFIG_AUX_DIR(config) +-AC_CONFIG_MACRO_DIR([config/m4]) ++AC_CONFIG_MACRO_DIR([config]) + AM_CONFIG_HEADER([config.h include/soundtouch_config.h]) + AM_INIT_AUTOMAKE + AM_SILENT_RULES([yes]) +-- +2.14.5 + diff --git a/recipes-musicians/soundtouch/soundtouch_git.bb b/recipes-musicians/soundtouch/soundtouch_git.bb new file mode 100644 index 0000000..bd440a1 --- /dev/null +++ b/recipes-musicians/soundtouch/soundtouch_git.bb @@ -0,0 +1,14 @@ +SUMMARY = "SoundTouch audio tempo/pitch control library" +HOMEPAGE = "http://www.surina.net/soundtouch/index.html" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING.TXT;md5=4d2892adf339c4489918ab705d44f66c" + +inherit autotools-brokensep pkgconfig gettext + +SRC_URI = " \ + git://gitlab.com/${BPN}/${BPN}.git \ + file://0001-Fix-path-to-m4-macro-dir.patch \ +" +SRCREV = "b9659b64c692aab50a91da44cc0ea6ba41309949" +PV = "2.1.1" +S = "${WORKDIR}/git" diff --git a/recipes-support/packagegroups/musicians-world.bb b/recipes-support/packagegroups/musicians-world.bb index 0c00436..afa4478 100644 --- a/recipes-support/packagegroups/musicians-world.bb +++ b/recipes-support/packagegroups/musicians-world.bb @@ -120,6 +120,7 @@ RDEPENDS_${PN} += " \ soundfont-collection-meta \ \ \ + soundtouch \ stk \ supercollider \ timidity++ \