From a6255ec518859ea3a8f6951a8eb5261fa0a1bbcb Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sun, 3 Jan 2010 22:11:52 +0100
Subject: Tell the wrapper script where 64bit gstreamer plugins are.
(Cherry picked by Jacek from 560d3013)
---
linden/indra/newview/linux_tools/wrapper.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'linden')
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index 83db679..93258f4 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -117,10 +117,12 @@ if [ -n "$LL_TCMALLOC" ]; then
fi
fi
-export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib/gstreamer-plugins/"
if [ "`uname -m`" = "x86_64" ]; then
+ export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib64/gstreamer-plugins/"
+
export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib64:"`pwd`"/lib32:"`pwd`"/app_settings/mozilla-runtime-linux-x86_64:"${LD_LIBRARY_PATH}"'
else
+ export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib/gstreamer-plugins/"
export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"'
fi
export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-imprudence-bin'
--
cgit v1.1