diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-29 13:04:06 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-29 13:04:06 +0800 |
| commit | 79616a3ff5c8e3f3a14c926c017f0c442160c6ee (patch) | |
| tree | deb6a636ba34a75af619a10423b7336020f35c2b /indra/media_plugins | |
| parent | 8ce057a8a20b2526c584bf0af41acb199febe744 (diff) | |
| parent | 7e7956b4801b1f0276229b4f65886911beaa96af (diff) | |
Merge branch 'main' into 2024.06-atlasaurus
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/libvlc/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/media_plugins/libvlc/media_plugin_libvlc.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt index 6fa3fdcaac..dd2cbff903 100644 --- a/indra/media_plugins/libvlc/CMakeLists.txt +++ b/indra/media_plugins/libvlc/CMakeLists.txt @@ -63,8 +63,8 @@ if (DARWIN) -change "/opt/local/lib/liburiparser.1.dylib" "@loader_path/../../Frameworks/liburiparser.1.dylib" -change "/opt/local/lib/libnghttp2.14.dylib" "@loader_path/../../Frameworks/libnghttp2.14.dylib" -change "/usr/local/lib/libxmlrpc-epi.0.dylib" "@loader_path/../../Frameworks/libxmlrpc-epi.0.dylib" - -change "@rpath/libvlc.dylib" "@loader_path/../../Frameworks/libvlc.dylib" - -change "@rpath/libvlccore.dylib" "@loader_path/../../Frameworks/libvlccore.dylib" + -change "@rpath/libvlc.dylib" "@loader_path/plugins/libvlc.dylib" + -change "@rpath/libvlccore.dylib" "@loader_path/plugins/libvlccore.dylib" "$<TARGET_FILE:media_plugin_libvlc>" VERBATIM COMMENT "Fixing paths to LibVLC media plugin dependencies" 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); |