Merge commit 'origin/mac' into next

2 files changed, 38 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index fe4b0a5..16666ea 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -126,6 +126,27 @@
         Added ConfirmTeleportHome alert text.
 
 
+2009-05-18  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/viewer_manifest.py:
+        Changed the list of installed Mac gstreamer plugins.
+
+        Commented out libgstqtwrapper.so, since it causes issues with
+        MP3s (and perhaps other types).
+
+        Added:
+            libgstfilter.so
+            libgstmultifile.so
+            libgststereo.so
+            libgstvideobalance.so
+            libgstvideobox.so
+            libgstvideocrop.so
+            libgstvideoflip.so
+            libgstvideomixer.so
+            libgstvideorate.so
+            libgstvideosignal.so
+
+
 2009-05-16  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
@@ -133,6 +154,12 @@
         No longer World > Create Landmark Here.
 
 
+2009-05-02  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/viewer_manifest.py:
+        Added libgstqtwrapper.so to Mac manifest.
+
+
 2009-04-28  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/install.xml:
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 9aeb31e..6c8de60 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -503,6 +503,7 @@ class DarwinManifest(ViewerManifest):
                     self.path("libgstffmpeg.so")
                     self.path("libgstffmpegcolorspace.so")
                     self.path("libgstffmpegscale.so")
+                    self.path("libgstfilter.so")
                     self.path("libgstflac.so")
                     self.path("libgstflv.so")
                     self.path("libgstgdp.so")
@@ -516,6 +517,7 @@ class DarwinManifest(ViewerManifest):
                     self.path("libgstmpeg4videoparse.so")
                     self.path("libgstmpegdemux.so")
                     self.path("libgstmpegvideoparse.so")
+                    self.path("libgstmultifile.so")
                     self.path("libgstmultipart.so")
                     self.path("libgstneonhttpsrc.so")
                     self.path("libgstogg.so")
@@ -525,6 +527,7 @@ class DarwinManifest(ViewerManifest):
                     self.path("libgstpng.so")
                     self.path("libgstpostproc.so")
                     self.path("libgstqtdemux.so")
+                    #self.path("libgstqtwrapper.so")
                     self.path("libgstqueue2.so")
                     self.path("libgstreal.so")
                     self.path("libgstrtp.so")
@@ -532,11 +535,19 @@ class DarwinManifest(ViewerManifest):
                     self.path("libgstrtsp.so")
                     self.path("libgstsdpelem.so")
                     self.path("libgstselector.so")
+                    self.path("libgststereo.so")
                     self.path("libgsttcp.so")
                     self.path("libgsttheora.so")
                     self.path("libgsttypefindfunctions.so")
                     self.path("libgstudp.so")
+                    self.path("libgstvideobalance.so")
+                    self.path("libgstvideobox.so")
+                    self.path("libgstvideocrop.so")
+                    self.path("libgstvideoflip.so")
+                    self.path("libgstvideomixer.so")
+                    self.path("libgstvideorate.so")
                     self.path("libgstvideoscale.so")
+                    self.path("libgstvideosignal.so")
                     self.path("libgstvolume.so")
                     self.path("libgstvorbis.so")
                     self.path("libgstwavparse.so")