Updated copywinlibs and staging to use the new set of gstreamer libs

2 files changed, 192 insertions, 58 deletions

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index f584689..78c7c96 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -32,6 +32,67 @@ set(debug_files
     libapr-1.dll
     libaprutil-1.dll
     libapriconv-1.dll
+        
+        # gstreamer streaming files below
+        avcodec-gpl-52.dll
+        avdevice-gpl-52.dll
+        avfilter-gpl-1.dll
+        avformat-gpl-52.dll
+        avutil-gpl-50.dll
+        iconv.dll
+        liba52-0.dll
+        libbz2.dll
+        libcelt-0.dll
+        libdca-0.dll
+        libexpat-1.dll
+        libfaad-2.dll
+        libFLAC-8.dll
+        libgcrypt-11.dll
+        libgio-2.0-0.dll
+        libglib-2.0-0.dll
+        libgmodule-2.0-0.dll
+        libgnutls-26.dll
+        libgobject-2.0-0.dll
+        libgpg-error-0.dll
+        libgstapp-0.10.dll
+        libgstaudio-0.10.dll
+        libgstbase-0.10.dll
+        libgstcontroller-0.10.dll
+        libgstdataprotocol-0.10.dll
+        libgstfft-0.10.dll
+        libgstinterfaces-0.10.dll
+        libgstnet-0.10.dll
+        libgstnetbuffer-0.10.dll
+        libgstpbutils-0.10.dll
+        libgstphotography-0.10.dll
+        libgstreamer-0.10.dll
+        libgstriff-0.10.dll
+        libgstrtp-0.10.dll
+        libgstrtsp-0.10.dll
+        libgstsdp-0.10.dll
+        libgstsignalprocessor-0.10.dll
+        libgsttag-0.10.dll
+        libgstvideo-0.10.dll
+        libgthread-2.0-0.dll
+        libmms-0.dll
+        libmpeg2-0.dll
+        libneon-27.dll
+        libogg-0.dll
+        liboil-0.3-0.dll
+        libsoup-2.4-1.dll
+        libtasn1-3.dll
+        libtheora-0.dll
+        libtheoradec-1.dll
+        libvorbis-0.dll
+        libvorbisenc-2.dll
+        libvorbisfile-3.dll
+        libwavpack-1.dll
+        libx264-67.dll
+        libxml2-2.dll
+        libxml2.dll
+        SDL.dll
+        xvidcore.dll
+        z.dll
     )
 
 copy_if_different(
@@ -215,6 +276,67 @@ set(release_files
     libapr-1.dll
     libaprutil-1.dll
     libapriconv-1.dll
+        
+        # gstreamer streaming files below
+        avcodec-gpl-52.dll
+        avdevice-gpl-52.dll
+        avfilter-gpl-1.dll
+        avformat-gpl-52.dll
+        avutil-gpl-50.dll
+        iconv.dll
+        liba52-0.dll
+        libbz2.dll
+        libcelt-0.dll
+        libdca-0.dll
+        libexpat-1.dll
+        libfaad-2.dll
+        libFLAC-8.dll
+        libgcrypt-11.dll
+        libgio-2.0-0.dll
+        libglib-2.0-0.dll
+        libgmodule-2.0-0.dll
+        libgnutls-26.dll
+        libgobject-2.0-0.dll
+        libgpg-error-0.dll
+        libgstapp-0.10.dll
+        libgstaudio-0.10.dll
+        libgstbase-0.10.dll
+        libgstcontroller-0.10.dll
+        libgstdataprotocol-0.10.dll
+        libgstfft-0.10.dll
+        libgstinterfaces-0.10.dll
+        libgstnet-0.10.dll
+        libgstnetbuffer-0.10.dll
+        libgstpbutils-0.10.dll
+        libgstphotography-0.10.dll
+        libgstreamer-0.10.dll
+        libgstriff-0.10.dll
+        libgstrtp-0.10.dll
+        libgstrtsp-0.10.dll
+        libgstsdp-0.10.dll
+        libgstsignalprocessor-0.10.dll
+        libgsttag-0.10.dll
+        libgstvideo-0.10.dll
+        libgthread-2.0-0.dll
+        libmms-0.dll
+        libmpeg2-0.dll
+        libneon-27.dll
+        libogg-0.dll
+        liboil-0.3-0.dll
+        libsoup-2.4-1.dll
+        libtasn1-3.dll
+        libtheora-0.dll
+        libtheoradec-1.dll
+        libvorbis-0.dll
+        libvorbisenc-2.dll
+        libvorbisfile-3.dll
+        libwavpack-1.dll
+        libx264-67.dll
+        libxml2-2.dll
+        libxml2.dll
+        SDL.dll
+        xvidcore.dll
+        z.dll
     )
     
 copy_if_different(
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 26a5d84..44dcb73 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -282,6 +282,11 @@ class WindowsManifest(ViewerManifest):
         if self.prefix(src='../media_plugins/webkit/%s' % self.args['configuration'], dst="llplugin"):
             self.path("media_plugin_webkit.dll")
             self.end_prefix()
+
+        # Media plugins - GStreamer
+        if self.prefix(src='../media_plugins/gstreamer010/%s' % self.args['configuration'], dst="llplugin"):
+            self.path("media_plugin_gstreamer010.dll")
+            self.end_prefix()            
  
         # For WebKit/Qt plugin runtimes
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"):
@@ -305,9 +310,6 @@ class WindowsManifest(ViewerManifest):
             self.path("qtiff4.dll")
             self.end_prefix()
 
-        # Per platform MIME config on the cheap.  See SNOW-307 / DEV-41388
-        self.path("skins/default/xui/en-us/mime_types_windows.xml", "skins/default/xui/en-us/mime_types.xml")
-
         # These need to be installed as a SxS assembly, currently a 'private' assembly.
         # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx
         if self.prefix(src=self.args['configuration'], dst=""):
@@ -348,64 +350,74 @@ 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("avcodec-gpl-52.dll")
+        self.path("avdevice-gpl-52.dll")
+        self.path("avfilter-gpl-1.dll")
+        self.path("avformat-gpl-52.dll")
+        self.path("avutil-gpl-50.dll")
+        self.path("iconv.dll")
+        self.path("liba52-0.dll")
+        self.path("libbz2.dll")
+        self.path("libcelt-0.dll")
+        self.path("libdca-0.dll")
+        self.path("libexpat-1.dll")
+        self.path("libfaad-2.dll")
+        self.path("libFLAC-8.dll")
+        self.path("libgcrypt-11.dll")
+        self.path("libgio-2.0-0.dll")
+        self.path("libglib-2.0-0.dll")
+        self.path("libgmodule-2.0-0.dll")
+        self.path("libgnutls-26.dll")
+        self.path("libgobject-2.0-0.dll")
+        self.path("libgpg-error-0.dll")
+        self.path("libgstapp-0.10.dll")
+        self.path("libgstaudio-0.10.dll")
+        self.path("libgstbase-0.10.dll")
+        self.path("libgstcontroller-0.10.dll")
+        self.path("libgstdataprotocol-0.10.dll")
+        self.path("libgstfft-0.10.dll")
+        self.path("libgstinterfaces-0.10.dll")
+        self.path("libgstnet-0.10.dll")
+        self.path("libgstnetbuffer-0.10.dll")
+        self.path("libgstpbutils-0.10.dll")
+        self.path("libgstphotography-0.10.dll")
+        self.path("libgstreamer-0.10.dll")
+        self.path("libgstriff-0.10.dll")
+        self.path("libgstrtp-0.10.dll")
+        self.path("libgstrtsp-0.10.dll")
+        self.path("libgstsdp-0.10.dll")
+        self.path("libgstsignalprocessor-0.10.dll")
+        self.path("libgsttag-0.10.dll")
+        self.path("libgstvideo-0.10.dll")
+        self.path("libgthread-2.0-0.dll")
+        self.path("libmms-0.dll")
+        self.path("libmpeg2-0.dll")
+        self.path("libneon-27.dll")
+        self.path("libogg-0.dll")
+        self.path("liboil-0.3-0.dll")
+        self.path("libsoup-2.4-1.dll")
+        self.path("libtasn1-3.dll")
+        self.path("libtheora-0.dll")
+        self.path("libtheoradec-1.dll")
+        self.path("libvorbis-0.dll")
+        self.path("libvorbisenc-2.dll")
+        self.path("libvorbisfile-3.dll")
+        self.path("libwavpack-1.dll")
+        self.path("libx264-67.dll")
+        self.path("libxml2-2.dll")
+        self.path("libxml2.dll")
+        self.path("SDL.dll")
+        self.path("xvidcore.dll")
+        self.path("z.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