Merge branch 'mac-1.1.0' into next

Required substantial portability changes to set_gst_plugin_path().

Conflicts:
	linden/indra/llmedia/llmediaimplgstreamer.cpp

1 files changed, 104 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 30347a5..4c485d4 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -71,12 +71,42 @@
         Added LLMediaBase::EDebugLevel and setDebugLevel prototype.
 
 
+2009-03-30  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/viewer_manifest.py:
+        Added libgstdecodebin.so plugin to Mac manifest.
+
+
 2009-03-30  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/llmedia/llmediaimplgstreamer.cpp:
         Cleaned up logic for bad streams.
 
 
+2009-03-29  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        set_gst_plugin_path now sets GST_PLUGIN_SYSTEM_PATH="".
+        This prevents GStreamer from looking for system-installed plugins,
+        which can have conflicts with our packaged ones.
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Improved set_gst_plugin_path, now sets path on Mac too.
+
+
+        * linden/indra/cmake/GStreamer.cmake:
+        Using OpenAL framework on Mac after all. Maybe.
+
+
+        * linden/indra/cmake/GStreamer.cmake:
+        Tweaked the list of linked-in gstreamer libs for Mac.
+
+
+        * linden/indra/newview/viewer_manifest.py:
+        Removed the "2.0.0" named glib libs. Only using "2.0" now.
+
+
 2009-03-29  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/llmedia/llmediaimplgstreamer.cpp:
@@ -201,12 +231,86 @@
         Ditto.
 
 
+2009-03-16  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/viewer_manifest.py:
+        Symlinks for Mac glib dylibs (2.0.0 -> 2.0).
+
+        * linden/indra/newview/viewer_manifest.py:
+        Added more Mac dylibs to manifest.
+
+
+2009-03-13  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llaudio/audioengine_openal.cpp:
+        Added error checking when generating an OpenAL source.
+
+
+2009-03-12  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/cmake/OPENAL.cmake:
+        Don't find specific OpenAL lib locations on Mac/Linux.
+        Linking that way is bad. Just use -lopenal -lalut instead.
+
+
+2009-03-11  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/cmake/OPENAL.cmake:
+        Removed redundant/unnecessary OpenAL lib names and paths.
+
+        * linden/indra/newview/viewer_manifest.py:
+        Added Mac gstreamer plugins to viewer manifest.
+
+        * linden/indra/llaudio/CMakeLists.txt:
+        LLAudio's CMakeLists should include OPENAL.
+
+        * linden/indra/cmake/LLMedia.cmake:
+        Removed Quicktime-related cmake code.
+        * linden/indra/cmake/LLMedia.cmake:
+        Ditto.
+        * linden/indra/llmedia/CMakeLists.txt:
+        Ditto.
+        * linden/indra/newview/CMakeLists.txt:
+        Ditto.
+
+
 2009-03-10  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/llaudio/audioengine.cpp:
         Changed startinternetstream() a bit to be clearer.
 
 
+2009-03-09  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/viewer_manifest.py:
+        Manifest includes openal and gstreamer libs in Mac package.
+
+        * linden/indra/newview/CMakeLists.txt: 
+        Mac app icon will be called viewer.icns instead of secondlife.icns.
+        * linden/indra/newview/Info-Imprudence.plist: 
+        Ditto.
+        * linden/indra/newview/viewer_manifest.py:
+        Ditto.
+
+
+2009-03-08  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Load the proper gstreamer lib type (dylib) on Mac.
+
+
+        * linden/indra/cmake/GStreamer.cmake:
+        Tweaked GStreamer.cmake to work on Mac.
+
+
+2009-03-07  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/Info-SecondLife.plist:
+        Moved Info-SecondLife.plist to Info-Imprudence.plist.
+        * linden/indra/newview/viewer_manifest.py:
+        Ditto.
+
+
 2009-03-07  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/llimagej2coj/llimagej2coj.cpp: