Starting linux64 support

LICENSES/fontconfig.txt

@@ -1,23 +0,0 @@
-http://www.jclark.com/xml/copying.txt
-
-Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

indra/cmake/CARes.cmake

@@ -19,5 +19,5 @@ else (STANDALONE)
     else (WINDOWS)
         set(CARES_LIBRARIES cares)
     endif (WINDOWS)
-    set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/ares)
+    set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/ares ${LIBS_PREBUILT_DIR}/include/ares )
 endif (STANDALONE)

indra/cmake/GooglePerfTools.cmake

@@ -1,10 +1,14 @@
 # -*- cmake -*-
 include(Prebuilt)
 
+if(WORD_SIZE EQUAL 64)
+  set(DISABLE_TCMALLOC TRUE)
+endif()
+
 if (STANDALONE)
   include(FindGooglePerfTools)
 else (STANDALONE)
-  if (LINUX OR WINDOWS)
+  if (LINUX OR WINDOWS AND NOT WORD_SIZE EQUAL 64)
     use_prebuilt_binary(google)
   endif (LINUX OR WINDOWS)
   if (WINDOWS)
@@ -30,10 +34,6 @@ else ()
   set(USE_GOOGLE_PERFTOOLS OFF)
 endif ()
 
-# XXX Disable temporarily, until we have compilation issues on 64-bit
-# Etch sorted.
-#set(USE_GOOGLE_PERFTOOLS OFF)
-
 if (USE_GOOGLE_PERFTOOLS)
   set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1)
   include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR})

indra/cmake/WebKitLibPlugin.cmake

@@ -71,7 +71,6 @@ elseif (LINUX)
         ssl
 #       qgif
 #       qjpeg
-        jscore
         jpeg
         fontconfig
         X11
@@ -79,5 +78,8 @@ elseif (LINUX)
         Xext
         GL
         )
+      if (WORD_SIZE EQUAL 32)
+        set(WEBKIT_PLUGIN_LIBRARIES ${WEBKIT_PLUGIN_LIBRARIES} jscore)
+      endif (WORD_SIZE EQUAL 32)
      endif (STANDALONE)
 endif (WINDOWS)

indra/linux_crash_logger/CMakeLists.txt

@@ -47,18 +47,11 @@ target_link_libraries(linux-crash-logger
     ${LLVFS_LIBRARIES}
     ${LLXML_LIBRARIES}
     ${LLMESSAGE_LIBRARIES}
-    ${LLUI_LIBRARIES}
     ${LLVFS_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${LLCOMMON_LIBRARIES}
     ${UI_LIBRARIES}
     ${DB_LIBRARIES}
-    ${XMLRPCEPI_LIBRARIES}
-    ${CURL_LIBRARIES}
-    ${APR_LIBRARIES}
-    ${APRUTIL_LIBRARIES}
-    ${CRYPTO_LIBRARIES}
-    rt
     )
 
 add_custom_command(

install.xml

@@ -20,6 +20,13 @@
             <key>url</key>
             <uri>https://github.com/downloads/siana/SingularityViewer/glext-68-win32-linux.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>2fc9a86782ec8dcc719ddc78026e7ba2</string>
+            <key>url</key>
+            <uri>https://github.com/downloads/siana/SingularityViewer/glext-68-win32-linux.tar.bz2</uri>
+          </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
@@ -68,9 +75,16 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>7952d45a61dc01faf1d9fd67023d96bd</string>
+            <string>208ba0aa102b207267bb522fb0554be6</string>
             <key>url</key>
-            <uri>https://github.com/downloads/siana/SingularityViewer/SDL-1.2.12-linux-20081222d.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/libs/SDL-1.2.14-Linux-i686-20110904.tar.bz2</uri>
+          </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>b0f92b832e4ae5aee351801d644629e7</string>
+            <key>url</key>
+            <uri>http://download.kokuaviewer.org/files/libs/SDL-1.2.14-Linux-x86_64-20110410.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -104,9 +118,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>1a7e1186855d48d8316ce86803095f70</string>
+            <string>5ee61e2cffc9b6f2a1bc5027cd51529e</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://download.kokuaviewer.org/files/libs/apr_suite-1.3.9-linux64-20091204.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -144,9 +158,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>f7cbf2b6e74de4556148663b93ead4d3</string>
+            <string>c7ec29e8dfe856d74a15b66d557c3010</string>
             <key>url</key>
-            <uri>https://github.com/downloads/Shyotl/SingularityViewer/ares-1.3.0-linux64-20080909.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/libs/ares-1.7.1-linux64-20101115.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -202,13 +216,20 @@
             <key>url</key>
             <uri>https://github.com/downloads/siana/SingularityViewer/boost-1.45.0-darwin-20110604.tar.bz2</uri>
           </map>
-           <key>linux</key>
+          <key>linux</key>
           <map>
             <key>md5sum</key>
             <string>a2d2fff5cc5555ffd9865daedfcd0dd5</string>
             <key>url</key>
             <uri>https://github.com/downloads/siana/SingularityViewer/boost-1.45.0-linux-20110604.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>2c5da5b6f793292e5907f2e81d116fb0</string>
+            <key>url</key>
+            <uri>https://bitbucket.org/Siana/singularityviewer/downloads/boost-1.45.0-linux64-20120224.tar.bz2</uri>
+          </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
@@ -378,6 +399,13 @@
             <key>url</key>
             <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/fontconfig-2.2.3-linux-20080613.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>d7242641aa40019af06214b1d2a10bec</string>
+            <key>url</key>
+            <uri>http://download.kokuaviewer.org/files/test-builds/fontconfig-2.7.3-Linux-x86_64-20110805.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>freeglut</key>
@@ -596,6 +624,13 @@
             <key>url</key>
             <uri>http://imprudenceviewer.org/download/libs/gtk-etc-linux-20101106.1.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>e8cb3f28379b7730004da44f04263936</string>
+            <key>url</key>
+            <uri>http://download.kokuaviewer.org/files/libs/gtk-etc-linux64-20091231.tar.bz2</uri>
+          </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
@@ -887,6 +922,13 @@ anguage Infrstructure (CLI) international standard</string>
             <key>url</key>
             <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libuuid-linux-20090417.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>3f2a0b553a2a72d3b9a39f528f057b18</string>
+            <key>url</key>
+            <uri>http://download.kokuaviewer.org/files/libs/libuuid-linux64-lenny-20091130.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>libxml</key>
@@ -931,6 +973,13 @@ anguage Infrstructure (CLI) international standard</string>
             <key>url</key>
             <uri>https://github.com/downloads/siana/SingularityViewer/llqtwebkit-4.7.1-linux-20111013.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>480eb86fe018eac9925905a877cabdff</string>
+            <key>url</key>
+            <uri>http://download.kokuaviewer.org/files/libs/llqtwebkit-linux64-20110214.tar.bz2</uri>
+          </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
@@ -1146,6 +1195,13 @@ anguage Infrstructure (CLI) international standard</string>
             <key>url</key>
             <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/linux-pulse-headers-0.9.14.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>30cb00069fe2a545fbf7be1070386236</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/linux-pulse-headers-0.9.14.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>tut</key>