Trying the new 64bit libs and adding the adjustments needed.

(Backported from d057e71bc) @nochangelog

1 files changed, 35 insertions, 15 deletions

diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index 2834947..d6db100 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -41,6 +41,20 @@
 ##   driver bug, try enabling this option and report whether it helps:
 #export LL_ATI_MOUSE_CURSOR_BUG=x
 
+## - If you experience crashes with streaming video and music, you can
+##   disable these by enabling this option:
+#export LL_DISABLE_GSTREAMER=x
+
+## - GStreamer is automatically disabled - for now - on 64-bit systems due
+##   to common fatal incompatibilities; remove/comment these lines if you want
+##   to try anyway.
+
+#FIXME:->
+#if [ "`uname -m`" = "x86_64" ]; then
+#    export LL_DISABLE_GSTREAMER=x
+#    echo '64-bit Linux detected: Disabling GStreamer (streaming video and music) by default; edit ./secondlife to re-enable.'
+#fi
+#FIXME:<-
 
 ## Everything below this line is just for advanced troubleshooters.
 ##-------------------------------------------------------------------
@@ -106,8 +120,11 @@ if [ -n "$LL_TCMALLOC" ]; then
 fi
 
 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}"'
+if [ "`uname -m`" = "x86_64" ]; then
+        export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-x86_64:"${LD_LIBRARY_PATH}"'
+else
+        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'
 export SL_OPT="`cat gridargs.dat` $@"
 
@@ -119,18 +136,21 @@ if [ -n "$LL_RUN_ERR" ]; then
         LL_RUN_ERR_MSG=""
         if [ "$LL_RUN_ERR" = "runerr" ]; then
                 # generic error running the binary
-                echo '*** Unclean shutdown. ***'
-                if [ "`uname -m`" = "x86_64" ]; then
-                        echo
-                        cat << EOFMARKER
-You are running the Imprudence Viewer on a x86_64 platform.  The
-most common problems when launching the Viewer (particularly
-'bin/do-not-directly-run-imprudence-bin: not found' and 'error while
-loading shared libraries') may be solved by installing your Linux
-distribution's 32-bit compatibility packages.
-For example, on Ubuntu and other Debian-based Linuxes you might run:
-$ sudo apt-get install ia32-libs ia32-libs-gtk ia32-libs-kde ia32-libs-sdl
-EOFMARKER
-                fi
+                echo '*** Bad shutdown. ***'
+
+#FIXME: ->
+#               if [ "`uname -m`" = "x86_64" ]; then
+#                       echo
+#                       cat << EOFMARKER
+#You are running the Imprudence Viewer on a x86_64 platform.  The
+#most common problems when launching the Viewer (particularly
+#'bin/do-not-directly-run-imprudence-bin: not found' and 'error while
+#loading shared libraries') may be solved by installing your Linux
+#distribution's 32-bit compatibility packages.
+#For example, on Ubuntu and other Debian-based Linuxes you might run:
+#$ sudo apt-get install ia32-libs ia32-libs-gtk ia32-libs-kde ia32-libs-sdl
+#EOFMARKER
+#               fi
+#FIXME: <-
         fi
 fi