From 3a4a8e409899a317e6635578764f30616e686123 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Mon, 8 Jun 2009 03:32:01 -0700 Subject: Placed the gstreamer plugins in newview where they belong --- ChangeLog.txt | 5 ++ linden/indra/cmake/CopyWinLibs.cmake | 166 ----------------------------------- linden/install.xml | 4 +- 3 files changed, 7 insertions(+), 168 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index a4c0aed..8376c1a 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -29,6 +29,11 @@ * Updated windows iconv archive. modified: linden/install.xml + + * Placed the gstreamer plugins in newview where they belong. + + modified: linden/indra/cmake/CopyWinLibs.cmake + modified: linden/install.xml =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index d43bbd7..afc99d6 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake @@ -6,172 +6,6 @@ include(CMakeCopyIfDifferent) -set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/lib/gstreamer-plugins") -set(gst_plugin_release_files - libgstaacparse.dll - libgstadder.dll - libgstaiffparse.dll - libgstalaw.dll - libgstalpha.dll - libgstasfdemux.dll - libgstaudioconvert.dll - libgstaudiofx.dll - libgstaudiorate.dll - libgstaudioresample.dll - libgstauparse.dll - libgstautoconvert.dll - libgstautodetect.dll - libgstavi.dll - libgstcoreelements.dll - libgstcutter.dll - libgstdecodebin.dll - libgstdecodebin2.dll - libgstdshowdecwrapper.dll - libgstdshowsrcwrapper.dll - libgstdshowvideosink.dll - libgstffmpeg.dll - libgstffmpegcolorspace.dll - libgstflv.dll - libgstgdp.dll - libgstgio.dll - libgsth264parse.dll - libgsticydemux.dll - libgstid3demux.dll - libgstinterleave.dll - libgstjpeg.dll - libgstmpeg4videoparse.dll - libgstmpegaudioparse.dll - libgstmpegdemux.dll - libgstmpegstream.dll - libgstmpegtsmux.dll - libgstmpegvideoparse.dll - libgstmulaw.dll - libgstmultifile.dll - libgstneon.dll - libgstplaybin.dll - libgstpng.dll - libgstqtdemux.dll - libgstqtmux.dll - libgstqueue2.dll - libgstreal.dll - libgstrealmedia.dll - libgstrtpmanager.dll - libgstrtpmux.dll - libgstrtp_good.dll - libgstrtsp_good.dll - libgstselector.dll - libgstsmpte.dll - libgsttheora.dll - libgsttypefindfunctions.dll - libgstudp.dll - libgstvideobox.dll - libgstvideocrop.dll - libgstvideofilterbalance.dll - libgstvideofiltergamma.dll - libgstvideomixer.dll - libgstvideorate.dll - libgstvideoscale.dll - libgstvideosignal.dll - libgstvolume.dll - libgstwasapi.dll - libgstwaveform.dll - libgstwavparse.dll - libgstwininet.dll - libgstwinks.dll - libgstx264.dll - ) - -copy_if_different( - ${gst_plugin_release_dir} - "${CMAKE_CURRENT_BINARY_DIR}/Release/lib/gstreamer-plugins" - out_targets - ${gst_plugin_release_files} - ) -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 - libgstaacparse.dll - libgstadder.dll - libgstaiffparse.dll - libgstalaw.dll - libgstalpha.dll - libgstasfdemux.dll - libgstaudioconvert.dll - libgstaudiofx.dll - libgstaudiorate.dll - libgstaudioresample.dll - libgstauparse.dll - libgstautoconvert.dll - libgstautodetect.dll - libgstavi.dll - libgstcoreelements.dll - libgstcutter.dll - libgstdecodebin.dll - libgstdecodebin2.dll - libgstdshowdecwrapper.dll - libgstdshowsrcwrapper.dll - libgstdshowvideosink.dll - libgstffmpeg.dll - libgstffmpegcolorspace.dll - libgstflv.dll - libgstgdp.dll - libgstgio.dll - libgsth264parse.dll - libgsticydemux.dll - libgstid3demux.dll - libgstinterleave.dll - libgstjpeg.dll - libgstmpeg4videoparse.dll - libgstmpegaudioparse.dll - libgstmpegdemux.dll - libgstmpegstream.dll - libgstmpegtsmux.dll - libgstmpegvideoparse.dll - libgstmulaw.dll - libgstmultifile.dll - libgstneon.dll - libgstplaybin.dll - libgstpng.dll - libgstqtdemux.dll - libgstqtmux.dll - libgstqueue2.dll - libgstreal.dll - libgstrealmedia.dll - libgstrtpmanager.dll - libgstrtpmux.dll - libgstrtp_good.dll - libgstrtsp_good.dll - libgstselector.dll - libgstsmpte.dll - libgsttheora.dll - libgsttypefindfunctions.dll - libgstudp.dll - libgstvideobox.dll - libgstvideocrop.dll - libgstvideofilterbalance.dll - libgstvideofiltergamma.dll - libgstvideomixer.dll - libgstvideorate.dll - libgstvideoscale.dll - libgstvideosignal.dll - libgstvolume.dll - libgstwasapi.dll - libgstwaveform.dll - libgstwavparse.dll - libgstwininet.dll - libgstwinks.dll - libgstx264.dll - ) - -copy_if_different( - ${gst_plugin_debug_dir} - "${CMAKE_CURRENT_BINARY_DIR}/Debug/lib/gstreamer-plugins" - out_targets - ${gst_plugin_debug_files} - ) -set(all_targets ${all_targets} ${out_targets}) - set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug") set(debug_files alut.dll diff --git a/linden/install.xml b/linden/install.xml index 0fca7fc..e11b930 100644 --- a/linden/install.xml +++ b/linden/install.xml @@ -604,9 +604,9 @@ <key>windows</key> <map> <key>md5sum</key> - <string>1a55b7f4b5b14bc65609ac703277dba0</string> + <string>9693550810903d5bca10e018fccd7994</string> <key>url</key> - <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-windows-05172009.tar.bz2</uri> + <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-windows-20090608.tar.bz2</uri> </map> </map> </map> -- cgit v1.1