10 files changed, 167 insertions, 104 deletions

diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 7b380a8..f790e19 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -62,18 +62,33 @@ 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
+        xml2
+        glib-2.0
+        gobject-2.0
+        gmodule-2.0
+        gthread-2.0
+        gstreamer-0.10
+        )
+
+  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..11dcdc7 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -10,16 +10,12 @@ 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
+      )
   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 +30,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 +45,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 +64,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)
diff --git a/linden/indra/llaudio/CMakeLists.txt b/linden/indra/llaudio/CMakeLists.txt
index aa15a9d..8a26e54 100644
--- a/linden/indra/llaudio/CMakeLists.txt
+++ b/linden/indra/llaudio/CMakeLists.txt
@@ -4,6 +4,7 @@ project(llaudio)
 
 include(00-Common)
 include(Audio)
+include(OPENAL)
 include(FMOD)
 include(LLCommon)
 include(LLMath)
diff --git a/linden/indra/llaudio/audioengine_openal.cpp b/linden/indra/llaudio/audioengine_openal.cpp
index 8f836a6..6d9a242 100644
--- a/linden/indra/llaudio/audioengine_openal.cpp
+++ b/linden/indra/llaudio/audioengine_openal.cpp
@@ -172,6 +172,17 @@ LLAudioChannelOpenAL::LLAudioChannelOpenAL()
         mLastSamplePos(0)
 {
         alGenSources(1, &mALSource);
+
+        if( mALSource == AL_NONE )
+        {
+                ALenum error = alGetError();
+                if( error == AL_NO_ERROR )
+                {
+                        LL_WARNS("OpenAL") << "LLAudioChannelOpenAL::LLAudioChannelOpenAL() Could not generate mALSource, but no error is indicated!" << LL_ENDL;
+                }
+                LL_WARNS("OpenAL") << "LLAudioChannelOpenAL::LLAudioChannelOpenAL() Could not generate mALSource: (" << error << ") " << alGetString( error ) << LL_ENDL;
+        }
+
 }
 
 LLAudioChannelOpenAL::~LLAudioChannelOpenAL()
diff --git a/linden/indra/llmedia/CMakeLists.txt b/linden/indra/llmedia/CMakeLists.txt
index 0440153..cd4167a 100644
--- a/linden/indra/llmedia/CMakeLists.txt
+++ b/linden/indra/llmedia/CMakeLists.txt
@@ -63,19 +63,6 @@ if (MOZLIB)
   list(APPEND llmedia_HEADER_FILES llmediaimplllmozlib.h)
 endif (MOZLIB)
 
