From cf4ee03e4415d599c10729d920a1c085aed411ed Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Fri, 17 Apr 2009 20:23:18 -0700 Subject: Merged jacek/next into gst-revamp --- linden/indra/newview/Info-Imprudence.plist | 78 +++++++++++++++--------------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/Info-Imprudence.plist b/linden/indra/newview/Info-Imprudence.plist index 357d171..49aa2a7 100644 --- a/linden/indra/newview/Info-Imprudence.plist +++ b/linden/indra/newview/Info-Imprudence.plist @@ -1,39 +1,39 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - Imprudence - CFBundleIconFile - viewer.icns - CFBundleIdentifier - com.secondlife.indra.viewer - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Imprudence - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleURLTypes - - - CFBundleURLName - Second Life URL - CFBundleURLSchemes - - secondlife - - LSIsAppleDefaultForScheme - - - - CFBundleVersion - 1.0.0 - CSResourcesFileMapped - - - + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + Imprudence + CFBundleIconFile + viewer.icns + CFBundleIdentifier + com.secondlife.indra.viewer + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Imprudence + CFBundlePackageType + APPL + CFBundleSignature + ???? + CFBundleURLTypes + + + CFBundleURLName + Second Life URL + CFBundleURLSchemes + + secondlife + + LSIsAppleDefaultForScheme + + + + CFBundleVersion + 1.0.0 + CSResourcesFileMapped + + + -- cgit v1.1 From c6f86609c7669d27f8ebad97ea6695384e17ee12 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Fri, 17 Apr 2009 20:35:24 -0700 Subject: GST_PLUGIN_PATH should only search plugin directories for Windows --- linden/indra/llmedia/llmediaimplgstreamer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linden') diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp index 7eb2b7b..5978ba3 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; -- cgit v1.1 From b5253d473ba8bb841ce3c1a37bb5de63426e5fe6 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 18 Apr 2009 01:27:32 -0700 Subject: Removed 'https' from install.xml --- linden/install.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linden') diff --git a/linden/install.xml b/linden/install.xml index c1c79af..4fd3e63 100644 --- a/linden/install.xml +++ b/linden/install.xml @@ -919,7 +919,7 @@ anguage Infrstructure (CLI) international standard md5sum 8913f8ace065b14792cb0ec889a5f99a url - https://imprudence.s3.amazonaws.com/extras/openjpeg-1.3-windows-20081211.tar.bz2 + http://imprudence.s3.amazonaws.com/extras/openjpeg-1.3-windows-20081211.tar.bz2 -- cgit v1.1 From e91b28d14f1011b8389af43af0cba4fb0f572e2c Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 18 Apr 2009 01:37:54 -0700 Subject: Updated GStreamer plugin url --- linden/install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linden') diff --git a/linden/install.xml b/linden/install.xml index 4fd3e63..e1600dc 100644 --- a/linden/install.xml +++ b/linden/install.xml @@ -445,9 +445,9 @@ windows md5sum - 0a69a8ca39b54b3e1a838a508d2f72d0 + 4623b4a4c8ac4219d94abf7913612bb7 url - http://imprudence.s3.amazonaws.com/extras/gstreamer-plugins-windows-02132009.tar.bz2 + http://imprudenceviewer.org/download/libs/gstreamer-plugins-windows-04172009.tar.bz2 -- cgit v1.1 From 1272d128bb17f46da71e9b1df403385e247d1149 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 18 Apr 2009 01:45:57 -0700 Subject: Updated Windows GLib url --- linden/install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linden') diff --git a/linden/install.xml b/linden/install.xml index e1600dc..55db063 100644 --- a/linden/install.xml +++ b/linden/install.xml @@ -393,9 +393,9 @@ windows md5sum - d5bfaa397dfbfc893603ad047c57604d + b1e0e16472c0e5d3b6291870e3f20b0c url - http://imprudence.s3.amazonaws.com/extras/glib-2.18.3.1-windows-01262009.tar.bz2 + http://imprudenceviewer.org/download/libs/glib-2.18.4-windows-03162009.tar.bz2 -- cgit v1.1 From 288e7e57f2bd33866ac22082fe88040d7af54cfc Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 18 Apr 2009 02:28:59 -0700 Subject: Updated Windows GStreamer url --- linden/install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linden') diff --git a/linden/install.xml b/linden/install.xml index 55db063..41810be 100644 --- a/linden/install.xml +++ b/linden/install.xml @@ -430,9 +430,9 @@ windows md5sum - d3097ea059923e4f4ab5dc0b95d62a67 + f8db21e781735ba5dd84f3043d20e882 url - http://imprudence.s3.amazonaws.com/extras/gstreamer-0.10.21-windows-02132009.tar.bz2 + http://imprudenceviewer.org/download/libs/gstreamer-0.10.22-windows-04172009.tar.bz2 -- cgit v1.1 From 3b87006b6125c940414f15542a9c637e7c253069 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 18 Apr 2009 02:38:02 -0700 Subject: Updated Windows libpng url --- linden/install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linden') diff --git a/linden/install.xml b/linden/install.xml index 41810be..a756beb 100644 --- a/linden/install.xml +++ b/linden/install.xml @@ -619,9 +619,9 @@ anguage Infrstructure (CLI) international standard windows md5sum - 96ad03239a2b1d50584dcaf66162e03e + 200bdf3c5a5489210fcee965f639a3f9 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.18-windows-20080613.tar.bz2 + http://imprudenceviewer.org/download/libs/libpng-1.2.34-1-windows-04172009.tar.bz2 -- cgit v1.1 From 082a796953632fe1551d68fe9d0d74212785eae9 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 28 Apr 2009 13:05:56 -0700 Subject: Updated copy_win_libs for 1.1 RC3 --- linden/indra/cmake/CopyWinLibs.cmake | 424 +++++++++++++++++------------------ 1 file changed, 212 insertions(+), 212 deletions(-) (limited to 'linden') 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 - libgsta52.dll - libgstacmenc.dll - libgstadder.dll - libgstalaw.dll - libgstalpha.dll - libgstalphacolor.dll - libgstapp.dll - libgstasfdemux.dll - libgstaudiochunk.dll - libgstaudioconvert.dll - libgstaudiofx.dll - libgstaudiorate.dll - libgstaudioresample.dll - libgstaudiotestsrc.dll - libgstautodetect.dll - libgstavi.dll - libgstcoreelements.dll - libgstcutter.dll - libgstdecodebin.dll - libgstdecodebin2.dll - libgstdirectdraw.dll - libgstdirectsound.dll - libgstdshowdecwrapper.dll - libgstdshowsrcwrapper.dll - libgstdshowvideosink.dll - libgstfaad.dll - libgstffmpeg.dll - libgstffmpegcolorspace.dll - libgstflv.dll - libgstgamma.dll - libgstgdp.dll - libgsth264parse.dll - libgsticydemux.dll - libgstid3demux.dll - libgstjpeg.dll - libgstlevel.dll - libgstmms.dll - libgstmpeg2dec.dll - libgstmpeg4videoparse.dll - libgstmpegaudioparse.dll - libgstmpegstream.dll - libgstmpegvideoparse.dll - libgstmulaw.dll - libgstmultipart.dll - libgstneon.dll - libgstogg.dll - libgstpcapparse.dll - libgstplaybin.dll - libgstpng.dll - libgstqtdemux.dll - libgstqueue2.dll - libgstreal.dll - libgstrealmedia.dll - libgstrtp.dll - libgstrtpmanager.dll - libgstrtpmuxer.dll - libgstrtsp.dll - libgstsmpte.dll - libgsttheora.dll - libgsttypefindfunctions.dll - libgstudp.dll - libgstvideobalance.dll - libgstvideobox.dll - libgstvideocrop.dll - libgstvideomixer.dll - libgstvideorate.dll - libgstvideoscale.dll - libgstvideosignal.dll - libgstvolume.dll - libgstvorbis.dll - libgstwasapi.dll - libgstwavparse.dll - libgstwininet.dll - libgstwinks.dll - libgstx264.dll - libgstxvid.dll + 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( @@ -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 - libgsta52.dll - libgstacmenc.dll - libgstadder.dll - libgstalaw.dll - libgstalpha.dll - libgstalphacolor.dll - libgstapp.dll - libgstasfdemux.dll - libgstaudiochunk.dll - libgstaudioconvert.dll - libgstaudiofx.dll - libgstaudiorate.dll - libgstaudioresample.dll - libgstaudiotestsrc.dll - libgstautodetect.dll - libgstavi.dll - libgstcoreelements.dll - libgstcutter.dll - libgstdecodebin.dll - libgstdecodebin2.dll - libgstdirectdraw.dll - libgstdirectsound.dll - libgstdshowdecwrapper.dll - libgstdshowsrcwrapper.dll - libgstdshowvideosink.dll - libgstfaad.dll - libgstffmpeg.dll - libgstffmpegcolorspace.dll - libgstflv.dll - libgstgamma.dll - libgstgdp.dll - libgsth264parse.dll - libgsticydemux.dll - libgstid3demux.dll - libgstjpeg.dll - libgstlevel.dll - libgstmms.dll - libgstmpeg2dec.dll - libgstmpeg4videoparse.dll - libgstmpegaudioparse.dll - libgstmpegstream.dll - libgstmpegvideoparse.dll - libgstmulaw.dll - libgstmultipart.dll - libgstneon.dll - libgstogg.dll - libgstpcapparse.dll - libgstplaybin.dll - libgstpng.dll - libgstqtdemux.dll - libgstqueue2.dll - libgstreal.dll - libgstrealmedia.dll - libgstrtp.dll - libgstrtpmanager.dll - libgstrtpmuxer.dll - libgstrtsp.dll - libgstsmpte.dll - libgsttheora.dll - libgsttypefindfunctions.dll - libgstudp.dll - libgstvideobalance.dll - libgstvideobox.dll - libgstvideocrop.dll - libgstvideomixer.dll - libgstvideorate.dll - libgstvideoscale.dll - libgstvideosignal.dll - libgstvolume.dll - libgstvorbis.dll - libgstwasapi.dll - libgstwavparse.dll - libgstwininet.dll - libgstwinks.dll - libgstx264.dll - libgstxvid.dll + 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( @@ -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 - avformat-52.dll - avutil-49.dll - intl.dll - libfaacdrm.dll - libgstapp-0.10.dll - libgstaudio-0.10.dll - libgstbase-0.10.dll - libgstcdda-0.10.dll - libgstcontroller-0.10.dll - libgstdataprotocol-0.10.dll - libgstdshow-0.10.dll - libgstfft-0.10.dll - libgstinterfaces-0.10.dll - libgstnet-0.10.dll - libgstnetbuffer-0.10.dll - libgstpbutils-0.10.dll - libgstreamer-0.10.dll - libgstriff-0.10.dll - libgstrtp-0.10.dll - libgstrtsp-0.10.dll - libgstsdp-0.10.dll - libgsttag-0.10.dll - libgstvideo-0.10.dll - libjpeg.dll - libmms.dll - liboil-0.3-0.dll - libpng13.dll - libspeex.dll + charset.dll + intl.dll + libgcrypt-11.dll + libgnutls-26.dll + libgpg-error-0.dll + libgstapp.dll + libgstaudio.dll + libgstbase-0.10.dll + libgstcdda.dll + libgstcontroller-0.10.dll + libgstdataprotocol-0.10.dll + libgstdshow.dll + libgstfft.dll + libgstinterfaces.dll + libgstnet-0.10.dll + libgstnetbuffer.dll + libgstpbutils.dll + libgstreamer-0.10.dll + libgstriff.dll + libgstrtp.dll + libgstrtsp.dll + libgstsdp.dll + libgsttag.dll + libgstvideo.dll + libneon-27.dll + libogg-0.dll + liboil-0.3-0.dll + libopenjpeg-2.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 - avformat-52.dll - avutil-49.dll - intl.dll - libfaacdrm.dll - libgstapp-0.10.dll - libgstaudio-0.10.dll - libgstbase-0.10.dll - libgstcdda-0.10.dll - libgstcontroller-0.10.dll - libgstdataprotocol-0.10.dll - libgstdshow-0.10.dll - libgstfft-0.10.dll - libgstinterfaces-0.10.dll - libgstnet-0.10.dll - libgstnetbuffer-0.10.dll - libgstpbutils-0.10.dll - libgstreamer-0.10.dll - libgstriff-0.10.dll - libgstrtp-0.10.dll - libgstrtsp-0.10.dll - libgstsdp-0.10.dll - libgsttag-0.10.dll - libgstvideo-0.10.dll - libjpeg.dll - libmms.dll - liboil-0.3-0.dll - libpng13.dll - libspeex.dll + charset.dll + intl.dll + libgcrypt-11.dll + libgnutls-26.dll + libgpg-error-0.dll + libgstapp.dll + libgstaudio.dll + libgstbase-0.10.dll + libgstcdda.dll + libgstcontroller-0.10.dll + libgstdataprotocol-0.10.dll + libgstdshow.dll + libgstfft.dll + libgstinterfaces.dll + libgstnet-0.10.dll + libgstnetbuffer.dll + libgstpbutils.dll + libgstreamer-0.10.dll + libgstriff.dll + libgstrtp.dll + libgstrtsp.dll + libgstsdp.dll + libgsttag.dll + libgstvideo.dll + libneon-27.dll + libogg-0.dll + liboil-0.3-0.dll + libopenjpeg-2.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( -- cgit v1.1 From 843716545ed4f1c88f296766ffd61ff24ebc4e70 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 21 May 2009 17:29:31 -0700 Subject: Fixed gstreamer windows library --- linden/install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linden') diff --git a/linden/install.xml b/linden/install.xml index a756beb..f4ddffc 100644 --- a/linden/install.xml +++ b/linden/install.xml @@ -445,9 +445,9 @@ windows md5sum - 4623b4a4c8ac4219d94abf7913612bb7 + 1a55b7f4b5b14bc65609ac703277dba0 url - http://imprudenceviewer.org/download/libs/gstreamer-plugins-windows-04172009.tar.bz2 + http://imprudenceviewer.org/download/libs/gstreamer-plugins-windows-05172009.tar.bz2 -- cgit v1.1