From 015597bb5878fe3c2932fe96fdf2e6dbeee5519d Mon Sep 17 00:00:00 2001
From: Ima Mechanique <ima.mechanique@secondlife.com>
Date: Sat, 12 Oct 2013 03:07:22 +0100
Subject: STORM-1831 Importing Oz's updates for libxml2

---
 autobuild.xml                        | 20 ++++++++++----------
 indra/cmake/GStreamer010Plugin.cmake |  2 +-
 indra/cmake/LLPrimitive.cmake        | 11 ++++++++++-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index b1478a46b2..17d63caf64 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1251,24 +1251,24 @@
           </map>
         </map>
       </map>
-      <key>libxml</key>
+      <key>libxml2</key>
       <map>
         <key>license</key>
         <string>mit</string>
         <key>license_file</key>
-        <string>LICENSES/libxml.txt</string>
+        <string>LICENSES/libxml2.txt</string>
         <key>name</key>
-        <string>libxml</string>
+        <string>libxml2</string>
         <key>platforms</key>
         <map>
           <key>linux</key>
           <map>
             <key>archive</key>
             <map>
-              <key>hash</key>
-              <string>6414642528f42dac1cd9a012c99cd748</string>
-              <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libxml-2.6.24-linux-20101013.tar.bz2</string>
+            <key>hash</key>
+            <string>fd34e3e818ad7dd26add1f05e6069c11</string>
+            <key>url</key>
+            <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libxml/rev/282218/arch/Linux/installer/libxml2-2.7.8-linux-20131009.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
@@ -2321,7 +2321,7 @@
                 <string>make</string>
                 <key>options</key>
                 <array>
-                  <string>-j 2</string>
+                  <string>-j 7</string>
                 </array>
               </map>
               <key>configure</key>
@@ -2371,7 +2371,7 @@
                 <string>make</string>
                 <key>options</key>
                 <array>
-                  <string>-j 2</string>
+                  <string>-j 7</string>
                 </array>
               </map>
               <key>configure</key>
@@ -2419,7 +2419,7 @@
                 <string>make</string>
                 <key>options</key>
                 <array>
-                  <string>-j 2</string>
+                  <string>-j 7</string>
                 </array>
               </map>
               <key>configure</key>
diff --git a/indra/cmake/GStreamer010Plugin.cmake b/indra/cmake/GStreamer010Plugin.cmake
index d2d0699bcd..8918ee0c90 100755
--- a/indra/cmake/GStreamer010Plugin.cmake
+++ b/indra/cmake/GStreamer010Plugin.cmake
@@ -9,7 +9,7 @@ if (STANDALONE)
 elseif (LINUX)
   use_prebuilt_binary(gstreamer)
   # possible libxml should have its own .cmake file instead
-  use_prebuilt_binary(libxml)
+  use_prebuilt_binary(libxml2)
   set(GSTREAMER010_FOUND ON FORCE BOOL)
   set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL)
   set(GSTREAMER010_INCLUDE_DIRS
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index 0d87ff579a..a9a8257f80 100755
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -6,7 +6,6 @@ include(Boost)
 
 use_prebuilt_binary(colladadom)
 use_prebuilt_binary(pcre)
-use_prebuilt_binary(libxml)
 
 set(LLPRIMITIVE_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llprimitive
@@ -19,6 +18,16 @@ if (WINDOWS)
         optimized libcollada14dom22
         ${BOOST_SYSTEM_LIBRARIES}
         )
+elseif (LINUX)
+    use_prebuilt_binary(libxml2)
+    set(LLPRIMITIVE_LIBRARIES
+        llprimitive
+        collada14dom
+        minizip
+        xml2
+        pcrecpp
+        pcre
+        )
 else (WINDOWS)
     set(LLPRIMITIVE_LIBRARIES 
         llprimitive
-- 
cgit v1.2.3