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

(Backported from d057e71bc) @nochangelog

6 files changed, 271 insertions, 31 deletions

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()
diff --git a/linden/install.xml b/linden/install.xml
index ee261b3..df69dbf 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -81,6 +81,13 @@
             <key>url</key>
             <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-linux-i686-gcc-4.1-20080915.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+             <key>md5sum</key>
+             <string>24456b23dd2960cdeb8e021f48c8985c</string>
+             <key>url</key>
+             <uri>http://imprudenceviewer.org/download/libs/SDL-1.2.14-linux64-lenny-20091202.tar.bz2</uri>
+          </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
@@ -120,9 +127,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>1a7e1186855d48d8316ce86803095f70</string>
+            <string>ae13485e8f53e53c2c04c4b57013346c</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.2.8-linux64-20080909a.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/apr_suite-1.2.8-linux64-lenny-20091202.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -300,6 +307,13 @@
             <key>url</key>
             <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/dbusglib-linux-20080707.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>9738472b94191fae2b0fe3fce8df17b0</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/dbusglib-linux64-20091129.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>elfio</key>
@@ -322,6 +336,13 @@
             <key>url</key>
             <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/elfio-1.0.3-linux-i686-gcc-4.1-20080915.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>e829a52ba67e02b011cf2e372914d32f</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/elfio-1.0.3-linux64-20091129.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>expat</key>
@@ -358,9 +379,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>278c61871419b9a4d50a4f88b7922403</string>
+            <string>2d9224d2bb6e75bf71f5ca150e4fcd77</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-linux64-20080909.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/expat-2.0.1-4-linux64-lenny-20091129.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -443,6 +464,13 @@
             <key>url</key>
             <uri>http://imprudenceviewer.org/download/libs/fontconfig-2.7.3-linux-20091104.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>75d0b4a6a69b617e41232bff2910f583</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/fontconfig-2.7.3-linux64-20091202.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>freetype</key>
@@ -469,6 +497,13 @@
             <key>url</key>
             <uri>http://imprudenceviewer.org/download/libs/freetype-2.3.11-linux-20091103.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>0334f47d86b6b80b40749b5b51cc08fe</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/freetype-2.3.11-linux64-20091128.tar.bz2</uri>
+          </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
@@ -547,6 +582,13 @@
             <key>url</key>
             <uri>http://imprudenceviewer.org/download/libs/glib-2.20.5-linux-20091115.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>4a85f3748e3fbd2e6248e80bfa263cd5</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/glib-2.20.5-linux64-20091128.tar.bz2</uri>
+          </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
@@ -569,6 +611,13 @@
             <key>url</key>
             <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google-linux-20080812.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>6a83ddce8673acb5057ed3a14769deee</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/google-linux64-20091203.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>gstreamer</key>
@@ -591,6 +640,13 @@
             <key>url</key>
             <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.24-linux-20091125.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>1dd30764ff45d80f73b4e5b6c4660cd2</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.24-linux64-20091203.tar.bz2</uri>
+          </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
@@ -620,6 +676,13 @@
             <key>url</key>
             <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-linux-20091125.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>8e21045776401973c5034de30258ce8c</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-linux64-20091203.tar.bz2</uri>
+          </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
@@ -650,6 +713,13 @@ cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Re
             <key>url</key>
             <uri>http://imprudenceviewer.org/download/libs/gtk-etc-linux-20091115.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>b21bb7378dec45ff4ef4982c9511b581</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/gtk-etc-linux64-20091128.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>havok</key>
@@ -829,6 +899,13 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
             <key>url</key>
             <uri>http://imprudenceviewer.org/download/libs/liboil-0.3.16-linux-20091125.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>15d8f97d5ec3a27f643708511ca8bee6</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/liboil-0.3.16-linux64-20091130.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>libpng</key>
@@ -902,6 +979,13 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
             <key>url</key>
             <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libuuid-linux-i686-gcc-4.1-20080915.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string></string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/libuuid-linux64-lenny-20091130.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>libxml</key>
@@ -934,9 +1018,9 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>921d7f980519101afb74623e29e9d175</string>
+            <string>92993220ad1a191c629e7f5cee169f77</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libxml-2.6.24-linux64-20080909.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/libxml2-2.7.4-r1-linux64-20091129.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -977,9 +1061,9 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>c2ae53462b56e0999ba386774ab0b789</string>
+            <string>a99b3b8c6a5d0949cae04ac9c6de7042</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llmozlib-linux64-20080909.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/llmozlib-linux64-20091129.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -1103,6 +1187,13 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
             <key>url</key>
             <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-linux-0.2-20080828.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>c5eb5b49d48ee370fc6ed8798e1fc58c</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/ndofdev-linux64-0.2-20091129.tar.bz2</uri>
+          </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
@@ -1139,9 +1230,9 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>964c71e6ee22be1bcaf6d480e74cdd14</string>
+            <string>83c72b57a95e8c42560fb67955169f19</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.2.0-linux64-20080909.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/ogg-vorbis-linux64-20091202.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -1176,6 +1267,13 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
             <key>url</key>
             <uri>http://imprudenceviewer.org/download/libs/openal-linux-20091115.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>ca923ac36d81185279b9cc8f0dcd9461</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/openal-linux64-lenny-20091202.tar.bz2</uri>
+          </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
@@ -1252,6 +1350,13 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
             <key>url</key>
             <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3-linux-20081124b.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>947419e06f0f85fbf4ae089e8e2a6a9d</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/openjpeg-1.3-linux64-20091202.tar.bz2</uri>
+          </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
@@ -1344,6 +1449,13 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
             <key>url</key>
             <uri>http://imprudenceviewer.org/download/libs/theora-linux-20091115.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>b1141b53eb3576cc0c32997bf0fb097c</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/theora-linux64-20091202.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>tut</key>
@@ -1517,9 +1629,9 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>4bddfb2c6dd7b1470a3ed675ac14bd9a</string>
+            <string>d085a173e3c05ff3bb0ee36ba42deb2c</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3-linux64-20080909.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/zlib-1.2.3-linux64-lenny-20091202.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>