aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorArmin Weatherwax2010-01-03 22:11:52 +0100
committerJacek Antonelli2010-04-29 01:15:01 -0500
commit7ed6a6eddc0206e77d5457c07492a37410757f0c (patch)
tree92e114d421f0cf6262b2735a9b8693f33c5a3648
parentUse ${ARCH} instead of x86_64 in CMake. (diff)
downloadmeta-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-xlinden/indra/newview/linux_tools/wrapper.sh4
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
120fi 120fi
121 121
122export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib/gstreamer-plugins/"
123if [ "`uname -m`" = "x86_64" ]; then 122if [ "`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}"'
125else 126else
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}"'
127fi 129fi
128export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-imprudence-bin' 130export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-imprudence-bin'