mirror of
https://github.com/OpenVoiceOS/OpenVoiceOS
synced 2024-12-14 09:55:13 +01:00
146 lines
4.9 KiB
Diff
146 lines
4.9 KiB
Diff
From c2abd7ff748ffd01c264ed4d380ffc0567761786 Mon Sep 17 00:00:00 2001
|
|
From: Peter Steenbergen <info@j1nx.nl>
|
|
Date: Mon, 16 Mar 2020 19:04:14 +0100
|
|
Subject: [PATCH 1/1] Update mimic to latest 1.3.0.1 version
|
|
|
|
---
|
|
package/mimic/0001-Disable-Werror.patch | 24 +++++++++++++
|
|
.../0002-Fix-pulseaudio-library-linking.patch | 34 +++++++++++++++++++
|
|
package/mimic/Config.in | 2 ++
|
|
package/mimic/mimic.hash | 2 +-
|
|
package/mimic/mimic.mk | 16 ++++++---
|
|
5 files changed, 72 insertions(+), 6 deletions(-)
|
|
create mode 100644 package/mimic/0001-Disable-Werror.patch
|
|
create mode 100644 package/mimic/0002-Fix-pulseaudio-library-linking.patch
|
|
|
|
diff --git a/package/mimic/0001-Disable-Werror.patch b/package/mimic/0001-Disable-Werror.patch
|
|
new file mode 100644
|
|
index 0000000000..ef863d5432
|
|
--- /dev/null
|
|
+++ b/package/mimic/0001-Disable-Werror.patch
|
|
@@ -0,0 +1,24 @@
|
|
+From b57dfb78b82e9aa82df4129e389963445eb0347e Mon Sep 17 00:00:00 2001
|
|
+From: Peter Steenbergen <info@j1nx.nl>
|
|
+Date: Mon, 16 Mar 2020 16:01:50 +0100
|
|
+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 $(PCRE2_CFLAGS)
|
|
++AM_CPPFLAGS = -Wall -I$(top_srcdir)/include $(PCRE2_CFLAGS)
|
|
+
|
|
+ SUBDIRS = .
|
|
+
|
|
+--
|
|
+2.25.0
|
|
+
|
|
diff --git a/package/mimic/0002-Fix-pulseaudio-library-linking.patch b/package/mimic/0002-Fix-pulseaudio-library-linking.patch
|
|
new file mode 100644
|
|
index 0000000000..b452e3b904
|
|
--- /dev/null
|
|
+++ b/package/mimic/0002-Fix-pulseaudio-library-linking.patch
|
|
@@ -0,0 +1,34 @@
|
|
+From a0084f897b8ff57f8ba863a50938304cb897d949 Mon Sep 17 00:00:00 2001
|
|
+From: Peter Steenbergen <info@j1nx.nl>
|
|
+Date: Mon, 16 Mar 2020 18:57:33 +0100
|
|
+Subject: [PATCH 1/1] Fix pulseaudio library linking
|
|
+
|
|
+---
|
|
+ configure.ac | 4 ++--
|
|
+ 1 file changed, 2 insertions(+), 2 deletions(-)
|
|
+
|
|
+diff --git a/configure.ac b/configure.ac
|
|
+index 0c61bb6..c6f8847 100644
|
|
+--- a/configure.ac
|
|
++++ b/configure.ac
|
|
+@@ -126,7 +126,7 @@ AUDIOLIBS_SUN=
|
|
+
|
|
+ dnl Check PulseAudio
|
|
+ AUDIODETECTED_PULSEAUDIO="false"
|
|
+-PKG_CHECK_MODULES([PULSEAUDIO], [libpulse],
|
|
++PKG_CHECK_MODULES([PULSEAUDIO], [libpulse-simple],
|
|
+ [AUDIODRIVER="pulseaudio"
|
|
+ AUDIODETECTED_PULSEAUDIO="true"],
|
|
+ [m4_ignore])
|
|
+@@ -186,7 +186,7 @@ AS_CASE( [ ${AUDIODRIVER} ],
|
|
+ [ AUDIODEFS="${AUDIODEFS_PULSEAUDIO}"
|
|
+ AUDIOLIBS="${AUDIOLIBS_PULSEAUDIO}"
|
|
+ AUDIODETECTED="${AUDIODETECTED_PULSEAUDIO}"
|
|
+- PKGCONFIG_MIMIC_DEPS="${PKGCONFIG_MIMIC_DEPS} libpulse"
|
|
++ PKGCONFIG_MIMIC_DEPS="${PKGCONFIG_MIMIC_DEPS} libpulse-simple"
|
|
+ ],
|
|
+ [ portaudio ],
|
|
+ [ AUDIODEFS="${AUDIODEFS_PORTAUDIO}"
|
|
+--
|
|
+2.25.0
|
|
+
|
|
diff --git a/package/mimic/Config.in b/package/mimic/Config.in
|
|
index 79641d3790..254b1844ad 100644
|
|
--- 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
|
|
+ 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 10780d415d..2974711d8c 100644
|
|
--- a/package/mimic/mimic.hash
|
|
+++ b/package/mimic/mimic.hash
|
|
@@ -1,3 +1,3 @@
|
|
# Locally calculated
|
|
-sha256 725003c9972d5b67c49d5ea6a89cb26b63414ff2c7adbbaf9200cf9eb55f80eb mimic-1.1.0.tar.gz
|
|
+sha256 9041f5c7d3720899c90c890ada179c92c3b542b90bb655c247e4a4835df79249 mimic-1.3.0.1.tar.gz
|
|
sha256 c423c1c6d260091d80ee4c00f386a10fea39963a3f1530f2c245f15dd20324ee COPYING
|
|
diff --git a/package/mimic/mimic.mk b/package/mimic/mimic.mk
|
|
index 2d246561c9..4d2ecb6c84 100644
|
|
--- a/package/mimic/mimic.mk
|
|
+++ b/package/mimic/mimic.mk
|
|
@@ -4,12 +4,12 @@
|
|
#
|
|
################################################################################
|
|
|
|
-MIMIC_VERSION = 1.1.0
|
|
-MIMIC_SITE = $(call github,MycroftAI,mimic,$(MIMIC_VERSION))
|
|
+MIMIC_VERSION = 1.3.0.1
|
|
+MIMIC_SITE = $(call github,MycroftAI,mimic1,$(MIMIC_VERSION))
|
|
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
|
|
@@ -24,6 +24,12 @@ 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
|
|
+endef
|
|
+
|
|
+MIMIC_CONF_OPTS += --prefix="/usr/local" --with-audio=$(MIMIC_AUDIO_BACKEND)
|
|
+
|
|
+MIMIC_PRE_CONFIGURE_HOOKS += MIMIC_RUN_AUTOGEN
|
|
|
|
$(eval $(autotools-package))
|
|
--
|
|
2.25.0
|
|
|