From 8f66fcb7e32ce074fda9816efec37b45659c45e3 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sun, 21 Jul 2024 21:21:12 +0800 Subject: Wine-based Vivox-based voice support for FreeBSD https://megapahit.com/show_bug.cgi?id=57 For SLVoice to run, there is a couple of environment variables that need to be set, and users need to run `/usr/local/share/wine/pkg32.sh install wine mesa-dri` to install the necessary files first. All this time the env parameter on apr_proc_create was never used, and this is just the place for passing those environment settings, hence the LLProcess::Param attribute addition. --- indra/newview/llvoicevivox.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 4473c8b55b..cf5ee3af54 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -944,11 +944,15 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon() // vivox executable exists. Build the command line and launch the daemon. LLProcess::Params params; #if LL_LINUX || __FreeBSD__ +#if __FreeBSD__ + params.envs.add("WINEARCH=win32"); + params.envs.add("WINEPREFIX=~/.i386-wine-pkg"); +#endif // __FreeBSD__ params.executable = "wine"; params.args.add(exe_path); #else params.executable = exe_path; -#endif +#endif // LL_LINUX || __FreeBSD__ // VOICE-88: Cycle through [portbase..portbase+portrange) on // successive tries because attempting to relaunch (after manually -- cgit v1.2.3