Some changes to help linux64.

* Don't build with libELFIO (lib not working).

* Use shared libpng12 instead of static library
  (fixes mozlib incompat for users with system libpng14).

5 files changed, 49 insertions, 18 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 46065ce..de0266f 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,16 @@
+2010-02-27  Armin Weatherwax  <Armin.Weatherwax@gmail.com>
+
+        * Some changes to help linux64.
+          Don't build with libELFIO (lib not working).
+          Use shared libpng12 instead of static library
+          (fixes mozlib incompat for users with system libpng14).
+
+          modified:   linden/indra/cmake/00-Common.cmake
+          modified:   linden/indra/cmake/ELFIO.cmake
+          modified:   linden/indra/newview/viewer_manifest.py
+          modified:   linden/install.xml
+
+
 2010-02-26  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * Disabled spammy messages about WebFetchInventoryDescendents.
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 355ce45..fdfd587 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -212,15 +212,28 @@ if (STANDALONE)
     add_definitions(-march=pentiumpro)
   endif (LINUX AND ${ARCH} STREQUAL "i686")
 
-else (STANDALONE)
-  set(${ARCH}_linux_INCLUDES
-      ELFIO
-      atk-1.0
-      glib-2.0
-      gstreamer-0.10
-      gtk-2.0
-      pango-1.0
-      )
+else (STANDALONE)    
+  if (${ARCH} STREQUAL "i686")
+    set(${ARCH}_linux_INCLUDES
+        ELFIO
+        atk-1.0
+        glib-2.0
+        gstreamer-0.10
+        gtk-2.0
+        pango-1.0
+        )
+   else(${ARCH} STREQUAL "i686")
+     if (${ARCH} STREQUAL "x86_64")
+       set(${ARCH}_linux_INCLUDES
+          atk-1.0
+          glib-2.0
+          gstreamer-0.10
+          gtk-2.0
+          pango-1.0
+          )
+     endif (${ARCH} STREQUAL "x86_64")
+   endif (${ARCH} STREQUAL "i686")
+
 endif (STANDALONE)
 
 if(SERVER)
diff --git a/linden/indra/cmake/ELFIO.cmake b/linden/indra/cmake/ELFIO.cmake
index e51993b..4f19ecd 100644
--- a/linden/indra/cmake/ELFIO.cmake
+++ b/linden/indra/cmake/ELFIO.cmake
@@ -6,10 +6,14 @@ set(ELFIO_FIND_QUIETLY ON)
 if (STANDALONE)
   include(FindELFIO)
 elseif (LINUX)
-  use_prebuilt_binary(elfio)
-  set(ELFIO_LIBRARIES ELFIO)
-  set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
-  set(ELFIO_FOUND "YES")
+     if (${ARCH} STREQUAL "x86_64")
+        set(ELFIO_FOUND "NO")
+     else (${ARCH} STREQUAL "x86_64")
+        use_prebuilt_binary(elfio)
+        set(ELFIO_LIBRARIES ELFIO)
+        set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
+        set(ELFIO_FOUND "YES")
+     endif (${ARCH} STREQUAL "x86_64")
 endif (STANDALONE)
 
 if (ELFIO_FOUND)
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index b32d31c..84ecc74 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1008,8 +1008,9 @@ class Linux_x86_64Manifest(LinuxManifest):
             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("libELFIO.so")
             self.path("libjpeg.so.7")
+            self.path("libpng12.so.0")
             self.path("libopenjpeg.so.2")
             self.path("libxml2.so.2")
             self.path("libz.so.1")
diff --git a/linden/install.xml b/linden/install.xml
index 50cc8a7..c5b8954 100644..100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -30,9 +30,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>9c3dff3817f1105f9054401fdef1fe50</string>
+            <string>fb08eb25cb5a58765e2a33e70e62336d</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-linux64-20080909.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/GL-linux64-20100203.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -910,9 +910,9 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>5ee1e62bde38520c7f134c4afb9ac9b1</string>
+            <string>4485dc95183c9441042cabebfa72fbea</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-linux64-20090304.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/libpng-1.2.41-linux64-20100227.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>