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/newview | |
| 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/newview')
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index 079af78dcb..b468f1af99 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -114,8 +114,16 @@ if (DARWIN) ) install(DIRECTORY - /Applications/VLC.app/Contents/MacOS/plugins - DESTINATION ../Frameworks + /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/plugins + DESTINATION llplugin + ) + + install(FILES + /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlc.5.dylib + /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlc.dylib + /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlccore.9.dylib + /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlccore.dylib + DESTINATION llplugin/plugins ) install(DIRECTORY |