-if (QUICKTIME)
-  list(APPEND llmedia_SOURCE_FILES llmediaimplquicktime.cpp)
-  list(APPEND llmedia_HEADER_FILES llmediaimplquicktime.h)
-
-  # We use a bunch of deprecated system APIs.
-  if (DARWIN)
-    set_source_files_properties(
-        llmediaimplquicktime.cpp PROPERTIES
-        COMPILE_FLAGS -Wno-deprecated-declarations
-        )
-  endif (DARWIN)
-endif (QUICKTIME)
-
 set_source_files_properties(${llmedia_HEADER_FILES}
                             PROPERTIES HEADER_FILE_ONLY TRUE)
 
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 1e48d28..f971f97 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -849,7 +849,7 @@ if (DARWIN)
 
   # Add resource files to the project.
   set(viewer_RESOURCE_FILES
-    secondlife.icns
+    viewer.icns
     macview.r
     gpu_table.txt
     Info-Imprudence.plist
@@ -1393,7 +1393,6 @@ target_link_libraries(imprudence-bin
     ${SMARTHEAP_LIBRARY}
     ${UI_LIBRARIES}
     ${NDOF_LIBRARY}
-    ${QUICKTIME_LIBRARY}
     ${WINDOWS_LIBRARIES}
     ${XMLRPCEPI_LIBRARIES}
     ${ZLIB_LIBRARIES}
@@ -1447,7 +1446,7 @@ if (DARWIN)
     PROPERTIES
     OUTPUT_NAME "${product}"
     MACOSX_BUNDLE_INFO_STRING "info string - localize me"
-    MACOSX_BUNDLE_ICON_FILE "secondlife.icns"
+    MACOSX_BUNDLE_ICON_FILE "viewer.icns"
     MACOSX_BUNDLE_GUI_IDENTIFIER "Imprudence"
     MACOSX_BUNDLE_LONG_VERSION_STRING "ververver"
     MACOSX_BUNDLE_BUNDLE_NAME "Imprudence"
diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-Imprudence.plist
index 32bba70..357d171 100644
--- a/linden/indra/newview/Info-SecondLife.plist
+++ b/linden/indra/newview/Info-Imprudence.plist
@@ -7,7 +7,7 @@
         <key>CFBundleExecutable</key>

         <string>Imprudence</string>

         <key>CFBundleIconFile</key>

-        <string>secondlife.icns</string>

+        <string>viewer.icns</string>

         <key>CFBundleIdentifier</key>

         <string>com.secondlife.indra.viewer</string>

         <key>CFBundleInfoDictionaryVersion</key>

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 3583726..637f07a 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -403,10 +403,57 @@ class DarwinManifest(ViewerManifest):
             #  <bundle>/Contents/MacOS/
             self.contents_of_tar(self.args['source']+'/mozilla-universal-darwin.tgz', 'MacOS')
 
-            self.path("Info-SecondLife.plist", dst="Info.plist")
+            self.path("Info-Imprudence.plist", dst="Info.plist")
 
             # copy additional libs in <bundle>/Contents/MacOS/
-            self.path("../../libraries/universal-darwin/lib_release/libndofdev.dylib", dst="MacOS/libndofdev.dylib")
+            if self.prefix(src="../../libraries/universal-darwin/lib_release", dst="MacOS/"):
+
+                self.path("libndofdev.dylib")
+                
+                self.path("libopenal.1.dylib")
+                self.path("libalut.0.dylib")
+
+                self.path("libglib-2.0.0.dylib")
+                self.path("libgmodule-2.0.0.dylib")
+                self.path("libgobject-2.0.0.dylib")
+                self.path("libgthread-2.0.0.dylib")
+
+                # Symlinks to satisfy different name dependencies.
+                self.path("libglib-2.0.dylib")
+                self.path("libgmodule-2.0.dylib")
+                self.path("libgobject-2.0.dylib")
+                self.path("libgthread-2.0.dylib")
+                
+                self.path("libgstreamer-0.10.dylib")
+                self.path("libgstapp-0.10.dylib")
+                self.path("libgstaudio-0.10.dylib")
+                self.path("libgstbase-0.10.dylib")
+                self.path("libgstcdda-0.10.dylib")
+                self.path("libgstcontroller-0.10.dylib")
+                self.path("libgstdataprotocol-0.10.dylib")
+                self.path("libgstfft-0.10.dylib")
+                self.path("libgstinterfaces-0.10.dylib")
+                self.path("libgstnet-0.10.dylib")
+                self.path("libgstnetbuffer-0.10.dylib")
+                self.path("libgstpbutils-0.10.dylib")
+                self.path("libgstriff-0.10.dylib")
+                self.path("libgstrtp-0.10.dylib")
+                self.path("libgstrtsp-0.10.dylib")
+                self.path("libgstsdp-0.10.dylib")
+                self.path("libgsttag-0.10.dylib")
+                self.path("libgstvideo-0.10.dylib")
+
+                self.path("libintl.3.dylib")
+                self.path("libjpeg.62.dylib")
+                self.path("libogg.0.dylib")
+                self.path("liboil-0.3.0.dylib")
+                self.path("libpango-1.0.0.dylib")
+                self.path("libpangoft2-1.0.0.dylib")
+                self.path("libtheora.0.dylib")
+                self.path("libvorbis.0.dylib")
+                self.path("libvorbisenc.2.dylib")
+
+                self.end_prefix("../../libraries/universal-darwin/lib_release")
 
             # replace the default theme with our custom theme (so scrollbars work).
             if self.prefix(src="mozilla-theme", dst="MacOS/chrome"):
@@ -432,7 +479,7 @@ class DarwinManifest(ViewerManifest):
                 self.path("featuretable_mac.txt")
                 self.path("SecondLife.nib")
 
-                self.path("secondlife.icns")
+                self.path("viewer.icns")
                 
                 # Translations
                 self.path("English.lproj")
@@ -441,9 +488,71 @@ class DarwinManifest(ViewerManifest):
                 self.path("Korean.lproj")
 
 
+                if self.prefix(src="../../libraries/universal-darwin/lib_release/gstreamer-plugins", dst="lib/gstreamer-plugins"):
+                    self.path("libgstaacparse.so")
+                    self.path("libgstadder.so")
+                    self.path("libgstaiffparse.so")
+                    self.path("libgstamrparse.so")
+                    self.path("libgstapp.so")
+                    self.path("libgstaudioconvert.so")
+                    self.path("libgstaudiorate.so")
+                    self.path("libgstaudioresample.so")
+                    self.path("libgstautodetect.so")
+                    self.path("libgstavi.so")
+                    self.path("libgstcoreelements.so")
+                    self.path("libgstcoreindexers.so")
+                    self.path("libgstdebug.so")
+                    self.path("libgstdecodebin2.so")
+                    self.path("libgstdeinterlace2.so")
+                    self.path("libgstequalizer.so")
+                    self.path("libgstffmpeg.so")
+                    self.path("libgstffmpegcolorspace.so")
+                    self.path("libgstffmpegscale.so")
+                    self.path("libgstflac.so")
+                    self.path("libgstflv.so")
+                    self.path("libgstgdp.so")
+                    self.path("libgsth264parse.so")
+                    self.path("libgsticydemux.so")
+                    self.path("libgstid3demux.so")
+                    self.path("libgstinterleave.so")
+                    self.path("libgstjpeg.so")
+                    self.path("libgstlevel.so")
+                    self.path("libgstmetadata.so")
+                    self.path("libgstmpeg4videoparse.so")
+                    self.path("libgstmpegdemux.so")
+                    self.path("libgstmpegvideoparse.so")
+                    self.path("libgstmultipart.so")
+                    self.path("libgstneonhttpsrc.so")
+                    self.path("libgstogg.so")
+                    self.path("libgstosxaudio.so")
+                    self.path("libgstosxvideosink.so")
+                    self.path("libgstpango.so")
+                    self.path("libgstplaybin.so")
+                    self.path("libgstpng.so")
+                    self.path("libgstpostproc.so")
+                    self.path("libgstqtdemux.so")
+                    self.path("libgstqueue2.so")
+                    self.path("libgstreal.so")
+                    self.path("libgstrtp.so")
+                    self.path("libgstrtpmanager.so")
+                    self.path("libgstrtsp.so")
+                    self.path("libgstsdpelem.so")
+                    self.path("libgstselector.so")
+                    self.path("libgsttcp.so")
+                    self.path("libgsttheora.so")
+                    self.path("libgsttypefindfunctions.so")
+                    self.path("libgstudp.so")
+                    self.path("libgstvideoscale.so")
+                    self.path("libgstvolume.so")
+                    self.path("libgstvorbis.so")
+                    self.path("libgstwavparse.so")
+                    
+                    self.end_prefix("../../libraries/universal-darwin/lib_release/gstreamer-plugins")
+
+
                 # SLVoice and vivox lols
-                self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib")
-                self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib")
+                #self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib")
+                #self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib")
                 #self.path("vivox-runtime/universal-darwin/libortp.dylib", "libortp.dylib")
                 #self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib")
                 #self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice")