Merge branch 'mccabe/next' into next-1.1

author: Jacek Antonelli 2009-06-05 17:48:10 -0500
committer: Jacek Antonelli 2009-06-05 17:48:10 -0500
commit: ac886b945186df43dfbac163c890fcc3e7b93ce1 (patch)
tree: fefb7497ea9ba9ed65f6168af6aa1656b2a5f610 /linden
parent: Merge branch 'revert-ctrl-d' into next-1.1 (diff)
parent: Fixed gstreamer windows library (diff)
download: meta-impy-ac886b945186df43dfbac163c890fcc3e7b93ce1.zip
meta-impy-ac886b945186df43dfbac163c890fcc3e7b93ce1.tar.gz
meta-impy-ac886b945186df43dfbac163c890fcc3e7b93ce1.tar.bz2
meta-impy-ac886b945186df43dfbac163c890fcc3e7b93ce1.tar.xz
3 files changed, 222 insertions, 222 deletions
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 458b016..452292a 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -8,83 +8,77 @@ include(CMakeCopyIfDifferent)
 set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/lib/gstreamer-plugins")
 set(gst_plugin_release_files
-    libdshowsrcwrapper.dll
+        libgstaacparse.dll
-    libgsta52.dll
+        libgstadder.dll
-    libgstacmenc.dll
+        libgstaiffparse.dll
-    libgstadder.dll
+        libgstalaw.dll
-    libgstalaw.dll
+        libgstalpha.dll
-    libgstalpha.dll
+        libgstasfdemux.dll
-    libgstalphacolor.dll
+        libgstaudioconvert.dll
-    libgstapp.dll
+        libgstaudiofx.dll
-    libgstasfdemux.dll
+        libgstaudiorate.dll
-    libgstaudiochunk.dll
+        libgstaudioresample.dll
-    libgstaudioconvert.dll
+        libgstauparse.dll
-    libgstaudiofx.dll
+        libgstautoconvert.dll
-    libgstaudiorate.dll
+        libgstautodetect.dll
-    libgstaudioresample.dll
+        libgstavi.dll
-    libgstaudiotestsrc.dll
+        libgstcoreelements.dll
-    libgstautodetect.dll
+        libgstcutter.dll
-    libgstavi.dll
+        libgstdecodebin.dll
-    libgstcoreelements.dll
+        libgstdecodebin2.dll
-    libgstcutter.dll
+        libgstdshowdecwrapper.dll
-    libgstdecodebin.dll
+        libgstdshowsrcwrapper.dll
-    libgstdecodebin2.dll
+        libgstdshowvideosink.dll
-    libgstdirectdraw.dll
+        libgstffmpeg.dll
-    libgstdirectsound.dll
+        libgstffmpegcolorspace.dll
-    libgstdshowdecwrapper.dll
+        libgstflv.dll
-    libgstdshowsrcwrapper.dll
+        libgstgdp.dll
-    libgstdshowvideosink.dll
+        libgstgio.dll
-    libgstfaad.dll
+        libgsth264parse.dll
-    libgstffmpeg.dll
+        libgsticydemux.dll
-    libgstffmpegcolorspace.dll
+        libgstid3demux.dll
-    libgstflv.dll
+        libgstinterleave.dll
-    libgstgamma.dll
+        libgstjpeg.dll
-    libgstgdp.dll
+        libgstmpeg4videoparse.dll
-    libgsth264parse.dll
+        libgstmpegaudioparse.dll
-    libgsticydemux.dll
+        libgstmpegdemux.dll
-    libgstid3demux.dll
+        libgstmpegstream.dll
-    libgstjpeg.dll
+        libgstmpegtsmux.dll
-    libgstlevel.dll
+        libgstmpegvideoparse.dll
-    libgstmms.dll
+        libgstmulaw.dll
-    libgstmpeg2dec.dll
+        libgstmultifile.dll
-    libgstmpeg4videoparse.dll
+        libgstneon.dll
-    libgstmpegaudioparse.dll
+        libgstplaybin.dll
-    libgstmpegstream.dll
+        libgstpng.dll
-    libgstmpegvideoparse.dll
+        libgstqtdemux.dll
-    libgstmulaw.dll
+        libgstqtmux.dll
-    libgstmultipart.dll
+        libgstqueue2.dll
-    libgstneon.dll
+        libgstreal.dll
-    libgstogg.dll
+        libgstrealmedia.dll
-    libgstpcapparse.dll
+        libgstrtpmanager.dll
-    libgstplaybin.dll
+        libgstrtpmux.dll
-    libgstpng.dll
+        libgstrtp_good.dll
-    libgstqtdemux.dll
+        libgstrtsp_good.dll
-    libgstqueue2.dll
+        libgstselector.dll
-    libgstreal.dll
+        libgstsmpte.dll
-    libgstrealmedia.dll
+        libgsttheora.dll
-    libgstrtp.dll
+        libgsttypefindfunctions.dll
-    libgstrtpmanager.dll
+        libgstudp.dll
-    libgstrtpmuxer.dll
+        libgstvideobox.dll
-    libgstrtsp.dll
+        libgstvideocrop.dll
-    libgstsmpte.dll
+        libgstvideofilterbalance.dll
-    libgsttheora.dll
+        libgstvideofiltergamma.dll
-    libgsttypefindfunctions.dll
+        libgstvideomixer.dll
-    libgstudp.dll
+        libgstvideorate.dll
-    libgstvideobalance.dll
+        libgstvideoscale.dll
-    libgstvideobox.dll
+        libgstvideosignal.dll
-    libgstvideocrop.dll
+        libgstvolume.dll
-    libgstvideomixer.dll
+        libgstwasapi.dll
-    libgstvideorate.dll
+        libgstwaveform.dll
-    libgstvideoscale.dll
+        libgstwavparse.dll
-    libgstvideosignal.dll
+        libgstwininet.dll
-    libgstvolume.dll
+        libgstwinks.dll
-    libgstvorbis.dll
+        libgstx264.dll
-    libgstwasapi.dll
-    libgstwavparse.dll
-    libgstwininet.dll
-    libgstwinks.dll
-    libgstx264.dll
-    libgstxvid.dll
    )
 copy_if_different(
@@ -97,83 +91,77 @@ set(all_targets ${all_targets} ${out_targets})
 set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/lib/gstreamer-plugins")
 set(gst_plugin_debug_files
-    libdshowsrcwrapper.dll
+        libgstaacparse.dll
-    libgsta52.dll
+        libgstadder.dll
-    libgstacmenc.dll
+        libgstaiffparse.dll
-    libgstadder.dll
+        libgstalaw.dll
-    libgstalaw.dll
+        libgstalpha.dll
-    libgstalpha.dll
+        libgstasfdemux.dll
-    libgstalphacolor.dll
+        libgstaudioconvert.dll
-    libgstapp.dll
+        libgstaudiofx.dll
-    libgstasfdemux.dll
+        libgstaudiorate.dll
-    libgstaudiochunk.dll
+        libgstaudioresample.dll
-    libgstaudioconvert.dll
+        libgstauparse.dll
-    libgstaudiofx.dll
+        libgstautoconvert.dll
-    libgstaudiorate.dll
+        libgstautodetect.dll
-    libgstaudioresample.dll
+        libgstavi.dll
-    libgstaudiotestsrc.dll
+        libgstcoreelements.dll
-    libgstautodetect.dll
+        libgstcutter.dll
-    libgstavi.dll
+        libgstdecodebin.dll
-    libgstcoreelements.dll
+        libgstdecodebin2.dll
-    libgstcutter.dll
+        libgstdshowdecwrapper.dll
-    libgstdecodebin.dll
+        libgstdshowsrcwrapper.dll
-    libgstdecodebin2.dll
+        libgstdshowvideosink.dll
-    libgstdirectdraw.dll
+        libgstffmpeg.dll
-    libgstdirectsound.dll
+        libgstffmpegcolorspace.dll
-    libgstdshowdecwrapper.dll
+        libgstflv.dll
-    libgstdshowsrcwrapper.dll
+        libgstgdp.dll
-    libgstdshowvideosink.dll
+        libgstgio.dll
-    libgstfaad.dll
+        libgsth264parse.dll
-    libgstffmpeg.dll
+        libgsticydemux.dll
-    libgstffmpegcolorspace.dll
+        libgstid3demux.dll
-    libgstflv.dll
+        libgstinterleave.dll
-    libgstgamma.dll
+        libgstjpeg.dll
-    libgstgdp.dll
+        libgstmpeg4videoparse.dll
-    libgsth264parse.dll
+        libgstmpegaudioparse.dll
-    libgsticydemux.dll
+        libgstmpegdemux.dll
-    libgstid3demux.dll
+        libgstmpegstream.dll
-    libgstjpeg.dll
+        libgstmpegtsmux.dll
-    libgstlevel.dll
+        libgstmpegvideoparse.dll
-    libgstmms.dll
+        libgstmulaw.dll
-    libgstmpeg2dec.dll
+        libgstmultifile.dll
-    libgstmpeg4videoparse.dll
+        libgstneon.dll
-    libgstmpegaudioparse.dll
+        libgstplaybin.dll
-    libgstmpegstream.dll
+        libgstpng.dll
-    libgstmpegvideoparse.dll
+        libgstqtdemux.dll
-    libgstmulaw.dll
+        libgstqtmux.dll
-    libgstmultipart.dll
+        libgstqueue2.dll
-    libgstneon.dll
+        libgstreal.dll
-    libgstogg.dll
+        libgstrealmedia.dll
-    libgstpcapparse.dll
+        libgstrtpmanager.dll
-    libgstplaybin.dll
+        libgstrtpmux.dll
-    libgstpng.dll
+        libgstrtp_good.dll
-    libgstqtdemux.dll
+        libgstrtsp_good.dll
-    libgstqueue2.dll
+        libgstselector.dll
-    libgstreal.dll
+        libgstsmpte.dll
-    libgstrealmedia.dll
+        libgsttheora.dll
-    libgstrtp.dll
+        libgsttypefindfunctions.dll
-    libgstrtpmanager.dll
+        libgstudp.dll
-    libgstrtpmuxer.dll
+        libgstvideobox.dll
-    libgstrtsp.dll
+        libgstvideocrop.dll
-    libgstsmpte.dll
+        libgstvideofilterbalance.dll
-    libgsttheora.dll
+        libgstvideofiltergamma.dll
-    libgsttypefindfunctions.dll
+        libgstvideomixer.dll
-    libgstudp.dll
+        libgstvideorate.dll
-    libgstvideobalance.dll
+        libgstvideoscale.dll
-    libgstvideobox.dll
+        libgstvideosignal.dll
-    libgstvideocrop.dll
+        libgstvolume.dll
-    libgstvideomixer.dll
+        libgstwasapi.dll
-    libgstvideorate.dll
+        libgstwaveform.dll
-    libgstvideoscale.dll
+        libgstwavparse.dll
-    libgstvideosignal.dll
+        libgstwininet.dll
-    libgstvolume.dll
+        libgstwinks.dll
-    libgstvorbis.dll
+        libgstx264.dll
-    libgstwasapi.dll
-    libgstwavparse.dll
-    libgstwininet.dll
-    libgstwinks.dll
-    libgstx264.dll
-    libgstxvid.dll
    )
 copy_if_different(
@@ -220,39 +208,45 @@ set(debug_files
    libgmodule-2.0-0.dll
    libgobject-2.0-0.dll
    libgthread-2.0-0.dll
-    avcodec-51.dll
+    charset.dll
-    avformat-52.dll
+        intl.dll
-    avutil-49.dll
+        libgcrypt-11.dll
-    intl.dll
+        libgnutls-26.dll
-    libfaacdrm.dll
+        libgpg-error-0.dll
-    libgstapp-0.10.dll
+        libgstapp.dll
-    libgstaudio-0.10.dll
+        libgstaudio.dll
-    libgstbase-0.10.dll
+        libgstbase-0.10.dll
-    libgstcdda-0.10.dll
+        libgstcdda.dll
-    libgstcontroller-0.10.dll
+        libgstcontroller-0.10.dll
-    libgstdataprotocol-0.10.dll
+        libgstdataprotocol-0.10.dll
-    libgstdshow-0.10.dll
+        libgstdshow.dll
-    libgstfft-0.10.dll
+        libgstfft.dll
-    libgstinterfaces-0.10.dll
+        libgstinterfaces.dll
-    libgstnet-0.10.dll
+        libgstnet-0.10.dll
-    libgstnetbuffer-0.10.dll
+        libgstnetbuffer.dll
-    libgstpbutils-0.10.dll
+        libgstpbutils.dll
-    libgstreamer-0.10.dll
+        libgstreamer-0.10.dll
-    libgstriff-0.10.dll
+        libgstriff.dll
-    libgstrtp-0.10.dll
+        libgstrtp.dll
-    libgstrtsp-0.10.dll
+        libgstrtsp.dll
-    libgstsdp-0.10.dll
+        libgstsdp.dll
-    libgsttag-0.10.dll
+        libgsttag.dll
-    libgstvideo-0.10.dll
+        libgstvideo.dll
-    libjpeg.dll
+        libneon-27.dll
-    libmms.dll
+        libogg-0.dll
-    liboil-0.3-0.dll
+        liboil-0.3-0.dll
-    libpng13.dll
+        libopenjpeg-2.dll
-    libspeex.dll
+        libschroedinger-1.0-0.dll
+        libspeex-1.dll
+        libtheora-0.dll
+        libvorbis-0.dll
+        libvorbisenc-2.dll
+        libxml2-2.dll
    ogg.dll
    vorbis.dll
    xvidcore.dll
    zlib1.dll
+    libpng12-0.dll
    )
 copy_if_different(
@@ -296,39 +290,45 @@ set(release_files
    libgmodule-2.0-0.dll
    libgobject-2.0-0.dll
    libgthread-2.0-0.dll
-    avcodec-51.dll
+        charset.dll
-    avformat-52.dll
+        intl.dll
-    avutil-49.dll
+        libgcrypt-11.dll
-    intl.dll
+        libgnutls-26.dll
-    libfaacdrm.dll
+        libgpg-error-0.dll
-    libgstapp-0.10.dll
+        libgstapp.dll
-    libgstaudio-0.10.dll
+        libgstaudio.dll
-    libgstbase-0.10.dll
+        libgstbase-0.10.dll
-    libgstcdda-0.10.dll
+        libgstcdda.dll
-    libgstcontroller-0.10.dll
+        libgstcontroller-0.10.dll
-    libgstdataprotocol-0.10.dll
+        libgstdataprotocol-0.10.dll
-    libgstdshow-0.10.dll
+        libgstdshow.dll
-    libgstfft-0.10.dll
+        libgstfft.dll
-    libgstinterfaces-0.10.dll
+        libgstinterfaces.dll
-    libgstnet-0.10.dll
+        libgstnet-0.10.dll
-    libgstnetbuffer-0.10.dll
+        libgstnetbuffer.dll
-    libgstpbutils-0.10.dll
+        libgstpbutils.dll
-    libgstreamer-0.10.dll
+        libgstreamer-0.10.dll
-    libgstriff-0.10.dll
+        libgstriff.dll
-    libgstrtp-0.10.dll
+        libgstrtp.dll
-    libgstrtsp-0.10.dll
+        libgstrtsp.dll
-    libgstsdp-0.10.dll
+        libgstsdp.dll
-    libgsttag-0.10.dll
+        libgsttag.dll
-    libgstvideo-0.10.dll
+        libgstvideo.dll
-    libjpeg.dll
+        libneon-27.dll
-    libmms.dll
+        libogg-0.dll
-    liboil-0.3-0.dll
+        liboil-0.3-0.dll
-    libpng13.dll
+        libopenjpeg-2.dll
-    libspeex.dll
+        libschroedinger-1.0-0.dll
+        libspeex-1.dll
+        libtheora-0.dll
+        libvorbis-0.dll
+        libvorbisenc-2.dll
+        libxml2-2.dll
    ogg.dll
    vorbis.dll
    xvidcore.dll
    zlib1.dll
+    libpng12-0.dll
    )
    
 copy_if_different(
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 885ba7f..98f53ca 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -291,10 +291,10 @@ void LLMediaImplGStreamer::set_gst_plugin_path()
        // But we also want to search the path the user has set, if any.
        std::string plugin_path =       
                "GST_PLUGIN_PATH=" +
-                imp_dir + separator +
 #if LL_WINDOWS
                imp_dir + "\\lib\\gstreamer-plugins" +
 #elif LL_DARWIN
+                imp_dir + separator +
                imp_dir + "/../Resources/lib/gstreamer-plugins" +
 #endif
                old_plugin_path;
diff --git a/linden/install.xml b/linden/install.xml
index c9ac3fd..41eec44 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -393,9 +393,9 @@
          <key>windows</key>
          <map>
            <key>md5sum</key>
-            <string>d5bfaa397dfbfc893603ad047c57604d</string>
+            <string>b1e0e16472c0e5d3b6291870e3f20b0c</string>
            <key>url</key>
-            <uri>http://imprudence.s3.amazonaws.com/extras/glib-2.18.3.1-windows-01262009.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/glib-2.18.4-windows-03162009.tar.bz2</uri>
          </map>
        </map>
      </map>
@@ -430,9 +430,9 @@
          <key>windows</key>
          <map>
            <key>md5sum</key>
-            <string>d3097ea059923e4f4ab5dc0b95d62a67</string>
+            <string>f8db21e781735ba5dd84f3043d20e882</string>
            <key>url</key>
-            <uri>http://imprudence.s3.amazonaws.com/extras/gstreamer-0.10.21-windows-02132009.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.22-windows-04172009.tar.bz2</uri>
          </map>
        </map>
      </map>
@@ -445,9 +445,9 @@
          <key>windows</key>
          <map>
            <key>md5sum</key>
-            <string>0a69a8ca39b54b3e1a838a508d2f72d0</string>
+            <string>1a55b7f4b5b14bc65609ac703277dba0</string>
            <key>url</key>
-            <uri>http://imprudence.s3.amazonaws.com/extras/gstreamer-plugins-windows-02132009.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-windows-05172009.tar.bz2</uri>
          </map>
        </map>
      </map>
@@ -619,9 +619,9 @@ anguage Infrstructure (CLI) international standard</string>
          <key>windows</key>
          <map>
            <key>md5sum</key>
-            <string>96ad03239a2b1d50584dcaf66162e03e</string>
+            <string>200bdf3c5a5489210fcee965f639a3f9</string>
            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.18-windows-20080613.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/libpng-1.2.34-1-windows-04172009.tar.bz2</uri>
          </map>
        </map>
      </map>
@@ -919,7 +919,7 @@ anguage Infrstructure (CLI) international standard</string>
            <key>md5sum</key>
            <string>8913f8ace065b14792cb0ec889a5f99a</string>
            <key>url</key>
-            <uri>https://imprudence.s3.amazonaws.com/extras/openjpeg-1.3-windows-20081211.tar.bz2</uri>
+            <uri>http://imprudence.s3.amazonaws.com/extras/openjpeg-1.3-windows-20081211.tar.bz2</uri>
          </map>
        </map>
      </map>
author	Jacek Antonelli	2009-06-05 17:48:10 -0500
committer	Jacek Antonelli	2009-06-05 17:48:10 -0500
commit	ac886b945186df43dfbac163c890fcc3e7b93ce1 (patch)
tree	fefb7497ea9ba9ed65f6168af6aa1656b2a5f610 /linden
parent	Merge branch 'revert-ctrl-d' into next-1.1 (diff)
parent	Fixed gstreamer windows library (diff)
download	meta-impy-ac886b945186df43dfbac163c890fcc3e7b93ce1.zip meta-impy-ac886b945186df43dfbac163c890fcc3e7b93ce1.tar.gz meta-impy-ac886b945186df43dfbac163c890fcc3e7b93ce1.tar.bz2 meta-impy-ac886b945186df43dfbac163c890fcc3e7b93ce1.tar.xz

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index 458b016..452292a 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -8,83 +8,77 @@ include(CMakeCopyIfDifferent)
8		8
9	set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/lib/gstreamer-plugins")	9	set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/lib/gstreamer-plugins")
10	set(gst_plugin_release_files	10	set(gst_plugin_release_files
11	libdshowsrcwrapper.dll	11	libgstaacparse.dll
12	libgsta52.dll	12	libgstadder.dll
13	libgstacmenc.dll	13	libgstaiffparse.dll
14	libgstadder.dll	14	libgstalaw.dll
15	libgstalaw.dll	15	libgstalpha.dll
16	libgstalpha.dll	16	libgstasfdemux.dll
17	libgstalphacolor.dll	17	libgstaudioconvert.dll
18	libgstapp.dll	18	libgstaudiofx.dll
19	libgstasfdemux.dll	19	libgstaudiorate.dll
20	libgstaudiochunk.dll	20	libgstaudioresample.dll
21	libgstaudioconvert.dll	21	libgstauparse.dll
22	libgstaudiofx.dll	22	libgstautoconvert.dll
23	libgstaudiorate.dll	23	libgstautodetect.dll
24	libgstaudioresample.dll	24	libgstavi.dll
25	libgstaudiotestsrc.dll	25	libgstcoreelements.dll
26	libgstautodetect.dll	26	libgstcutter.dll
27	libgstavi.dll	27	libgstdecodebin.dll
28	libgstcoreelements.dll	28	libgstdecodebin2.dll
29	libgstcutter.dll	29	libgstdshowdecwrapper.dll
30	libgstdecodebin.dll	30	libgstdshowsrcwrapper.dll
31	libgstdecodebin2.dll	31	libgstdshowvideosink.dll
32	libgstdirectdraw.dll	32	libgstffmpeg.dll
33	libgstdirectsound.dll	33	libgstffmpegcolorspace.dll
34	libgstdshowdecwrapper.dll	34	libgstflv.dll
35	libgstdshowsrcwrapper.dll	35	libgstgdp.dll
36	libgstdshowvideosink.dll	36	libgstgio.dll
37	libgstfaad.dll	37	libgsth264parse.dll
38	libgstffmpeg.dll	38	libgsticydemux.dll
39	libgstffmpegcolorspace.dll	39	libgstid3demux.dll
40	libgstflv.dll	40	libgstinterleave.dll
41	libgstgamma.dll	41	libgstjpeg.dll
42	libgstgdp.dll	42	libgstmpeg4videoparse.dll
43	libgsth264parse.dll	43	libgstmpegaudioparse.dll
44	libgsticydemux.dll	44	libgstmpegdemux.dll
45	libgstid3demux.dll	45	libgstmpegstream.dll
46	libgstjpeg.dll	46	libgstmpegtsmux.dll
47	libgstlevel.dll	47	libgstmpegvideoparse.dll
48	libgstmms.dll	48	libgstmulaw.dll
49	libgstmpeg2dec.dll	49	libgstmultifile.dll
50	libgstmpeg4videoparse.dll	50	libgstneon.dll
51	libgstmpegaudioparse.dll	51	libgstplaybin.dll
52	libgstmpegstream.dll	52	libgstpng.dll
53	libgstmpegvideoparse.dll	53	libgstqtdemux.dll
54	libgstmulaw.dll	54	libgstqtmux.dll
55	libgstmultipart.dll	55	libgstqueue2.dll
56	libgstneon.dll	56	libgstreal.dll
57	libgstogg.dll	57	libgstrealmedia.dll
58	libgstpcapparse.dll	58	libgstrtpmanager.dll
59	libgstplaybin.dll	59	libgstrtpmux.dll
60	libgstpng.dll	60	libgstrtp_good.dll
61	libgstqtdemux.dll	61	libgstrtsp_good.dll
62	libgstqueue2.dll	62	libgstselector.dll
63	libgstreal.dll	63	libgstsmpte.dll
64	libgstrealmedia.dll	64	libgsttheora.dll
65	libgstrtp.dll	65	libgsttypefindfunctions.dll
66	libgstrtpmanager.dll	66	libgstudp.dll
67	libgstrtpmuxer.dll	67	libgstvideobox.dll
68	libgstrtsp.dll	68	libgstvideocrop.dll
69	libgstsmpte.dll	69	libgstvideofilterbalance.dll
70	libgsttheora.dll	70	libgstvideofiltergamma.dll
71	libgsttypefindfunctions.dll	71	libgstvideomixer.dll
72	libgstudp.dll	72	libgstvideorate.dll
73	libgstvideobalance.dll	73	libgstvideoscale.dll
74	libgstvideobox.dll	74	libgstvideosignal.dll
75	libgstvideocrop.dll	75	libgstvolume.dll
76	libgstvideomixer.dll	76	libgstwasapi.dll
77	libgstvideorate.dll	77	libgstwaveform.dll
78	libgstvideoscale.dll	78	libgstwavparse.dll
79	libgstvideosignal.dll	79	libgstwininet.dll
80	libgstvolume.dll	80	libgstwinks.dll
81	libgstvorbis.dll	81	libgstx264.dll
82	libgstwasapi.dll
83	libgstwavparse.dll
84	libgstwininet.dll
85	libgstwinks.dll
86	libgstx264.dll
87	libgstxvid.dll
88	)	82	)
89		83
90	copy_if_different(	84	copy_if_different(
@@ -97,83 +91,77 @@ set(all_targets ${all_targets} ${out_targets})
97		91
98	set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/lib/gstreamer-plugins")	92	set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/lib/gstreamer-plugins")
99	set(gst_plugin_debug_files	93	set(gst_plugin_debug_files
100	libdshowsrcwrapper.dll	94	libgstaacparse.dll
101	libgsta52.dll	95	libgstadder.dll
102	libgstacmenc.dll	96	libgstaiffparse.dll
103	libgstadder.dll	97	libgstalaw.dll
104	libgstalaw.dll	98	libgstalpha.dll
105	libgstalpha.dll	99	libgstasfdemux.dll
106	libgstalphacolor.dll	100	libgstaudioconvert.dll
107	libgstapp.dll	101	libgstaudiofx.dll
108	libgstasfdemux.dll	102	libgstaudiorate.dll
109	libgstaudiochunk.dll	103	libgstaudioresample.dll
110	libgstaudioconvert.dll	104	libgstauparse.dll
111	libgstaudiofx.dll	105	libgstautoconvert.dll
112	libgstaudiorate.dll	106	libgstautodetect.dll
113	libgstaudioresample.dll	107	libgstavi.dll
114	libgstaudiotestsrc.dll	108	libgstcoreelements.dll
115	libgstautodetect.dll	109	libgstcutter.dll
116	libgstavi.dll	110	libgstdecodebin.dll
117	libgstcoreelements.dll	111	libgstdecodebin2.dll
118	libgstcutter.dll	112	libgstdshowdecwrapper.dll
119	libgstdecodebin.dll	113	libgstdshowsrcwrapper.dll
120	libgstdecodebin2.dll	114	libgstdshowvideosink.dll
121	libgstdirectdraw.dll	115	libgstffmpeg.dll
122	libgstdirectsound.dll	116	libgstffmpegcolorspace.dll
123	libgstdshowdecwrapper.dll	117	libgstflv.dll
124	libgstdshowsrcwrapper.dll	118	libgstgdp.dll
125	libgstdshowvideosink.dll	119	libgstgio.dll
126	libgstfaad.dll	120	libgsth264parse.dll
127	libgstffmpeg.dll	121	libgsticydemux.dll
128	libgstffmpegcolorspace.dll	122	libgstid3demux.dll
129	libgstflv.dll	123	libgstinterleave.dll
130	libgstgamma.dll	124	libgstjpeg.dll
131	libgstgdp.dll	125	libgstmpeg4videoparse.dll
132	libgsth264parse.dll	126	libgstmpegaudioparse.dll
133	libgsticydemux.dll	127	libgstmpegdemux.dll
134	libgstid3demux.dll	128	libgstmpegstream.dll
135	libgstjpeg.dll	129	libgstmpegtsmux.dll
136	libgstlevel.dll	130	libgstmpegvideoparse.dll
137	libgstmms.dll	131	libgstmulaw.dll
138	libgstmpeg2dec.dll	132	libgstmultifile.dll
139	libgstmpeg4videoparse.dll	133	libgstneon.dll
140	libgstmpegaudioparse.dll	134	libgstplaybin.dll
141	libgstmpegstream.dll	135	libgstpng.dll
142	libgstmpegvideoparse.dll	136	libgstqtdemux.dll
143	libgstmulaw.dll	137	libgstqtmux.dll
144	libgstmultipart.dll	138	libgstqueue2.dll
145	libgstneon.dll	139	libgstreal.dll
146	libgstogg.dll	140	libgstrealmedia.dll
147	libgstpcapparse.dll	141	libgstrtpmanager.dll
148	libgstplaybin.dll	142	libgstrtpmux.dll
149	libgstpng.dll	143	libgstrtp_good.dll
150	libgstqtdemux.dll	144	libgstrtsp_good.dll
151	libgstqueue2.dll	145	libgstselector.dll
152	libgstreal.dll	146	libgstsmpte.dll
153	libgstrealmedia.dll	147	libgsttheora.dll
154	libgstrtp.dll	148	libgsttypefindfunctions.dll
155	libgstrtpmanager.dll	149	libgstudp.dll
156	libgstrtpmuxer.dll	150	libgstvideobox.dll
157	libgstrtsp.dll	151	libgstvideocrop.dll
158	libgstsmpte.dll	152	libgstvideofilterbalance.dll
159	libgsttheora.dll	153	libgstvideofiltergamma.dll
160	libgsttypefindfunctions.dll	154	libgstvideomixer.dll
161	libgstudp.dll	155	libgstvideorate.dll
162	libgstvideobalance.dll	156	libgstvideoscale.dll
163	libgstvideobox.dll	157	libgstvideosignal.dll
164	libgstvideocrop.dll	158	libgstvolume.dll
165	libgstvideomixer.dll	159	libgstwasapi.dll
166	libgstvideorate.dll	160	libgstwaveform.dll
167	libgstvideoscale.dll	161	libgstwavparse.dll
168	libgstvideosignal.dll	162	libgstwininet.dll
169	libgstvolume.dll	163	libgstwinks.dll
170	libgstvorbis.dll	164	libgstx264.dll
171	libgstwasapi.dll
172	libgstwavparse.dll
173	libgstwininet.dll
174	libgstwinks.dll
175	libgstx264.dll
176	libgstxvid.dll
177	)	165	)
178		166
179	copy_if_different(	167	copy_if_different(
@@ -220,39 +208,45 @@ set(debug_files
220	libgmodule-2.0-0.dll	208	libgmodule-2.0-0.dll
221	libgobject-2.0-0.dll	209	libgobject-2.0-0.dll
222	libgthread-2.0-0.dll	210	libgthread-2.0-0.dll
223	avcodec-51.dll	211	charset.dll
224	avformat-52.dll	212	intl.dll
225	avutil-49.dll	213	libgcrypt-11.dll
226	intl.dll	214	libgnutls-26.dll
227	libfaacdrm.dll	215	libgpg-error-0.dll
228	libgstapp-0.10.dll	216	libgstapp.dll
229	libgstaudio-0.10.dll	217	libgstaudio.dll
230	libgstbase-0.10.dll	218	libgstbase-0.10.dll
231	libgstcdda-0.10.dll	219	libgstcdda.dll
232	libgstcontroller-0.10.dll	220	libgstcontroller-0.10.dll
233	libgstdataprotocol-0.10.dll	221	libgstdataprotocol-0.10.dll
234	libgstdshow-0.10.dll	222	libgstdshow.dll
235	libgstfft-0.10.dll	223	libgstfft.dll
236	libgstinterfaces-0.10.dll	224	libgstinterfaces.dll
237	libgstnet-0.10.dll	225	libgstnet-0.10.dll
238	libgstnetbuffer-0.10.dll	226	libgstnetbuffer.dll
239	libgstpbutils-0.10.dll	227	libgstpbutils.dll
240	libgstreamer-0.10.dll	228	libgstreamer-0.10.dll
241	libgstriff-0.10.dll	229	libgstriff.dll
242	libgstrtp-0.10.dll	230	libgstrtp.dll
243	libgstrtsp-0.10.dll	231	libgstrtsp.dll
244	libgstsdp-0.10.dll	232	libgstsdp.dll
245	libgsttag-0.10.dll	233	libgsttag.dll
246	libgstvideo-0.10.dll	234	libgstvideo.dll
247	libjpeg.dll	235	libneon-27.dll
248	libmms.dll	236	libogg-0.dll
249	liboil-0.3-0.dll	237	liboil-0.3-0.dll
250	libpng13.dll	238	libopenjpeg-2.dll
251	libspeex.dll	239	libschroedinger-1.0-0.dll
		240	libspeex-1.dll
		241	libtheora-0.dll
		242	libvorbis-0.dll
		243	libvorbisenc-2.dll
		244	libxml2-2.dll
252	ogg.dll	245	ogg.dll
253	vorbis.dll	246	vorbis.dll
254	xvidcore.dll	247	xvidcore.dll
255	zlib1.dll	248	zlib1.dll
		249	libpng12-0.dll
256	)	250	)
257		251
258	copy_if_different(	252	copy_if_different(
@@ -296,39 +290,45 @@ set(release_files
296	libgmodule-2.0-0.dll	290	libgmodule-2.0-0.dll
297	libgobject-2.0-0.dll	291	libgobject-2.0-0.dll
298	libgthread-2.0-0.dll	292	libgthread-2.0-0.dll
299	avcodec-51.dll	293	charset.dll
300	avformat-52.dll	294	intl.dll
301	avutil-49.dll	295	libgcrypt-11.dll
302	intl.dll	296	libgnutls-26.dll
303	libfaacdrm.dll	297	libgpg-error-0.dll
304	libgstapp-0.10.dll	298	libgstapp.dll
305	libgstaudio-0.10.dll	299	libgstaudio.dll
306	libgstbase-0.10.dll	300	libgstbase-0.10.dll
307	libgstcdda-0.10.dll	301	libgstcdda.dll
308	libgstcontroller-0.10.dll	302	libgstcontroller-0.10.dll
309	libgstdataprotocol-0.10.dll	303	libgstdataprotocol-0.10.dll
310	libgstdshow-0.10.dll	304	libgstdshow.dll
311	libgstfft-0.10.dll	305	libgstfft.dll
312	libgstinterfaces-0.10.dll	306	libgstinterfaces.dll
313	libgstnet-0.10.dll	307	libgstnet-0.10.dll
314	libgstnetbuffer-0.10.dll	308	libgstnetbuffer.dll
315	libgstpbutils-0.10.dll	309	libgstpbutils.dll
316	libgstreamer-0.10.dll	310	libgstreamer-0.10.dll
317	libgstriff-0.10.dll	311	libgstriff.dll
318	libgstrtp-0.10.dll	312	libgstrtp.dll
319	libgstrtsp-0.10.dll	313	libgstrtsp.dll
320	libgstsdp-0.10.dll	314	libgstsdp.dll
321	libgsttag-0.10.dll	315	libgsttag.dll
322	libgstvideo-0.10.dll	316	libgstvideo.dll
323	libjpeg.dll	317	libneon-27.dll
324	libmms.dll	318	libogg-0.dll
325	liboil-0.3-0.dll	319	liboil-0.3-0.dll
326	libpng13.dll	320	libopenjpeg-2.dll
327	libspeex.dll	321	libschroedinger-1.0-0.dll
		322	libspeex-1.dll
		323	libtheora-0.dll
		324	libvorbis-0.dll
		325	libvorbisenc-2.dll
		326	libxml2-2.dll
328	ogg.dll	327	ogg.dll
329	vorbis.dll	328	vorbis.dll
330	xvidcore.dll	329	xvidcore.dll
331	zlib1.dll	330	zlib1.dll
		331	libpng12-0.dll
332	)	332	)
333		333
334	copy_if_different(	334	copy_if_different(


diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp index 885ba7f..98f53ca 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.cpp +++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -291,10 +291,10 @@ void LLMediaImplGStreamer::set_gst_plugin_path()
291	// But we also want to search the path the user has set, if any.	291	// But we also want to search the path the user has set, if any.
292	std::string plugin_path =	292	std::string plugin_path =
293	"GST_PLUGIN_PATH=" +	293	"GST_PLUGIN_PATH=" +
294	imp_dir + separator +
295	#if LL_WINDOWS	294	#if LL_WINDOWS
296	imp_dir + "\\lib\\gstreamer-plugins" +	295	imp_dir + "\\lib\\gstreamer-plugins" +
297	#elif LL_DARWIN	296	#elif LL_DARWIN
		297	imp_dir + separator +
298	imp_dir + "/../Resources/lib/gstreamer-plugins" +	298	imp_dir + "/../Resources/lib/gstreamer-plugins" +
299	#endif	299	#endif
300	old_plugin_path;	300	old_plugin_path;


diff --git a/linden/install.xml b/linden/install.xml index c9ac3fd..41eec44 100644 --- a/linden/install.xml +++ b/linden/install.xml
@@ -393,9 +393,9 @@
393	<key>windows</key>	393	<key>windows</key>
394	<map>	394	<map>
395	<key>md5sum</key>	395	<key>md5sum</key>
396	<string>d5bfaa397dfbfc893603ad047c57604d</string>	396	<string>b1e0e16472c0e5d3b6291870e3f20b0c</string>
397	<key>url</key>	397	<key>url</key>
398	<uri>http://imprudence.s3.amazonaws.com/extras/glib-2.18.3.1-windows-01262009.tar.bz2</uri>	398	<uri>http://imprudenceviewer.org/download/libs/glib-2.18.4-windows-03162009.tar.bz2</uri>
399	</map>	399	</map>
400	</map>	400	</map>
401	</map>	401	</map>
@@ -430,9 +430,9 @@
430	<key>windows</key>	430	<key>windows</key>
431	<map>	431	<map>
432	<key>md5sum</key>	432	<key>md5sum</key>
433	<string>d3097ea059923e4f4ab5dc0b95d62a67</string>	433	<string>f8db21e781735ba5dd84f3043d20e882</string>
434	<key>url</key>	434	<key>url</key>
435	<uri>http://imprudence.s3.amazonaws.com/extras/gstreamer-0.10.21-windows-02132009.tar.bz2</uri>	435	<uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.22-windows-04172009.tar.bz2</uri>
436	</map>	436	</map>
437	</map>	437	</map>
438	</map>	438	</map>
@@ -445,9 +445,9 @@
445	<key>windows</key>	445	<key>windows</key>
446	<map>	446	<map>
447	<key>md5sum</key>	447	<key>md5sum</key>
448	<string>0a69a8ca39b54b3e1a838a508d2f72d0</string>	448	<string>1a55b7f4b5b14bc65609ac703277dba0</string>
449	<key>url</key>	449	<key>url</key>
450	<uri>http://imprudence.s3.amazonaws.com/extras/gstreamer-plugins-windows-02132009.tar.bz2</uri>	450	<uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-windows-05172009.tar.bz2</uri>
451	</map>	451	</map>
452	</map>	452	</map>
453	</map>	453	</map>
@@ -619,9 +619,9 @@ anguage Infrstructure (CLI) international standard</string>
619	<key>windows</key>	619	<key>windows</key>
620	<map>	620	<map>
621	<key>md5sum</key>	621	<key>md5sum</key>
622	<string>96ad03239a2b1d50584dcaf66162e03e</string>	622	<string>200bdf3c5a5489210fcee965f639a3f9</string>
623	<key>url</key>	623	<key>url</key>
624	<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.18-windows-20080613.tar.bz2</uri>	624	<uri>http://imprudenceviewer.org/download/libs/libpng-1.2.34-1-windows-04172009.tar.bz2</uri>
625	</map>	625	</map>
626	</map>	626	</map>
627	</map>	627	</map>
@@ -919,7 +919,7 @@ anguage Infrstructure (CLI) international standard</string>
919	<key>md5sum</key>	919	<key>md5sum</key>
920	<string>8913f8ace065b14792cb0ec889a5f99a</string>	920	<string>8913f8ace065b14792cb0ec889a5f99a</string>
921	<key>url</key>	921	<key>url</key>
922	<uri>https://imprudence.s3.amazonaws.com/extras/openjpeg-1.3-windows-20081211.tar.bz2</uri>	922	<uri>http://imprudence.s3.amazonaws.com/extras/openjpeg-1.3-windows-20081211.tar.bz2</uri>
923	</map>	923	</map>
924	</map>	924	</map>
925	</map>	925	</map>