diff options
author | Armin Weatherwax | 2010-01-03 22:11:52 +0100 |
---|---|---|
committer | Jacek Antonelli | 2010-04-29 01:15:01 -0500 |
commit | 7ed6a6eddc0206e77d5457c07492a37410757f0c (patch) | |
tree | 92e114d421f0cf6262b2735a9b8693f33c5a3648 | |
parent | Use ${ARCH} instead of x86_64 in CMake. (diff) | |
download | meta-impy-7ed6a6eddc0206e77d5457c07492a37410757f0c.zip meta-impy-7ed6a6eddc0206e77d5457c07492a37410757f0c.tar.gz meta-impy-7ed6a6eddc0206e77d5457c07492a37410757f0c.tar.bz2 meta-impy-7ed6a6eddc0206e77d5457c07492a37410757f0c.tar.xz |
Tell the wrapper script where 64bit gstreamer plugins are.
(Backported from a6255ec5) @nochangelog
-rwxr-xr-x | linden/indra/newview/linux_tools/wrapper.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh index 30faa92..dbe96ba 100755 --- a/linden/indra/newview/linux_tools/wrapper.sh +++ b/linden/indra/newview/linux_tools/wrapper.sh | |||
@@ -119,10 +119,12 @@ if [ -n "$LL_TCMALLOC" ]; then | |||
119 | fi | 119 | fi |
120 | fi | 120 | fi |
121 | 121 | ||
122 | export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib/gstreamer-plugins/" | ||
123 | if [ "`uname -m`" = "x86_64" ]; then | 122 | if [ "`uname -m`" = "x86_64" ]; then |
123 | export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib64/gstreamer-plugins/" | ||
124 | |||
124 | export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib64:"`pwd`"/lib32:"`pwd`"/app_settings/mozilla-runtime-linux-x86_64:"${LD_LIBRARY_PATH}"' | 125 | export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib64:"`pwd`"/lib32:"`pwd`"/app_settings/mozilla-runtime-linux-x86_64:"${LD_LIBRARY_PATH}"' |
125 | else | 126 | else |
127 | export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib/gstreamer-plugins/" | ||
126 | export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"' | 128 | export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"' |
127 | fi | 129 | fi |
128 | export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-imprudence-bin' | 130 | export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-imprudence-bin' |