3 files changed, 16 insertions, 22 deletions

diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 8bfad11..51e1550 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -1,18 +1,19 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-  # possible libxml should have its own .cmake file instead
+  # Maybe libxml and glib should have their own .cmake files
   use_prebuilt_binary(libxml)
+  use_prebuilt_binary(glib)
+
   set(GSTREAMER_FOUND ON FORCE BOOL)
   set(GSTREAMER_PLUGINS_BASE_FOUND ON FORCE BOOL)
+
   use_prebuilt_binary(gstreamer)
+  use_prebuilt_binary(gstreamer-plugins)
 
 if (WINDOWS)
 
-  use_prebuilt_binary(libxml)
   use_prebuilt_binary(iconv)
-  use_prebuilt_binary(glib)
-  use_prebuilt_binary(gstreamer-plugins)
   set(GSTREAMER_FOUND ON FORCE BOOL)
   set(GSTREAMER_INCLUDE_DIRS
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib
@@ -63,7 +64,7 @@ else (WINDOWS)
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
       )
 
-  if (DARWIN)
+  if (DARWIN) # Mac
 
     find_library( XML2_LIB
       NAMES xml2.2
@@ -89,7 +90,9 @@ else (WINDOWS)
         ${XML2_LIB}
         )
 
-  else (DARWIN)
+  else (DARWIN) # Linux
+
+    use_prebuilt_binary(theora)
 
     set(GSTREAMER_LIBRARIES
         gstvideo-0.10
diff --git a/linden/indra/cmake/UI.cmake b/linden/indra/cmake/UI.cmake
index f529f5b..b70a531 100644
--- a/linden/indra/cmake/UI.cmake
+++ b/linden/indra/cmake/UI.cmake
@@ -31,13 +31,13 @@ if (STANDALONE)
     add_definitions(${${pkg}_CFLAGS_OTHERS})
   endforeach(pkg)
 else (STANDALONE)
-  use_prebuilt_binary(gtk-atk-pango-glib)
+  use_prebuilt_binary(gtk-etc)
   if (LINUX)
     set(UI_LIBRARIES
         atk-1.0
+        cairo
         gdk-x11-2.0
         gdk_pixbuf-2.0
-        Xinerama
         glib-2.0
         gmodule-2.0
         gobject-2.0
@@ -47,11 +47,14 @@ else (STANDALONE)
         pangoft2-1.0
         pangox-1.0
         pangoxft-1.0
+        pixman-1
         )
   endif (LINUX)
 
   include_directories (
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/cairo
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/pixman-1
       ${LIBS_PREBUILT_DIR}/include
       )
   foreach(include ${${LL_ARCH}_INCLUDES})
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 6ae5b80..b4a0b6c 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -798,14 +798,11 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libELFIO.so")
             self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
 
-            self.path("libopenal.so") # symlink
             self.path("libopenal.so.1")
-            self.path("libalut.so")
+            self.path("libalut.so.0")
 
             # Gstreamer libs
-            self.path("libgstbase-0.10.so") # symlink
             self.path("libgstbase-0.10.so.0")
-            self.path("libgstreamer-0.10.so") # symlink
             self.path("libgstreamer-0.10.so.0")
             self.path("libgstaudio-0.10.so.0")
             self.path("libgstbase-0.10.so.0")
@@ -822,18 +819,10 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libgstvideo-0.10.so.0")
 
             # Gstreamer plugin dependencies
-            self.path("libavcodec.so.52")
-            self.path("libavformat.so.52")
-            self.path("libavutil.so.49")
-            self.path("libxvidcore.so.4")
-            self.path("libfaac.so.0")
-            self.path("libfaad.so.1")
-            self.path("libmp3lame.so.0")
             self.path("libogg.so.0")
+            self.path("libtheora.so.0")
             self.path("libvorbis.so.0")
             self.path("libvorbisenc.so.2")
-            self.path("libxml2.so.2")
-            self.path("libxvidcore.so.4")
 
             # Gstreamer plugins
             if self.prefix("gstreamer-plugins"):
@@ -848,7 +837,6 @@ class Linux_i686Manifest(LinuxManifest):
                 self.path("libgstdecodebin2.so")
                 self.path("libgstdecodebin.so")
                 self.path("libgstesd.so")
-                self.path("libgstffmpegcolorspace.so")
                 self.path("libgstffmpeg.so")
                 self.path("libgstgnomevfs.so")
                 self.path("libgsticydemux.so")