Applied patch by Nicky Perian for #680: commented out unused references to gstreamer post-webkit_plugins in viewer_manifest.py

1 files changed, 55 insertions, 54 deletions

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index f1892fc..e0f08b2 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -339,63 +339,64 @@ class WindowsManifest(ViewerManifest):
             self.path("ortp.dll")
 
             self.end_prefix()
-
+# Gstreamer is not used in webkit_plugins. The librries are never delivered/extracted to
+# ../../libraries/i686-win32/lib/release . Commented out until decision made to use or drop.
         # Gstreamer plugins
-        if self.prefix(src="lib/gstreamer-plugins", dst=""):
-            self.path("*.dll", dst="lib/gstreamer-plugins/*.dll")
-            self.end_prefix()
+        #if self.prefix(src="lib/gstreamer-plugins", dst=""):
+        #    self.path("*.dll", dst="lib/gstreamer-plugins/*.dll")
+        #    self.end_prefix()
 
         # Gstreamer libs
-        if (not self.standalone()) and self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
-            self.path("iconv.dll")
-            self.path("libxml2.dll")
-            self.path("libcairo-2.dll")
-            self.path("libgio-2.0-0.dll")
-            self.path("libglib-2.0-0.dll")
-            self.path("libgmodule-2.0-0.dll")
-            self.path("libgobject-2.0-0.dll")
-            self.path("libgthread-2.0-0.dll")
-            self.path("charset.dll")
-            self.path("intl.dll")
-            self.path("libgcrypt-11.dll")
-            self.path("libgnutls-26.dll")
-            self.path("libgpg-error-0.dll")
-            self.path("libgstapp.dll")
-            self.path("libgstaudio.dll")
-            self.path("libgstbase-0.10.dll")
-            self.path("libgstcdda.dll")
-            self.path("libgstcontroller-0.10.dll")
-            self.path("libgstdataprotocol-0.10.dll")
-            self.path("libgstdshow.dll")
-            self.path("libgstfft.dll")
-            self.path("libgstinterfaces.dll")
-            self.path("libgstnet-0.10.dll")
-            self.path("libgstnetbuffer.dll")
-            self.path("libgstpbutils.dll")
-            self.path("libgstreamer-0.10.dll")
-            self.path("libgstriff.dll")
-            self.path("libgstrtp.dll")
-            self.path("libgstrtsp.dll")
-            self.path("libgstsdp.dll")
-            self.path("libgsttag.dll")
-            self.path("libgstvideo.dll")
-            self.path("libjpeg.dll")
-            self.path("libmp3lame-0.dll")
-            self.path("libneon-27.dll")
-            self.path("libogg-0.dll")
-            self.path("liboil-0.3-0.dll")
-            self.path("libopenjpeg-2.dll")
-            self.path("libpng12-0.dll")
-            self.path("libschroedinger-1.0-0.dll")
-            self.path("libspeex-1.dll")
-            self.path("libtheora-0.dll")
-            self.path("libvorbis-0.dll")
-            self.path("libvorbisenc-2.dll")
-            self.path("libxml2-2.dll")
-            self.path("glew32.dll")
-            self.path("xvidcore.dll")
-            self.path("zlib1.dll")
-            self.end_prefix()            
+        #if (not self.standalone()) and self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
+        #    self.path("iconv.dll")
+        #    self.path("libxml2.dll")
+        #    self.path("libcairo-2.dll")
+        #    self.path("libgio-2.0-0.dll")
+        #    self.path("libglib-2.0-0.dll")
+        #    self.path("libgmodule-2.0-0.dll")
+        #    self.path("libgobject-2.0-0.dll")
+        #    self.path("libgthread-2.0-0.dll")
+        #    self.path("charset.dll")
+        #    self.path("intl.dll")
+        #    self.path("libgcrypt-11.dll")
+        #    self.path("libgnutls-26.dll")
+        #    self.path("libgpg-error-0.dll")
+        #    self.path("libgstapp.dll")
+        #    self.path("libgstaudio.dll")
+        #    self.path("libgstbase-0.10.dll")
+        #    self.path("libgstcdda.dll")
+        #    self.path("libgstcontroller-0.10.dll")
+        #    self.path("libgstdataprotocol-0.10.dll")
+        #    self.path("libgstdshow.dll")
+        #    self.path("libgstfft.dll")
+        #    self.path("libgstinterfaces.dll")
+        #    self.path("libgstnet-0.10.dll")
+        #    self.path("libgstnetbuffer.dll")
+        #    self.path("libgstpbutils.dll")
+        #    self.path("libgstreamer-0.10.dll")
+        #    self.path("libgstriff.dll")
+        #    self.path("libgstrtp.dll")
+        #    self.path("libgstrtsp.dll")
+        #    self.path("libgstsdp.dll")
+        #    self.path("libgsttag.dll")
+        #    self.path("libgstvideo.dll")
+        #    self.path("libjpeg.dll")
+        #    self.path("libmp3lame-0.dll")
+        #    self.path("libneon-27.dll")
+        #    self.path("libogg-0.dll")
+        #    self.path("liboil-0.3-0.dll")
+        #    self.path("libopenjpeg-2.dll")
+        #    self.path("libpng12-0.dll")
+        #    self.path("libschroedinger-1.0-0.dll")
+        #    self.path("libspeex-1.dll")
+        #    self.path("libtheora-0.dll")
+        #    self.path("libvorbis-0.dll")
+        #    self.path("libvorbisenc-2.dll")
+        #    self.path("libxml2-2.dll")
+        #    self.path("glew32.dll")
+        #    self.path("xvidcore.dll")
+        #    self.path("zlib1.dll")
+        #    self.end_prefix()
 
 #        # pull in the crash logger and updater from other projects
 #        self.path(src=self.find_existing_file( # tag:"crash-logger" here as a cue to the exporter