Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-12-27 07:05:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

build: Add and build piper submodule.

Browse Source 
CW-Bug-Id: #18723
CW-Bug-Id: #20918
CW-Bug-Id: #21959
CW-Bug-Id: #22520
CW-Bug-Id: #22894
This commit is contained in:
Shaun Ren 2023-11-28 20:05:58 -05:00
parent 0b1b644ceb
commit 5c8d3d0568
4 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -65,3 +65,7 @@
[submodule "vosk-api"] [submodule "vosk-api"]
path = vosk-api path = vosk-api
url = https://github.com/alphacep/vosk-api url = https://github.com/alphacep/vosk-api
[submodule "piper"]
path = piper
url = https://github.com/shaunren/piper.git
branch = library

14
Makefile.in
View File

@ -461,6 +461,19 @@ $(eval $(call rules-source,vosk,$(SRCDIR)/vosk-api))
$(eval $(call rules-cmake,vosk,32)) $(eval $(call rules-cmake,vosk,32))
$(eval $(call rules-cmake,vosk,64)) $(eval $(call rules-cmake,vosk,64))
##
## piper
##
$(eval $(call rules-source,piper,$(SRCDIR)/piper))
$(eval $(call rules-cmake,piper,64))
$(OBJ)/.piper-post-build64:
mkdir -p $(PIPER_DST64)/lib64
mkdir -p $(DST_DIR)/share
mv $(PIPER_DST64)/*.so* $(PIPER_DST64)/lib64/
cp -a $(PIPER_DST64)/{espeak-ng-data,libtashkeel_model.ort} $(DST_DIR)/share/
touch $@
## ##
## wine ## wine
@ -500,6 +513,7 @@ WINE_CONFIGURE_ARGS64 = --enable-win64 \
VKD3D_PE_LIBS="-L$(VKD3D_DST64)/bin -l:libvkd3d-1.dll -l:libvkd3d-shader-1.dll" VKD3D_PE_LIBS="-L$(VKD3D_DST64)/bin -l:libvkd3d-1.dll -l:libvkd3d-shader-1.dll"
WINE_DEPENDS = gst_orc gstreamer gst_base vkd3d openfst kaldi vosk WINE_DEPENDS = gst_orc gstreamer gst_base vkd3d openfst kaldi vosk
WINE_DEPENDS64 = piper
$(eval $(call rules-source,wine,$(SRCDIR)/wine)) $(eval $(call rules-source,wine,$(SRCDIR)/wine))
$(eval $(call rules-autoconf,wine,32)) $(eval $(call rules-autoconf,wine,32))

1
piper Submodule

@ -0,0 +1 @@
Subproject commit 9d06b74959570772e8bcbe7a3f696664d2421167

2
proton
View File

@ -1390,6 +1390,8 @@ class Session:
self.env["MEDIACONV_BLANK_VIDEO_FILE"] = g_proton.media_dir + "blank.mkv" self.env["MEDIACONV_BLANK_VIDEO_FILE"] = g_proton.media_dir + "blank.mkv"
self.env["MEDIACONV_BLANK_AUDIO_FILE"] = g_proton.media_dir + "blank.ptna" self.env["MEDIACONV_BLANK_AUDIO_FILE"] = g_proton.media_dir + "blank.ptna"
self.env["ESPEAK_DATA_PATH"] = g_proton.dist_dir + "share"
prepend_to_env_str(self.env, "PATH", g_proton.bin_dir, ":") prepend_to_env_str(self.env, "PATH", g_proton.bin_dir, ":")
def check_environment(self, env_name, config_name): def check_environment(self, env_name, config_name):