Merge commit 'gst-revamp' into mac-1.1.0

Conflicts:
	linden/indra/cmake/GStreamer.cmake
	linden/indra/llmedia/llmediaimplgstreamer.cpp

1 files changed, 4 insertions, 7 deletions

diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 8467dcd..f790e19 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -75,14 +75,11 @@ else (WINDOWS)
 
   else (DARWIN)
 
-    include(FindPkgConfig)
-
-    pkg_check_modules(GSTREAMER REQUIRED gstreamer-0.10)
-    pkg_check_modules(GSTREAMER_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10)
-
-    # We don't need to explicitly link against gstreamer itself, because
-    # LLMediaImplGStreamer probes for the system's copy at runtime.
     set(GSTREAMER_LIBRARIES
+        gstvideo-0.10
+        gstaudio-0.10
+        gstbase-0.10
+        gstreamer-0.10
         gobject-2.0
         gmodule-2.0
         dl