From aef0673899b1b60b6829487ca0bc384cfc114855 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Tue, 27 Apr 2010 20:02:48 -0500 Subject: Disabled exporting object textures when connected to SL. Exporting object textures (or other content) from Second Life without checking creator is a violation of the Second Life Policy on Third-Party Viewers and Terms of Service. --- linden/indra/newview/primbackup.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'linden/indra') diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp index 8dbf1df..240f498 100644 --- a/linden/indra/newview/primbackup.cpp +++ b/linden/indra/newview/primbackup.cpp @@ -61,6 +61,8 @@ #include "llappviewer.h" #include "lltransactiontypes.h" +#include "hippoGridManager.h" + #include "primbackup.h" #include "llviewerobjectlist.h" @@ -421,6 +423,15 @@ void primbackup::exportworker(void *userdata) } case EXPORT_TEXTURES: { + // Exporting object textures (or other content) from Second Life + // without checking creator is a violation of the Second Life + // Policy on Third-Party Viewers and Terms of Service. + if(gHippoGridManager->getConnectedGrid()->isSecondLife()) + { + primbackup::getInstance()->export_state=EXPORT_DONE; + return; + } + if(primbackup::getInstance()->m_nexttextureready==false) return; -- cgit v1.1 From 5cb0acf94eae6f6501943914fbf05e3308608aff Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Tue, 27 Apr 2010 22:24:20 -0500 Subject: Added a notification to say that textures were not exported on SL. --- linden/indra/newview/primbackup.cpp | 4 ++++ linden/indra/newview/skins/default/xui/en-us/notify.xml | 7 +++++++ 2 files changed, 11 insertions(+) (limited to 'linden/indra') diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp index 240f498..9a8a34f 100644 --- a/linden/indra/newview/primbackup.cpp +++ b/linden/indra/newview/primbackup.cpp @@ -384,6 +384,10 @@ void primbackup::exportworker(void *userdata) if(LLSelectMgr::getInstance()->getSelection()->applyToNodes(&func,false)) { + if(gHippoGridManager->getConnectedGrid()->isSecondLife()) + { + LLNotifyBox::showXml("NoTextureExportSL"); + } primbackup::getInstance()->export_state=EXPORT_STRUCTURE; } else diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml index 09b00de..cfc6515 100644 --- a/linden/indra/newview/skins/default/xui/en-us/notify.xml +++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml @@ -1096,4 +1096,11 @@ Click Accept to join the chat or Decline to decline the invitation. Click Mute t The URL you clicked cannot be opened from this web browser. + + + + Note: To comply with the Second Life Terms of Service, Imprudence did not download any texture files for the exported object(s). + + + -- cgit v1.1 From 022ecc41b0a5de294f0ea2b449113b602a706c85 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 18 Mar 2010 16:41:31 -0500 Subject: Load login page using Imprudence version instead of SL version. (cherry picked from commit 8cd94404e0d20361667aae5d18cad256a733b72c) @nochangelog --- linden/indra/newview/llpanellogin.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp index 1a17b20..75f9653 100644 --- a/linden/indra/newview/llpanellogin.cpp +++ b/linden/indra/newview/llpanellogin.cpp @@ -920,8 +920,9 @@ void LLPanelLogin::loadLoginPage() } // Channel and Version - std::string version = llformat("%d.%d.%d (%d)", - LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD); + std::string version = llformat("%d.%d.%d %s", + IMP_VERSION_MAJOR, IMP_VERSION_MINOR, + IMP_VERSION_PATCH, IMP_VERSION_TEST); char* curl_channel = curl_escape(gSavedSettings.getString("VersionChannelName").c_str(), 0); char* curl_version = curl_escape(version.c_str(), 0); -- cgit v1.1 From 69e3c3ee94f0fdd4558517f5a13979ddf05286a0 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 28 Apr 2010 01:58:08 -0500 Subject: Bumped version to 1.2.2. @nochangelog --- linden/indra/llcommon/llversionviewer.h | 2 +- linden/indra/newview/English.lproj/InfoPlist.strings | 4 ++-- linden/indra/newview/Info-Imprudence.plist | 2 +- linden/indra/newview/res/viewerRes.rc | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h index 8de0a00..41d7ddb 100644 --- a/linden/indra/llcommon/llversionviewer.h +++ b/linden/indra/llcommon/llversionviewer.h @@ -44,7 +44,7 @@ const char * const IMP_VIEWER_NAME = "Imprudence"; const S32 IMP_VERSION_MAJOR = 1; const S32 IMP_VERSION_MINOR = 2; -const S32 IMP_VERSION_PATCH = 1; +const S32 IMP_VERSION_PATCH = 2; const char * const IMP_VERSION_TEST = ""; #endif diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings index 3b90609..33b01f3 100644 --- a/linden/indra/newview/English.lproj/InfoPlist.strings +++ b/linden/indra/newview/English.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Imprudence"; -CFBundleShortVersionString = "Imprudence version 1.2.1"; -CFBundleGetInfoString = "Imprudence version 1.2.1"; +CFBundleShortVersionString = "Imprudence version 1.2.2"; +CFBundleGetInfoString = "Imprudence version 1.2.2"; diff --git a/linden/indra/newview/Info-Imprudence.plist b/linden/indra/newview/Info-Imprudence.plist index affdb57..44d0db4 100644 --- a/linden/indra/newview/Info-Imprudence.plist +++ b/linden/indra/newview/Info-Imprudence.plist @@ -32,7 +32,7 @@ CFBundleVersion - 1.2.1 + 1.2.2 CSResourcesFileMapped diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc index ff3849f..0fc5d8f 100644 --- a/linden/indra/newview/res/viewerRes.rc +++ b/linden/indra/newview/res/viewerRes.rc @@ -249,11 +249,11 @@ BEGIN BEGIN VALUE "CompanyName", "Imprudence Viewer Project" VALUE "FileDescription", "Imprudence" - VALUE "FileVersion", "1.2.1" + VALUE "FileVersion", "1.2.2" VALUE "InternalName", "Imprudence" VALUE "OriginalFilename", "Imprudence.exe" VALUE "ProductName", "Imprudence" - VALUE "ProductVersion", "1.2.1" + VALUE "ProductVersion", "1.2.2" END END BLOCK "VarFileInfo" -- cgit v1.1 From 1fc0936f2eff90370404fa3c03fb64a266ac06bd Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Fri, 4 Dec 2009 11:03:07 +0100 Subject: Trying the new 64bit libs and adding the adjustments needed. (Backported from d057e71bc) @nochangelog --- linden/indra/cmake/LLWindow.cmake | 4 +- linden/indra/develop.py | 2 + linden/indra/newview/linux_tools/wrapper.sh | 50 +++++++++---- linden/indra/newview/llappviewerlinux.cpp | 3 +- linden/indra/newview/viewer_manifest.py | 107 +++++++++++++++++++++++++++- 5 files changed, 147 insertions(+), 19 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/cmake/LLWindow.cmake b/linden/indra/cmake/LLWindow.cmake index c0efa27..babba64 100644 --- a/linden/indra/cmake/LLWindow.cmake +++ b/linden/indra/cmake/LLWindow.cmake @@ -17,7 +17,9 @@ else (STANDALONE) use_prebuilt_binary(mesa) if (LINUX AND VIEWER) set (SDL_FOUND TRUE) - set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux) +#awfixme set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux) +#awfixme set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${ARCH}-linux) + set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/x86_64-linux) set (SDL_LIBRARY SDL) endif (LINUX AND VIEWER) endif (STANDALONE) diff --git a/linden/indra/develop.py b/linden/indra/develop.py index 85837ba..8f4ec3f 100755 --- a/linden/indra/develop.py +++ b/linden/indra/develop.py @@ -224,6 +224,8 @@ class UnixSetup(PlatformSetup): cpu = 'i386' elif cpu.endswith('86'): cpu = 'i686' + elif cpu in ('x86_64'): + cpu = 'x86_64' elif cpu in ('athlon',): cpu = 'i686' elif cpu == 'Power Macintosh': 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 diff --git a/linden/indra/newview/llappviewerlinux.cpp b/linden/indra/newview/llappviewerlinux.cpp index ad90b82..1eadce5 100644 --- a/linden/indra/newview/llappviewerlinux.cpp +++ b/linden/indra/newview/llappviewerlinux.cpp @@ -256,7 +256,8 @@ static inline BOOL do_elfio_glibc_backtrace() size_t btpos; for (btpos = 0; btpos < btsize; ++btpos) { - fprintf(StraceFile, "%d:\t", btpos); + // the format of the StraceFile is very specific, to allow (kludgy) machine-parsing + fprintf(StraceFile, "%-3ld ", (long)btpos); int symidx; for (symidx = 0; symidx < nSymNo; ++symidx) { diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index a914550..2a81c5e 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -769,7 +769,6 @@ class LinuxManifest(ViewerManifest): # 'dst': self.get_dst_prefix(), # 'inst': self.build_path_of(installer_name)}) - class Linux_i686Manifest(LinuxManifest): def construct(self): super(Linux_i686Manifest, self).construct() @@ -892,6 +891,7 @@ class Linux_x86_64Manifest(LinuxManifest): super(Linux_x86_64Manifest, self).construct() self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin") # self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin") + self.path("linux_tools/launch_url.sh","launch_url.sh") if self.prefix("res-sdl"): self.path("*") @@ -899,7 +899,110 @@ class Linux_x86_64Manifest(LinuxManifest): self.end_prefix("res-sdl") self.path("featuretable_linux.txt") - self.path("secondlife-i686.supp") + #self.path("secondlife-x86_64.supp") + + self.path("app_settings/mozilla-runtime-linux-x86_64") + + if self.prefix("../../libraries/x86_64-linux/lib_release_client", dst="lib"): + self.path("libapr-1.so.0") + self.path("libaprutil-1.so.0") + self.path("libdb-4.2.so") + self.path("libcrypto.so.0.9.8") + self.path("libexpat.so.1") + self.path("libssl.so.0.9.8") + self.path("libuuid.so", "libuuid.so.1") + self.path("libSDL-1.2.so.0") + self.path("libELFIO.so") + self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3") + self.path("libxml2.so.2") + self.path("libz.so.1") + + # OpenAL + self.path("libopenal.so.1") + self.path("libalut.so.0") + + # GTK+ and dependencies + self.path("libatk-1.0.so.0") + self.path("libcairo.so.2") + self.path("libfontconfig.so.1") + self.path("libfreetype.so.6") + self.path("libgdk_pixbuf-2.0.so.0") + self.path("libgdk-x11-2.0.so.0") + self.path("libgtk-x11-2.0.so.0") + self.path("libpango-1.0.so.0") + self.path("libpangoft2-1.0.so.0") + self.path("libpangox-1.0.so.0") + self.path("libpangoxft-1.0.so.0") + self.path("libpixman-1.so.0") + + # Gstreamer libs + self.path("libgstbase-0.10.so.0") + self.path("libgstreamer-0.10.so.0") + self.path("libgstaudio-0.10.so.0") + self.path("libgstbase-0.10.so.0") + self.path("libgstcontroller-0.10.so.0") + self.path("libgstdataprotocol-0.10.so.0") + self.path("libgstinterfaces-0.10.so.0") + self.path("libgstnetbuffer-0.10.so.0") + self.path("libgstpbutils-0.10.so.0") + self.path("libgstriff-0.10.so.0") + self.path("libgstrtp-0.10.so.0") + self.path("libgstrtsp-0.10.so.0") + self.path("libgstsdp-0.10.so.0") + self.path("libgsttag-0.10.so.0") + self.path("libgstvideo-0.10.so.0") + + # Gstreamer plugin dependencies + self.path("libogg.so.0") + self.path("libtheora.so.0") + self.path("libvorbis.so.0") + self.path("libvorbisenc.so.2") + self.path("liboil-0.3.so.0") + + # Gstreamer plugins + if self.prefix("gstreamer-plugins"): + self.path("libgstalsa.so") + self.path("libgstasf.so") + self.path("libgstaudioconvert.so") + self.path("libgstaudioresample.so") + self.path("libgstautodetect.so") + self.path("libgstavi.so") + self.path("libgstcoreelements.so") + self.path("libgstcoreindexers.so") + self.path("libgstdecodebin2.so") + self.path("libgstdecodebin.so") + self.path("libgstesd.so") + self.path("libgstffmpeg.so") + self.path("libgstffmpegcolorspace.so") + self.path("libgstgnomevfs.so") + self.path("libgsticydemux.so") + self.path("libgstid3demux.so") + self.path("libgstmpegdemux.so") + self.path("libgstmultifile.so") + self.path("libgstmultipart.so") + self.path("libgstogg.so") + self.path("libgstossaudio.so") + self.path("libgstplaybin.so") + self.path("libgstpulse.so") + self.path("libgstqtdemux.so") + self.path("libgstqueue2.so") + self.path("libgsttcp.so") + self.path("libgsttheora.so") + self.path("libgsttypefindfunctions.so") + self.path("libgstudp.so") + self.path("libgstvideoscale.so") + self.path("libgstvolume.so") + self.path("libgstvorbis.so") + self.path("libgstwavparse.so") + + self.end_prefix("gstreamer-plugins") + self.end_prefix("lib") + + # Vivox runtimes + #if self.prefix(src="vivox-runtime/i686-linux", dst="bin"): + # self.path("SLVoice") + # self.end_prefix() + if __name__ == "__main__": main() -- cgit v1.1 From 2e0d8732cca561f04922ef23be1733d51e32de42 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Fri, 1 Jan 2010 12:59:25 +0100 Subject: Fix just another hardcoded path to Linux-i686. (Backported from 6d50eb4a) @nochangelog --- linden/indra/cmake/00-Common.cmake | 3 +++ linden/indra/newview/llviewermedia.cpp | 16 +++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'linden/indra') diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 9b3f423..8a0f8a9 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake @@ -163,6 +163,9 @@ if (LINUX) # this stops us requiring a really recent glibc at runtime add_definitions(-fno-stack-protector) endif (NOT STANDALONE) + if (${ARCH} STREQUAL "x86_64") + add_definitions( -DLINUX64=1 ) + endif (${ARCH} STREQUAL "x86_64") endif (VIEWER) set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}") diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp index b791786..3de0804 100644 --- a/linden/indra/newview/llviewermedia.cpp +++ b/linden/indra/newview/llviewermedia.cpp @@ -531,7 +531,21 @@ void LLViewerMedia::buildMediaManagerData( LLMediaManagerData* init_data ) #elif LL_LINUX std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); component_dir += gDirUtilp->getDirDelimiter(); - component_dir += "mozilla-runtime-linux-i686"; + + #if LINUX64 + component_dir += "mozilla-runtime-linux-x86_64"; + #else + component_dir += "mozilla-runtime-linux-i686"; + #endif + +#elif LL_SOLARIS + std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); + component_dir += gDirUtilp->getDirDelimiter(); + #ifdef __sparc + component_dir += "mozilla-solaris-sparc"; + #else + component_dir += "mozilla-solaris-i686"; + #endif #else std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); component_dir += gDirUtilp->getDirDelimiter(); -- cgit v1.1 From cb52288af00406eb460d38d48960a5bf228e2126 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Fri, 1 Jan 2010 13:34:42 +0100 Subject: Fix filepicker not working in 64bit build. (Backported from 3e56d26c) @nochangelog --- linden/indra/newview/llfilepicker.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp index ece30dd..dbb218a 100644 --- a/linden/indra/newview/llfilepicker.cpp +++ b/linden/indra/newview/llfilepicker.cpp @@ -917,8 +917,9 @@ void LLFilePicker::add_to_selectedfiles(gpointer data, gpointer user_data) LLFilePicker* picker = (LLFilePicker*) user_data; GError *error = NULL; - gchar* filename_utf8 = g_filename_to_utf8((gchar*)data, - -1, NULL, NULL, &error); +// gchar* filename_utf8 = g_filename_to_utf8((gchar*)data, +// -1, NULL, NULL, &error); + gchar* filename_utf8 = g_filename_display_name ((gchar*) data); if (error) { // This condition should really be notified to the user, e.g., @@ -930,12 +931,10 @@ void LLFilePicker::add_to_selectedfiles(gpointer data, gpointer user_data) // writing is 2.22. *sigh*) LL supplied *makeASCII family are // also unsuitable since they allow control characters... - std::string display_name; - for (const gchar *str = (const gchar *)data; *str; str++) - { - display_name += (char)((*str >= 0x20 && *str <= 0x7E) ? *str : '?'); - } - llwarns << "g_filename_to_utf8 failed on \"" << display_name << "\": " << error->message << llendl; + // muhahaha ... Imprudence can ! + + + llwarns << "g_filename_display_name failed on" << filename_utf8 << ": "<< error->message << llendl; } if (filename_utf8) -- cgit v1.1 From 9ce1031f50b1c4c0f0760a81856d3b1cad2454ce Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Fri, 1 Jan 2010 13:38:07 +0100 Subject: Several changes to the 64bit build. - lib folder becomes lib64, - lib32 folder prepared (for voice libs), - pango removed - gdk_pixbuf removed (Backported from f33e5d0f) @nochangelog --- linden/indra/newview/linux_tools/wrapper.sh | 2 +- linden/indra/newview/viewer_manifest.py | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh index d6db100..30faa92 100755 --- a/linden/indra/newview/linux_tools/wrapper.sh +++ b/linden/indra/newview/linux_tools/wrapper.sh @@ -121,7 +121,7 @@ fi export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib/gstreamer-plugins/" 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}"' + export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib64:"`pwd`"/lib32:"`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 diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 2a81c5e..12b6177 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -903,7 +903,7 @@ class Linux_x86_64Manifest(LinuxManifest): self.path("app_settings/mozilla-runtime-linux-x86_64") - if self.prefix("../../libraries/x86_64-linux/lib_release_client", dst="lib"): + if self.prefix("../../libraries/x86_64-linux/lib_release_client", dst="lib64"): self.path("libapr-1.so.0") self.path("libaprutil-1.so.0") self.path("libdb-4.2.so") @@ -913,7 +913,8 @@ class Linux_x86_64Manifest(LinuxManifest): self.path("libuuid.so", "libuuid.so.1") self.path("libSDL-1.2.so.0") self.path("libELFIO.so") - self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3") + self.path("libjpeg.so.7") + self.path("libopenjpeg.so.2") self.path("libxml2.so.2") self.path("libz.so.1") @@ -926,13 +927,13 @@ class Linux_x86_64Manifest(LinuxManifest): self.path("libcairo.so.2") self.path("libfontconfig.so.1") self.path("libfreetype.so.6") - self.path("libgdk_pixbuf-2.0.so.0") +# self.path("libgdk_pixbuf-2.0.so.0") # use systems gdk pixbufs instead self.path("libgdk-x11-2.0.so.0") self.path("libgtk-x11-2.0.so.0") - self.path("libpango-1.0.so.0") - self.path("libpangoft2-1.0.so.0") - self.path("libpangox-1.0.so.0") - self.path("libpangoxft-1.0.so.0") +# self.path("libpango-1.0.so.0") # use systems pango instead +# self.path("libpangoft2-1.0.so.0") # Both gdk pixbufs and pango would load systems modules +# self.path("libpangox-1.0.so.0") # and crash if not compatible or present. +# self.path("libpangoxft-1.0.so.0") # So we depend system gdk pixbufs and pango anyway. self.path("libpixman-1.so.0") # Gstreamer libs @@ -996,8 +997,15 @@ class Linux_x86_64Manifest(LinuxManifest): self.path("libgstwavparse.so") self.end_prefix("gstreamer-plugins") - self.end_prefix("lib") - + self.end_prefix("lib64") + +# if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"): +# self.path("libalut.so") +# self.path("libidn.so.11") +# self.path("libopenal.so.1") +# self.path("libortp.so") +# self.path("libuuid.so.1") +# self.end_prefix("lib32") # Vivox runtimes #if self.prefix(src="vivox-runtime/i686-linux", dst="bin"): # self.path("SLVoice") -- cgit v1.1 From 1b7f401412af185fb9e61a56c6f13abebb149d94 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Sun, 3 Jan 2010 19:31:05 +0100 Subject: Use ${ARCH} instead of x86_64 in CMake. (Backported from aa251ea5) @nochangelog --- linden/indra/cmake/LLWindow.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/cmake/LLWindow.cmake b/linden/indra/cmake/LLWindow.cmake index babba64..f5c1b4a 100644 --- a/linden/indra/cmake/LLWindow.cmake +++ b/linden/indra/cmake/LLWindow.cmake @@ -17,9 +17,7 @@ else (STANDALONE) use_prebuilt_binary(mesa) if (LINUX AND VIEWER) set (SDL_FOUND TRUE) -#awfixme set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux) -#awfixme set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${ARCH}-linux) - set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/x86_64-linux) + set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${ARCH}-linux) set (SDL_LIBRARY SDL) endif (LINUX AND VIEWER) endif (STANDALONE) -- cgit v1.1 From 7ed6a6eddc0206e77d5457c07492a37410757f0c 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. (Backported from a6255ec5) @nochangelog --- linden/indra/newview/linux_tools/wrapper.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'linden/indra') 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 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 From 4713f60178a4f0d0326e833c7dfbee9ad3189d3c Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Wed, 28 Apr 2010 16:42:46 +0200 Subject: Some tweaks to wrapper.sh to help Linux 64bit. --- linden/indra/newview/linux_tools/wrapper.sh | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh index dbe96ba..7a0c973 100755 --- a/linden/indra/newview/linux_tools/wrapper.sh +++ b/linden/indra/newview/linux_tools/wrapper.sh @@ -119,14 +119,17 @@ if [ -n "$LL_TCMALLOC" ]; then fi fi -if [ "`uname -m`" = "x86_64" ]; then +# 64-bit Linux +if ( [ "`uname -m`" = "x86_64" ] && [ -d ${RUN_PATH}/app_settings/mozilla-runtime-linux-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}"' + +# 32-bit Linux 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' export SL_OPT="`cat gridargs.dat` $@" @@ -138,21 +141,7 @@ if [ -n "$LL_RUN_ERR" ]; then LL_RUN_ERR_MSG="" if [ "$LL_RUN_ERR" = "runerr" ]; then # generic error running the binary - 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: <- + echo '*** Unclean shutdown. ***' + fi fi -- cgit v1.1