Merge branch 'mac-1.1.0' into next

Required substantial portability changes to set_gst_plugin_path().

Conflicts:
	linden/indra/llmedia/llmediaimplgstreamer.cpp

4 files changed, 47 insertions, 82 deletions

diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 7b380a8..c1bbc57 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -62,18 +62,36 @@ else (WINDOWS)
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
       )
 
-  set(GSTREAMER_LIBRARIES
-      gstvideo-0.10
-      gstaudio-0.10
-      gstbase-0.10
-      gstreamer-0.10
-      gobject-2.0
-      gmodule-2.0
-      dl
-      gthread-2.0
-      rt
-      glib-2.0
-      )
+  if (DARWIN)
+
+    set(GSTREAMER_LIBRARIES
+        gstvideo-0.10
+        gstaudio-0.10
+        gstbase-0.10
+        gstreamer-0.10
+        gobject-2.0
+        gmodule-2.0
+        gthread-2.0
+        glib-2.0
+        xml2
+        )
+
+  else (DARWIN)
+
+    set(GSTREAMER_LIBRARIES
+        gstvideo-0.10
+        gstaudio-0.10
+        gstbase-0.10
+        gstreamer-0.10
+        gobject-2.0
+        gmodule-2.0
+        dl
+        gthread-2.0
+        rt
+        glib-2.0
+        )
+
+  endif (DARWIN)
 
 endif (WINDOWS)
 
diff --git a/linden/indra/cmake/LLMedia.cmake b/linden/indra/cmake/LLMedia.cmake
index b7bf11c..8a36a69 100644
--- a/linden/indra/cmake/LLMedia.cmake
+++ b/linden/indra/cmake/LLMedia.cmake
@@ -1,7 +1,6 @@
 # -*- cmake -*-
 
 include(GStreamer)
-include(QuickTime)
 
 set(LLMEDIA_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llmedia
@@ -11,5 +10,4 @@ set(LLMEDIA_LIBRARIES
     llmedia
     ${GSTREAMER_LIBRARIES}
     ${GSTREAMER_PLUGINS_BASE_LIBRARIES}
-    ${QUICKTIME_LIBRARY}
     )
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index 5e71f66..f06a38e 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -10,16 +10,18 @@ if (OPENAL)
   # OPENAL_LIB
 
   if (WINDOWS)
-  find_library(OPENAL_LIB
-    NAMES openal openal32 OpenAL OpenAL32 wrap_oal
-    PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
-    )
-
+    find_library(OPENAL_LIB
+      NAMES openal32
+      PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
+      )
+  elseif (DARWIN)
+    # Look for for system's OpenAL.framework
+    find_library(OPENAL_LIB
+      NAMES OpenAL openal
+      PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
+      )
   else (WINDOWS)
-  find_library(OPENAL_LIB
-    NAMES openal openal32 OpenAL OpenAL32 wrap_oal
-    PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
-    )
+    set(OPENAL_LIB openal)
   endif (WINDOWS)
   
   if (NOT OPENAL_LIB)
@@ -34,7 +36,7 @@ if (OPENAL)
 
   find_path(OPENAL_INCLUDE_DIR
     NAMES al.h
-    PATHS ${LIBS_PREBUILT_DIR}/include/AL /usr/include/AL
+    PATHS ${LIBS_PREBUILT_DIR}/include/AL
     )
 
   if (NOT OPENAL_INCLUDE_DIR)
@@ -49,15 +51,11 @@ if (OPENAL)
 
   if (WINDOWS)
    find_library(ALUT_LIB
-   NAMES alut freealut
-   PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
-   )
-  
+     NAMES alut freealut
+     PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
+     )
   else (WINDOWS) 
-  find_library(ALUT_LIB
-    NAMES alut freealut
-    PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
-    )
+    set(ALUT_LIB alut)
   endif (WINDOWS)
 
   if (NOT ALUT_LIB)
@@ -72,7 +70,7 @@ if (OPENAL)
 
   find_path(ALUT_INCLUDE_DIR
     NAMES alut.h
-    PATHS ${LIBS_PREBUILT_DIR}/include/AL /usr/include/AL
+    PATHS ${LIBS_PREBUILT_DIR}/include/AL
     )
 
   if (NOT ALUT_INCLUDE_DIR)
diff --git a/linden/indra/cmake/QuickTime.cmake b/linden/indra/cmake/QuickTime.cmake
deleted file mode 100644
index 4352709..0000000
--- a/linden/indra/cmake/QuickTime.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- cmake -*-
-
-if(INSTALL_PROPRIETARY)
-  include(Prebuilt)
-  use_prebuilt_binary(quicktime)
-endif(INSTALL_PROPRIETARY)
-
-if (DARWIN)
-  include(CMakeFindFrameworks)
-  find_library(QUICKTIME_LIBRARY QuickTime)
-elseif (WINDOWS)
-  set(QUICKTIME_SDK_DIR "$ENV{PROGRAMFILES}/QuickTime SDK"
-      CACHE PATH "Location of the QuickTime SDK.")
-
-  find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient
-               PATHS
-               ${ARCH_PREBUILT_DIRS_DEBUG}
-               "${QUICKTIME_SDK_DIR}\\libraries"
-               )
-
-  find_library(RELEASE_QUICKTIME_LIBRARY qtmlclient
-               PATHS
-               ${ARCH_PREBUILT_DIRS_RELEASE}
-               "${QUICKTIME_SDK_DIR}\\libraries"
-               )
-
-  if (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
-    set(QUICKTIME_LIBRARY 
-        optimized ${RELEASE_QUICKTIME_LIBRARY}
-        debug ${DEBUG_QUICKTIME_LIBRARY}
-        )
-        
-  endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
-  
-  include_directories(
-    ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/quicktime
-    "${QUICKTIME_SDK_DIR}\\CIncludes"
-    )
-endif (DARWIN)
-
-mark_as_advanced(QUICKTIME_LIBRARY)
-
-if (QUICKTIME_LIBRARY)
-  set(QUICKTIME ON CACHE BOOL "Build with QuickTime streaming media support.")
-endif (QUICKTIME_LIBRARY)
-
-if (QUICKTIME)
-  add_definitions(-DLL_QUICKTIME_ENABLED=1)
-endif (QUICKTIME)