From 60f2bffa7c4a55f62c34c867afd83b1225e24b7f Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Sun, 7 Nov 2021 03:44:08 +0200
Subject: [PATCH] SL-16299 Added the correct @rpath for libvlc
---
indra/newview/viewer_manifest.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 1d82e95e981..6fcd1e84e8f 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1176,8 +1176,10 @@ def path_optional(src, dst):
[newpath, self.dst_path_of(dylibexecutable)])
# copy LibVLC plugin itself
- self.path2basename("../media_plugins/libvlc/" + self.args['configuration'],
- "media_plugin_libvlc.dylib")
+ dylibexecutable = 'media_plugin_libvlc.dylib'
+ self.path2basename("../media_plugins/libvlc/" + self.args['configuration'], dylibexecutable)
+ # add @rpath for the correct LibVLC subfolder
+ self.run_command(['install_name_tool', '-add_rpath', '@loader_path/lib', self.dst_path_of(dylibexecutable)])
# copy LibVLC dynamic libraries
with self.prefix(src=relpkgdir, dst="lib"):
--
GitLab