From 5dc287f885d44541b83cd5449512df124bbbd134 Mon Sep 17 00:00:00 2001 From: Michael Pozhidaev Date: Tue, 12 Nov 2013 14:05:41 +0700 Subject: [PATCH] Homeros distro changes: - speech-ru and speech-en features are added; - speech-related things removed from homeros features; - speech/ directory for package lists added and other corresponding changes. --- conf.d/homeros.mk | 2 +- features.in/homeros/config.mk | 6 +----- features.in/speech-en/README | 2 ++ features.in/speech-en/config.mk | 5 +++++ .../live/image-scripts.d/10-amixer | 0 .../speech-en/live/image-scripts.d/10-rhvoice | 3 +++ features.in/speech-ru/README | 2 ++ features.in/speech-ru/config.mk | 5 +++++ .../speech-ru/live/image-scripts.d/10-amixer | 13 +++++++++++++ .../live/image-scripts.d/10-rhvoice | 0 pkg.in/lists/homeros/tts | 2 -- pkg.in/lists/speech/en | 1 + pkg.in/lists/speech/ru | 3 +++ pkg.in/lists/{homeros => speech}/voiceman | 0 14 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 features.in/speech-en/README create mode 100644 features.in/speech-en/config.mk rename features.in/{homeros => speech-en}/live/image-scripts.d/10-amixer (100%) create mode 100755 features.in/speech-en/live/image-scripts.d/10-rhvoice create mode 100644 features.in/speech-ru/README create mode 100644 features.in/speech-ru/config.mk create mode 100755 features.in/speech-ru/live/image-scripts.d/10-amixer rename features.in/{homeros => speech-ru}/live/image-scripts.d/10-rhvoice (100%) delete mode 100644 pkg.in/lists/homeros/tts create mode 100644 pkg.in/lists/speech/en create mode 100644 pkg.in/lists/speech/ru rename pkg.in/lists/{homeros => speech}/voiceman (100%) diff --git a/conf.d/homeros.mk b/conf.d/homeros.mk index bf771678..51d01fda 100644 --- a/conf.d/homeros.mk +++ b/conf.d/homeros.mk @@ -1,6 +1,6 @@ ifeq (distro,$(IMAGE_CLASS)) -distro/homeros-mini: distro/.live-base use/live/textinstall use/homeros; @: +distro/homeros-mini: distro/.live-base use/live/textinstall use/homeros use/speech-en; @: endif diff --git a/features.in/homeros/config.mk b/features.in/homeros/config.mk index e184dc65..30b02e0a 100644 --- a/features.in/homeros/config.mk +++ b/features.in/homeros/config.mk @@ -1,11 +1,7 @@ use/homeros: use/control/sudo-su use/services @$(call add_feature) # @$(call set,BRANDING,simply-linux) -# @$(call add,THE_BRANDING,menu xfce-settings) - @$(call add,THE_LISTS,homeros/voiceman) @$(call add,THE_LISTS,homeros/homeros) - @$(call add,THE_LISTS,homeros/tts) @$(call add,THE_LISTS,homeros/yasr) @$(call add,THE_LISTS,homeros/tools) -# @$(call set,META_VOL_SET,Homeros) - @$(call add,DEFAULT_SERVICES_ENABLE,sshd voiceman) + @$(call add,DEFAULT_SERVICES_ENABLE,sshd) diff --git a/features.in/speech-en/README b/features.in/speech-en/README new file mode 100644 index 00000000..4a354c78 --- /dev/null +++ b/features.in/speech-en/README @@ -0,0 +1,2 @@ +Эта фича полностью подготавливает англоязычный вывод речи на базе +сервера VoiceMan. diff --git a/features.in/speech-en/config.mk b/features.in/speech-en/config.mk new file mode 100644 index 00000000..75ec7a16 --- /dev/null +++ b/features.in/speech-en/config.mk @@ -0,0 +1,5 @@ +use/speech-en: + @$(call add_feature) + @$(call add,THE_LISTS,speech/voiceman) + @$(call add,THE_LISTS,speech/en) + @$(call add,DEFAULT_SERVICES_ENABLE,voiceman) diff --git a/features.in/homeros/live/image-scripts.d/10-amixer b/features.in/speech-en/live/image-scripts.d/10-amixer similarity index 100% rename from features.in/homeros/live/image-scripts.d/10-amixer rename to features.in/speech-en/live/image-scripts.d/10-amixer diff --git a/features.in/speech-en/live/image-scripts.d/10-rhvoice b/features.in/speech-en/live/image-scripts.d/10-rhvoice new file mode 100755 index 00000000..f91a1e31 --- /dev/null +++ b/features.in/speech-en/live/image-scripts.d/10-rhvoice @@ -0,0 +1,3 @@ +#!/bin/sh -e + +/bin/ln -s /etc/tts.d/espeak.voiceman /etc/voiceman.d/espeak.output diff --git a/features.in/speech-ru/README b/features.in/speech-ru/README new file mode 100644 index 00000000..96c981b0 --- /dev/null +++ b/features.in/speech-ru/README @@ -0,0 +1,2 @@ +Эта фича полностью подготавливает русскоязычный вывод речи на базе +сервера VoiceMan. diff --git a/features.in/speech-ru/config.mk b/features.in/speech-ru/config.mk new file mode 100644 index 00000000..4df143f4 --- /dev/null +++ b/features.in/speech-ru/config.mk @@ -0,0 +1,5 @@ +use/speech-ru: + @$(call add_feature) + @$(call add,THE_LISTS,speech/voiceman) + @$(call add,THE_LISTS,speech/ru) + @$(call add,DEFAULT_SERVICES_ENABLE,voiceman) diff --git a/features.in/speech-ru/live/image-scripts.d/10-amixer b/features.in/speech-ru/live/image-scripts.d/10-amixer new file mode 100755 index 00000000..feda4c06 --- /dev/null +++ b/features.in/speech-ru/live/image-scripts.d/10-amixer @@ -0,0 +1,13 @@ +#!/bin/sh + +cat < /etc/rc.d/rc.local +#!/bin/sh + +amixer set Master 75% +amixer set Master toggle +amixer set PCM 75% +amixer set PCM toggle + +EOF + +chmod 755 /etc/rc.d/rc.local diff --git a/features.in/homeros/live/image-scripts.d/10-rhvoice b/features.in/speech-ru/live/image-scripts.d/10-rhvoice similarity index 100% rename from features.in/homeros/live/image-scripts.d/10-rhvoice rename to features.in/speech-ru/live/image-scripts.d/10-rhvoice diff --git a/pkg.in/lists/homeros/tts b/pkg.in/lists/homeros/tts deleted file mode 100644 index 75a170e7..00000000 --- a/pkg.in/lists/homeros/tts +++ /dev/null @@ -1,2 +0,0 @@ -RHVoice -espeak diff --git a/pkg.in/lists/speech/en b/pkg.in/lists/speech/en new file mode 100644 index 00000000..ef548156 --- /dev/null +++ b/pkg.in/lists/speech/en @@ -0,0 +1 @@ +espeak diff --git a/pkg.in/lists/speech/ru b/pkg.in/lists/speech/ru new file mode 100644 index 00000000..2c2c961d --- /dev/null +++ b/pkg.in/lists/speech/ru @@ -0,0 +1,3 @@ +RHVoice +textlus-rhvoice + diff --git a/pkg.in/lists/homeros/voiceman b/pkg.in/lists/speech/voiceman similarity index 100% rename from pkg.in/lists/homeros/voiceman rename to pkg.in/lists/speech/voiceman