mirror of
https://github.com/OpenVoiceOS/OpenVoiceOS
synced 2025-01-31 02:47:16 +01:00
MycroftOS: Buildroot: Update Mimic to latest dev version
This commit is contained in:
Peter Steenbergen
parent
471002d23c
commit
bf1c8ec59f
@ -1,37 +1,49 @@
|
||||
From 1c97c05ae21762932e4a7dece3996a4872c769db Mon Sep 17 00:00:00 2001
|
||||
From 1c090605bbec847ec5000ded4fca28c78e0d73f3 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Steenbergen <info@j1nx.nl>
|
||||
Date: Mon, 29 Oct 2018 09:56:56 +0100
|
||||
Subject: [PATCH 1/1] Update mimic to 1.2.0.2
|
||||
Date: Tue, 24 Sep 2019 15:49:52 +0200
|
||||
Subject: [PATCH 1/1] Update mimic to latest dev version
|
||||
|
||||
---
|
||||
package/mimic/0001-disable-werror.patch | 13 +++++++++++++
|
||||
package/mimic/0001-disable-werror.patch | 25 +++++++++++++++++++++++++
|
||||
package/mimic/Config.in | 2 ++
|
||||
package/mimic/mimic.hash | 1 +
|
||||
package/mimic/mimic.mk | 14 ++++++++++----
|
||||
4 files changed, 26 insertions(+), 4 deletions(-)
|
||||
package/mimic/mimic.hash | 2 ++
|
||||
package/mimic/mimic.mk | 17 ++++++++++++-----
|
||||
4 files changed, 41 insertions(+), 5 deletions(-)
|
||||
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
|
||||
index 0000000000..ad37023390
|
||||
index 0000000000..0f8d59a467
|
||||
--- /dev/null
|
||||
+++ b/package/mimic/0001-disable-werror.patch
|
||||
@@ -0,0 +1,13 @@
|
||||
+Removing the -Werror FLAG
|
||||
@@ -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(-)
|
||||
+
|
||||
+diff --git a/Makefile.am b/Makefile.am
|
||||
+index 34d367f..b238245 100644
|
||||
+--- a/Makefile.am
|
||||
++++ b/Makefile.am
|
||||
+@@ -1,6 +1,6 @@
|
||||
+ ACLOCAL_AMFLAGS = -I m4
|
||||
+
|
||||
+-AM_CPPFLAGS = -Wall -Werror -I$(top_srcdir)/include $(ICU_CFLAGS)
|
||||
++AM_CPPFLAGS = -Wall -I$(top_srcdir)/include $(ICU_CFLAGS)
|
||||
+
|
||||
+
|
||||
+-AM_CPPFLAGS = -Wall -Werror -I$(top_srcdir)/include $(PCRE2_CFLAGS)
|
||||
++AM_CPPFLAGS = -Wall -I$(top_srcdir)/include $(PCRE2_CFLAGS)
|
||||
+
|
||||
+ SUBDIRS = .
|
||||
+
|
||||
+
|
||||
+--
|
||||
+2.17.1
|
||||
+
|
||||
+
|
||||
diff --git a/package/mimic/Config.in b/package/mimic/Config.in
|
||||
index 79641d3790..254b1844ad 100644
|
||||
index 79641d3790..f8c33e8697 100644
|
||||
--- a/package/mimic/Config.in
|
||||
+++ b/package/mimic/Config.in
|
||||
@@ -4,6 +4,8 @@ comment "mimic needs a toolchain w/ wchar"
|
||||
@ -39,20 +51,21 @@ index 79641d3790..254b1844ad 100644
|
||||
bool "mimic"
|
||||
depends on BR2_USE_WCHAR
|
||||
+ select BR2_PACKAGE_ICU
|
||||
+ select BR2_PACKAGE_PCRE2
|
||||
+ select BR2_PACKAGE_PCRE2
|
||||
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
|
||||
index 39d016548a..4570ed91db 100644
|
||||
index 39d016548a..2eea00ba64 100644
|
||||
--- a/package/mimic/mimic.hash
|
||||
+++ b/package/mimic/mimic.hash
|
||||
@@ -1,2 +1,3 @@
|
||||
@@ -1,2 +1,4 @@
|
||||
# Locally calculated
|
||||
sha256 725003c9972d5b67c49d5ea6a89cb26b63414ff2c7adbbaf9200cf9eb55f80eb mimic-1.1.0.tar.gz
|
||||
+sha256 6adcc9911b09d6e9513add41ad9dfc0893ece277f556419869520a0f0708c102 mimic-1.2.0.2.tar.gz
|
||||
+sha256 3483b3dc0771c7ac4dd995127f4ce5533378f623eb7f5ff85dbb96148267ea05 mimic-f7c10fad5758dae477f4d77cb21d9c40d3c98705.tar.gz
|
||||
diff --git a/package/mimic/mimic.mk b/package/mimic/mimic.mk
|
||||
index 2d246561c9..a64b3d50bb 100644
|
||||
index 2d246561c9..0c60e0874e 100644
|
||||
--- a/package/mimic/mimic.mk
|
||||
+++ b/package/mimic/mimic.mk
|
||||
@@ -4,12 +4,12 @@
|
||||
@ -60,8 +73,9 @@ index 2d246561c9..a64b3d50bb 100644
|
||||
################################################################################
|
||||
|
||||
-MIMIC_VERSION = 1.1.0
|
||||
+MIMIC_VERSION = 1.2.0.2
|
||||
MIMIC_SITE = $(call github,MycroftAI,mimic,$(MIMIC_VERSION))
|
||||
-MIMIC_SITE = $(call github,MycroftAI,mimic,$(MIMIC_VERSION))
|
||||
+MIMIC_VERSION = f7c10fad5758dae477f4d77cb21d9c40d3c98705
|
||||
+MIMIC_SITE = $(call github,MycroftAI,mimic1,$(MIMIC_VERSION))
|
||||
MIMIC_LICENSE = MIT
|
||||
MIMIC_LICENSE_FILES = COPYING
|
||||
-
|
||||
@ -71,13 +85,13 @@ index 2d246561c9..a64b3d50bb 100644
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_ALSA),y)
|
||||
MIMIC_AUDIO_BACKEND = alsa
|
||||
@@ -24,6 +24,12 @@ else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE),y)
|
||||
@@ -24,6 +24,13 @@ else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE),y)
|
||||
MIMIC_AUDIO_BACKEND = none
|
||||
endif
|
||||
|
||||
-MIMIC_CONF_OPTS += --with-audio=$(MIMIC_AUDIO_BACKEND)
|
||||
+define MIMIC_RUN_AUTOGEN
|
||||
+ cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
|
||||
+ cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
|
||||
+endef
|
||||
+
|
||||
+MIMIC_CONF_OPTS += --prefix="/usr/local" --with-audio=$(MIMIC_AUDIO_BACKEND)
|
||||
@ -85,6 +99,7 @@ index 2d246561c9..a64b3d50bb 100644
|
||||
+MIMIC_PRE_CONFIGURE_HOOKS += MIMIC_RUN_AUTOGEN
|
||||
|
||||
$(eval $(autotools-package))
|
||||
+
|
||||
--
|
||||
2.11.0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user