Merge branch 'master' of /home/hansenm/Mike/Projects/rhasspy-voltron

configure

@@ -625,6 +625,7 @@ ac_includes_default="\
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 IN_PLACE
+ENABLE_VOSK
 ENABLE_LARYNX
 LARYNX_ARCH
 ENABLE_WAVENET
@@ -746,6 +747,7 @@ enable_pocketsphinx
 enable_kaldi
 enable_julius
 enable_deepspeech
+enable_vosk
 enable_speech_to_text
 enable_fuzzywuzzy
 enable_snips
@@ -1418,6 +1420,7 @@ Optional Features:
   --disable-julius        disable installation of julius speech to text system
   --disable-deepspeech    disable installation of deepspeech speech to text
                           system
+  --disable-vosk          disable installation of vosk speech to text system
   --disable-speech-to-text
                           disable installation of all speech to text systems
   --disable-fuzzywuzzy    disable installation of fuzzywuzzy intent
@@ -3770,6 +3773,8 @@ is_deepspeech_enabled=UNKNOWN
 deepspeech_arch=NONE
 deepspeech_from=prebuilt
 
+is_vosk_enabled=UNKNOWN
+
 
 is_fuzzywuzzy_enabled=yes
 is_snips_enabled=no
@@ -3827,6 +3832,8 @@ case $host_cpu in #(
         is_nanotts_enabled=yes
 
         is_larynx_enabled=no
+
+        is_vosk_enabled=no
      ;; #(
   armv7l) :
 
@@ -3859,6 +3866,8 @@ case $host_cpu in #(
 
         is_larynx_enabled=yes
         larynx_arch=armv7l
+
+        is_vosk_enabled=yes
      ;; #(
   aarch64) :
 
@@ -3891,6 +3900,8 @@ case $host_cpu in #(
 
         is_larynx_enabled=yes
         larynx_arch=aarch64
+
+        is_vosk_enabled=no
      ;; #(
   x86_64) :
 
@@ -3923,6 +3934,8 @@ case $host_cpu in #(
 
         is_larynx_enabled=yes
         larynx_arch=x86_64
+
+        is_vosk_enabled=yes
      ;; #(
   *) :
      ;;
@@ -4033,6 +4046,12 @@ if test "${enable_deepspeech+set}" = set; then :
 fi
 
 
+# Check whether --enable-vosk was given.
+if test "${enable_vosk+set}" = set; then :
+  enableval=$enable_vosk;
+fi
+
+
 # Check whether --enable-speech-to-text was given.
 if test "${enable_speech_to_text+set}" = set; then :
   enableval=$enable_speech_to_text;
@@ -5117,6 +5136,8 @@ else
   $as_echo "  deepspeech: ${is_deepspeech_enabled}"
 fi
 
+$as_echo "  vosk: ${is_vosk_enabled}"
+
 if test "x$is_julius_enabled" = xyes; then :
   $as_echo "  julius: ${is_julius_enabled} (${docker_arch}, ${julius_from})"
 else
@@ -5239,6 +5260,9 @@ LARYNX_ARCH=$larynx_arch
 ENABLE_LARYNX=$is_larynx_enabled
 
 
+ENABLE_VOSK=$is_vosk_enabled
+
+
 IN_PLACE=$is_in_place
 
 

configure.ac

@@ -70,6 +70,8 @@ is_deepspeech_enabled=UNKNOWN
 deepspeech_arch=NONE
 deepspeech_from=prebuilt
 
+is_vosk_enabled=UNKNOWN
+
 dnl ------------------
 dnl Intent Recognition
 dnl ------------------
@@ -137,6 +139,8 @@ AS_CASE([$host_cpu],
         is_nanotts_enabled=yes
 
         is_larynx_enabled=no
+
+        is_vosk_enabled=no
     ],
     [armv7l],[
         dnl ARM 32-bit v7 (Pi 2/3/4)
@@ -169,6 +173,8 @@ AS_CASE([$host_cpu],
 
         is_larynx_enabled=yes
         larynx_arch=armv7l
+
+        is_vosk_enabled=yes
     ],
     [aarch64],[
         dnl ARM 64-bit (Pi 3/4)
@@ -201,6 +207,8 @@ AS_CASE([$host_cpu],
 
         is_larynx_enabled=yes
         larynx_arch=aarch64
+
+        is_vosk_enabled=no
     ],
     [x86_64],[
         dnl x86_64 compatible
@@ -233,6 +241,8 @@ AS_CASE([$host_cpu],
 
         is_larynx_enabled=yes
         larynx_arch=x86_64
+
+        is_vosk_enabled=yes
     ])
 
 dnl ---------------------------------------------------------------------------
@@ -333,8 +343,13 @@ AC_ARG_ENABLE([julius],
 
 dnl Mozilla's DeepSpeech
 AC_ARG_ENABLE([deepspeech],
-    AS_HELP_STRING([--disable-deepspeech],
-        [disable installation of deepspeech speech to text system]))
+AS_HELP_STRING([--disable-deepspeech],
+[disable installation of deepspeech speech to text system]))
+
+dnl Vosk
+AC_ARG_ENABLE([vosk],
+    AS_HELP_STRING([--disable-vosk],
+        [disable installation of vosk speech to text system]))
 
 dnl Speech to text meta
 AC_ARG_ENABLE([speech-to-text],
@@ -712,6 +727,8 @@ AS_IF([test "x$is_deepspeech_enabled" = xyes],
 AS_ECHO(["  deepspeech: ${is_deepspeech_enabled} (${deepspeech_arch}, ${deepspeech_from})"]),
 AS_ECHO(["  deepspeech: ${is_deepspeech_enabled}"]))
 
+AS_ECHO(["  vosk: ${is_vosk_enabled}"])
+
 AS_IF([test "x$is_julius_enabled" = xyes],
 AS_ECHO(["  julius: ${is_julius_enabled} (${docker_arch}, ${julius_from})"]),
 AS_ECHO(["  julius: ${is_julius_enabled}"]))
@@ -797,6 +814,8 @@ AC_SUBST([ENABLE_WAVENET], [$is_wavenet_enabled])
 AC_SUBST([LARYNX_ARCH], [$larynx_arch])
 AC_SUBST([ENABLE_LARYNX], [$is_larynx_enabled])
 
+AC_SUBST([ENABLE_VOSK], [$is_vosk_enabled])
+
 AC_SUBST([IN_PLACE], [$is_in_place])
 
 AC_OUTPUT

setup.py.in

@@ -107,6 +107,11 @@ enable_larynx = is_yes("@ENABLE_LARYNX@")
 if not enable_larynx:
     packages.pop("rhasspytts_larynx_hermes")
 
+# vosk
+enable_vosk = is_yes("@ENABLE_VOSK@")
+if not enable_vosk:
+    packages.pop("rhasspyasr_vosk_hermes")
+
 # -----------------------------------------------------------------------------
 
 # True if Rhasspy Python modules will be used directly from source instead of