Linux: remove libxml2 dependency.

This might also be possible on other platforms, the newer your gstreamer
is, the easier to get rid of libxml2.

2 files changed, 16 insertions, 9 deletions

diff --git a/linden/indra/cmake/GStreamer010Plugin.cmake b/linden/indra/cmake/GStreamer010Plugin.cmake
index 9d2c553..d05cb9c 100644
--- a/linden/indra/cmake/GStreamer010Plugin.cmake
+++ b/linden/indra/cmake/GStreamer010Plugin.cmake
@@ -21,13 +21,22 @@ else (STANDALONE)
                 ${LIBS_PREBUILT_DIR}/include/libxml2
                 )
   else (WINDOWS)
-    use_prebuilt_binary(glib)                   # gstreamer needs glib
-        use_prebuilt_binary(libxml)
-        set(GSTREAMER010_INCLUDE_DIRS
-                ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
-                ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
-                ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
-                )
+      use_prebuilt_binary(glib)                 # gstreamer needs glib
+      if (DARWIN)
+
+         use_prebuilt_binary(libxml)
+         set(GSTREAMER010_INCLUDE_DIRS
+                ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
+                ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
+                ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
+            )
+       else (DARWIN)
+         add_definitions(-DGST_DISABLE_XML -DGST_DISABLE_LOADSAVE)
+         set(GSTREAMER010_INCLUDE_DIRS
+                ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
+                ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
+            )
+      endif (DARWIN)
   endif (WINDOWS)
 
 endif (STANDALONE)
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 190b48a..9ad43ad 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -933,7 +933,6 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libSDL-1.2.so.0")
             self.path("libELFIO.so")
             self.path("libopenjpeg.so.2")
-            self.path("libxml2.so.2")
             self.path("libz.so")
             self.path("libz.so.1")
 
@@ -1070,7 +1069,6 @@ class Linux_x86_64Manifest(LinuxManifest):
             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") #not needed
 
             # OpenAL