rixty
/
OpenVoiceOS
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS
1
1
Fork 0
Code Issues Releases Wiki Activity
OpenVoiceOS/buildroot-patches/0001-Update-mimic-to-latest...

106 lines
3.4 KiB
Diff
Raw Normal View History

MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
From 1c090605bbec847ec5000ded4fca28c78e0d73f3 Mon Sep 17 00:00:00 2001
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
From: Peter Steenbergen <info@j1nx.nl>
MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
Date: Tue, 24 Sep 2019 15:49:52 +0200
Subject: [PATCH 1/1] Update mimic to latest dev version
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
---
MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
package/mimic/0001-disable-werror.patch | 25 +++++++++++++++++++++++++
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
package/mimic/Config.in | 2 ++
MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
package/mimic/mimic.hash | 2 ++
package/mimic/mimic.mk | 17 ++++++++++++-----
4 files changed, 41 insertions(+), 5 deletions(-)
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
create mode 100644 package/mimic/0001-disable-werror.patch
diff --git a/package/mimic/0001-disable-werror.patch b/package/mimic/0001-disable-werror.patch
new file mode 100644
MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
index 0000000000..0f8d59a467
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
--- /dev/null
+++ b/package/mimic/0001-disable-werror.patch
MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
@@ -0,0 +1,25 @@
+From c393e191f841707718096264e479f3b3d95b7a60 Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Mon, 23 Sep 2019 12:03:30 +0200
+Subject: [PATCH 1/1] Disable Werror
+
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
+
+diff --git a/Makefile.am b/Makefile.am
MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
+index 34d367f..b238245 100644
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+ ACLOCAL_AMFLAGS = -I m4
MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
+
+-AM_CPPFLAGS = -Wall -Werror -I$(top_srcdir)/include $(PCRE2_CFLAGS)
++AM_CPPFLAGS = -Wall -I$(top_srcdir)/include $(PCRE2_CFLAGS)
+
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
+ SUBDIRS = .
MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
+
+--
+2.17.1
+
+
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
diff --git a/package/mimic/Config.in b/package/mimic/Config.in
MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
index 79641d3790..f8c33e8697 100644
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
--- a/package/mimic/Config.in
+++ b/package/mimic/Config.in
@@ -4,6 +4,8 @@ comment "mimic needs a toolchain w/ wchar"
config BR2_PACKAGE_MIMIC
bool "mimic"
depends on BR2_USE_WCHAR
+ select BR2_PACKAGE_ICU
MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
+ select BR2_PACKAGE_PCRE2
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
help
Mimic is a fast, lightweight Text-to-speech engine developed
by Mycroft A.I. and VocaliD, based on Carnegie Mellon
diff --git a/package/mimic/mimic.hash b/package/mimic/mimic.hash
MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
index 39d016548a..2eea00ba64 100644
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
--- a/package/mimic/mimic.hash
+++ b/package/mimic/mimic.hash
MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
@@ -1,2 +1,4 @@
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
# Locally calculated
sha256 725003c9972d5b67c49d5ea6a89cb26b63414ff2c7adbbaf9200cf9eb55f80eb mimic-1.1.0.tar.gz
+sha256 6adcc9911b09d6e9513add41ad9dfc0893ece277f556419869520a0f0708c102 mimic-1.2.0.2.tar.gz
MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
+sha256 3483b3dc0771c7ac4dd995127f4ce5533378f623eb7f5ff85dbb96148267ea05 mimic-f7c10fad5758dae477f4d77cb21d9c40d3c98705.tar.gz
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
diff --git a/package/mimic/mimic.mk b/package/mimic/mimic.mk
MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
index 2d246561c9..0c60e0874e 100644
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
--- a/package/mimic/mimic.mk
+++ b/package/mimic/mimic.mk
@@ -4,12 +4,12 @@
#
################################################################################
-MIMIC_VERSION = 1.1.0
MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
-MIMIC_SITE = $(call github,MycroftAI,mimic,$(MIMIC_VERSION))
+MIMIC_VERSION = f7c10fad5758dae477f4d77cb21d9c40d3c98705
+MIMIC_SITE = $(call github,MycroftAI,mimic1,$(MIMIC_VERSION))
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
MIMIC_LICENSE = MIT
MIMIC_LICENSE_FILES = COPYING
-
-MIMIC_DEPENDENCIES = host-pkgconf
+MIMIC_AUTORECONF = YES
+MIMIC_DEPENDENCIES = host-pkgconf host-automake host-autoconf host-libtool
ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_ALSA),y)
MIMIC_AUDIO_BACKEND = alsa
MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
@@ -24,6 +24,13 @@ else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE),y)
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
MIMIC_AUDIO_BACKEND = none
endif
-MIMIC_CONF_OPTS += --with-audio=$(MIMIC_AUDIO_BACKEND)
+define MIMIC_RUN_AUTOGEN
MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
+ cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
+endef
+
+MIMIC_CONF_OPTS += --prefix="/usr/local" --with-audio=$(MIMIC_AUDIO_BACKEND)
+
+MIMIC_PRE_CONFIGURE_HOOKS += MIMIC_RUN_AUTOGEN
$(eval $(autotools-package))
MycroftOS: Buildroot: Update Mimic to latest dev version
2019-09-24 16:21:35 +02:00
+
MycroftOS: Implementation of a very first initial bootable version - Add Buildroot patches to downgrade / upgrade package dependencies in line with the Mycroft A.I. software stack requirements. - Add buildroot additional package dependencies in line with the Mycroft A.I. software stack requirements. - Update rpi3 defconfig file. - Implement initial root_fs overlay filestructure. - Addition of some quick and dirty helper scripts. - Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
--
2.11.0