diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-07-29 12:31:22 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-07-29 12:46:08 +0800 |
commit | 7e7956b4801b1f0276229b4f65886911beaa96af (patch) | |
tree | c8b2772b3bc6cbd5309c308e26bfcef08129566a /indra/media_plugins/libvlc/media_plugin_libvlc.cpp | |
parent | 1afd491d154627d69c9dfefb314a17d5605b01d4 (diff) |
Get VLC streaming to work again on macOS
Somehow it wouldn't work when the libvlc dylibs linked by
media_plugin_libvlc were far in Frameworks, even with all the
linkages and VLC_PLUGIN_PATH set correctly.
Because of this, I had to make the libvlc files redundantly copied
(they're under 1 MB so we'll live with it) in llplugin just like
upstream for media_plugin_libvlc to link to instead, though it seems
the directory name can be anything, so I just let it be "plugins"
for installation convenience using CMake.
Also now the builder is assumed to not necessarily want VLC.app to
be installed in /Applications, though they would need to keep the
downloaded VLC disc image open.
Diffstat (limited to 'indra/media_plugins/libvlc/media_plugin_libvlc.cpp')
-rw-r--r-- | indra/media_plugins/libvlc/media_plugin_libvlc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp index 4828befb6b..a5d8f885fd 100644 --- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp +++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp @@ -174,7 +174,7 @@ void MediaPluginLibVLC::initVLC() }; #if LL_DARWIN - setenv("VLC_PLUGIN_PATH", "plugins", 1); + setenv("VLC_PLUGIN_PATH", ".", 1); #endif int vlc_argc = sizeof(vlc_argv) / sizeof(*vlc_argv); |