소스 검색

add optional OGI stuff

Ralf S. Engelschall 17 년 전
부모
커밋
546f7b44e5
2개의 변경된 파일53개의 추가작업 그리고 9개의 파일을 삭제
  1. 12 6
      festival/festival-init.scm
  2. 41 3
      festival/festival.spec

+ 12 - 6
festival/festival-init.scm

@@ -11,10 +11,16 @@
 (set_server_safe_functions '(tts_return_to_client tts_text tts_textall Parameter.set tts_textasterisk))
 
 ;;  select default voice (given in the Festival priority order)
-(set! voice_default 'voice_kal_diphone)
-;(set! voice_default 'voice_cmu_us_bdl_arctic_hts)
-;(set! voice_default 'voice_cmu_us_jmk_arctic_hts)
-;(set! voice_default 'voice_cmu_us_slt_arctic_hts)
-;(set! voice_default 'voice_cmu_us_awb_arctic_hts) 
-;(set! voice_default 'voice_ked_diphone)
+ (set! voice_default 'voice_kal_diphone)           ; American English male   (Diphone)
+;(set! voice_default 'voice_cmu_us_bdl_arctic_hts) ; American English male   (HTS)
+;(set! voice_default 'voice_cmu_us_jmk_arctic_hts) ; Canadian English male   (HTS)
+;(set! voice_default 'voice_cmu_us_slt_arctic_hts) ; American English female (HTS)
+;(set! voice_default 'voice_cmu_us_awb_arctic_hts) ; Scottish English male   (HTS)
+;(set! voice_default 'voice_ked_diphone)           ; American English male   (Diphone)
+;(set! voice_default 'voice_as_diphone)            ; American English female (Diphone/OGI)
+;(set! voice_default 'voice_mwm5_diphone)          ; American English male   (Diphone/OGI)
+;(set! voice_default 'voice_aec_diphone)           ; American English male   (Diphone/OGI)
+;(set! voice_default 'voice_jph_diphone)           ; American English male   (Diphone/OGI)
+;(set! voice_default 'voice_tll_diphone)           ; American English female (Diphone/OGI)
+;(set! voice_default 'voice_ogirab_diphone)        ; British  English male   (Diphone/OGI)
 

+ 41 - 3
festival/festival.spec

@@ -24,6 +24,14 @@
 #   package versions
 %define       V_festival      1.96
 %define       V_speech_tools  1.2.96
+%define       V_ogireslpc     2.2
+%define       V_ogilexicon    2.2
+%define       V_ogivoiceas    2.3
+%define       V_ogivoicemwm5  2.3
+%define       V_ogivoiceaec   2.3
+%define       V_ogivoicejph   2.3
+%define       V_ogivoicetll   2.3
+%define       V_ogivoicerab   2.1
 
 #   package information
 Name:         festival
@@ -38,6 +46,9 @@ License:      X11-style
 Version:      %{V_festival}
 Release:      20080321
 
+#   package options
+%option       with_ogi  no
+
 #   list of sources
 Source0:      http://festvox.org/packed/festival/%{V_festival}/festival-%{V_festival}-beta.tar.gz
 Source1:      http://festvox.org/packed/festival/%{V_festival}/speech_tools-%{V_speech_tools}-beta.tar.gz
@@ -51,9 +62,17 @@ Source8:      http://festvox.org/packed/festival/%{V_festival}/festvox_cmu_us_aw
 Source9:      http://festvox.org/packed/festival/%{V_festival}/festvox_cmu_us_bdl_arctic_hts.tar.gz
 Source10:     http://festvox.org/packed/festival/%{V_festival}/festvox_cmu_us_jmk_arctic_hts.tar.gz
 Source11:     http://festvox.org/packed/festival/%{V_festival}/festvox_cmu_us_slt_arctic_hts.tar.gz
-Source12:     rc.festival
-Source13:     festival-init.scm
-Source14:     festival-vars.scm
+Source12:     http://www.cslu.ogi.edu/tts/download/data/OGIresLPC-%{V_ogireslpc}.tar.gz
+Source13:     http://www.cslu.ogi.edu/tts/download/data/OGIlexicon-%{V_ogilexicon}.tar.gz
+Source14:     http://www.cslu.ogi.edu/tts/download/data/voice_as_di_%{V_ogivoiceas}.tar.gz
+Source15:     http://www.cslu.ogi.edu/tts/download/data/voice_mwm5_di_%{V_ogivoicemwm5}.tar.gz
+Source16:     http://www.cslu.ogi.edu/tts/download/data/voice_aec_di_%{V_ogivoiceaec}.tar.gz
+Source17:     http://www.cslu.ogi.edu/tts/download/data/voice_jph_di_%{V_ogivoicejph}.tar.gz
+Source18:     http://www.cslu.ogi.edu/tts/download/data/voice_tll_di_%{V_ogivoicetll}.tar.gz
+Source19:     http://www.cslu.ogi.edu/tts/download/data/voice_ogirab_di_%{V_ogivoicerab}.tar.gz
+Source20:     rc.festival
+Source21:     festival-init.scm
+Source22:     festival-vars.scm
 Patch0:       festival.patch
 
 #   build information
@@ -93,6 +112,16 @@ AutoReqProv:  no
     %setup -q -T -D -a 9
     %setup -q -T -D -a 10
     %setup -q -T -D -a 11
+%if "%{with_ogi}" == "yes"
+    %setup -q -T -D -a 12
+    %setup -q -T -D -a 13
+    %setup -q -T -D -a 14
+    %setup -q -T -D -a 15
+    %setup -q -T -D -a 16
+    %setup -q -T -D -a 17
+    %setup -q -T -D -a 18
+    %setup -q -T -D -a 19
+%endif
     %patch -p0
 
 %build
@@ -102,6 +131,15 @@ AutoReqProv:  no
         festival/lib/tts.scm \
         festival/lib/voices.scm
 
+    #   optionally activate OGI extension
+%if "%{with_ogi}" == "yes"
+    ( echo "ALSO_INCLUDE += OGIcommon OGIeffect OGIinsert OGIdbase OGIresLPC"
+    ) >>festival/config/config.in
+    %{l_shtool} subst \
+        -e 's;^\(OPTIONAL.*\);\1 OGIcommon OGIeffect OGIinsert OGIdbase OGIresLPC;' \
+        festival/src/modules/Makefile
+%endif
+
     #   build speech tools
     (   cd speech_tools
         CC="%{l_cc}" \