diff options
-rw-r--r-- | ChangeLog.txt | 5 | ||||
-rw-r--r-- | linden/indra/cmake/CopyWinLibs.cmake | 166 | ||||
-rw-r--r-- | 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 @@ | |||
29 | * Updated windows iconv archive. | 29 | * Updated windows iconv archive. |
30 | 30 | ||
31 | modified: linden/install.xml | 31 | modified: linden/install.xml |
32 | |||
33 | * Placed the gstreamer plugins in newview where they belong. | ||
34 | |||
35 | modified: linden/indra/cmake/CopyWinLibs.cmake | ||
36 | modified: linden/install.xml | ||
32 | 37 | ||
33 | 38 | ||
34 | =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- | 39 | =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- |
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 @@ | |||
6 | 6 | ||
7 | include(CMakeCopyIfDifferent) | 7 | include(CMakeCopyIfDifferent) |
8 | 8 | ||
9 | set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/lib/gstreamer-plugins") | ||
10 | set(gst_plugin_release_files | ||
11 | libgstaacparse.dll | ||
12 | libgstadder.dll | ||
13 | libgstaiffparse.dll | ||
14 | libgstalaw.dll | ||
15 | libgstalpha.dll | ||
16 | libgstasfdemux.dll | ||
17 | libgstaudioconvert.dll | ||
18 | libgstaudiofx.dll | ||
19 | libgstaudiorate.dll | ||
20 | libgstaudioresample.dll | ||
21 | libgstauparse.dll | ||
22 | libgstautoconvert.dll | ||
23 | libgstautodetect.dll | ||
24 | libgstavi.dll | ||
25 | libgstcoreelements.dll | ||
26 | libgstcutter.dll | ||
27 | libgstdecodebin.dll | ||
28 | libgstdecodebin2.dll | ||
29 | libgstdshowdecwrapper.dll | ||
30 | libgstdshowsrcwrapper.dll | ||
31 | libgstdshowvideosink.dll | ||
32 | libgstffmpeg.dll | ||
33 | libgstffmpegcolorspace.dll | ||
34 | libgstflv.dll | ||
35 | libgstgdp.dll | ||
36 | libgstgio.dll | ||
37 | libgsth264parse.dll | ||
38 | libgsticydemux.dll | ||
39 | libgstid3demux.dll | ||
40 | libgstinterleave.dll | ||
41 | libgstjpeg.dll | ||
42 | libgstmpeg4videoparse.dll | ||
43 | libgstmpegaudioparse.dll | ||
44 | libgstmpegdemux.dll | ||
45 | libgstmpegstream.dll | ||
46 | libgstmpegtsmux.dll | ||
47 | libgstmpegvideoparse.dll | ||
48 | libgstmulaw.dll | ||
49 | libgstmultifile.dll | ||
50 | libgstneon.dll | ||
51 | libgstplaybin.dll | ||
52 | libgstpng.dll | ||
53 | libgstqtdemux.dll | ||
54 | libgstqtmux.dll | ||
55 | libgstqueue2.dll | ||
56 | libgstreal.dll | ||
57 | libgstrealmedia.dll | ||
58 | libgstrtpmanager.dll | ||
59 | libgstrtpmux.dll | ||
60 | libgstrtp_good.dll | ||
61 | libgstrtsp_good.dll | ||
62 | libgstselector.dll | ||
63 | libgstsmpte.dll | ||
64 | libgsttheora.dll | ||
65 | libgsttypefindfunctions.dll | ||
66 | libgstudp.dll | ||
67 | libgstvideobox.dll | ||
68 | libgstvideocrop.dll | ||
69 | libgstvideofilterbalance.dll | ||
70 | libgstvideofiltergamma.dll | ||
71 | libgstvideomixer.dll | ||
72 | libgstvideorate.dll | ||
73 | libgstvideoscale.dll | ||
74 | libgstvideosignal.dll | ||
75 | libgstvolume.dll | ||
76 | libgstwasapi.dll | ||
77 | libgstwaveform.dll | ||
78 | libgstwavparse.dll | ||
79 | libgstwininet.dll | ||
80 | libgstwinks.dll | ||
81 | libgstx264.dll | ||
82 | ) | ||
83 | |||
84 | copy_if_different( | ||
85 | ${gst_plugin_release_dir} | ||
86 | "${CMAKE_CURRENT_BINARY_DIR}/Release/lib/gstreamer-plugins" | ||
87 | out_targets | ||
88 | ${gst_plugin_release_files} | ||
89 | ) | ||
90 | set(all_targets ${all_targets} ${out_targets}) | ||
91 | |||
92 | set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/lib/gstreamer-plugins") | ||
93 | set(gst_plugin_debug_files | ||
94 | libgstaacparse.dll | ||
95 | libgstadder.dll | ||
96 | libgstaiffparse.dll | ||
97 | libgstalaw.dll | ||
98 | libgstalpha.dll | ||
99 | libgstasfdemux.dll | ||
100 | libgstaudioconvert.dll | ||
101 | libgstaudiofx.dll | ||
102 | libgstaudiorate.dll | ||
103 | libgstaudioresample.dll | ||
104 | libgstauparse.dll | ||
105 | libgstautoconvert.dll | ||
106 | libgstautodetect.dll | ||
107 | libgstavi.dll | ||
108 | libgstcoreelements.dll | ||
109 | libgstcutter.dll | ||
110 | libgstdecodebin.dll | ||
111 | libgstdecodebin2.dll | ||
112 | libgstdshowdecwrapper.dll | ||
113 | libgstdshowsrcwrapper.dll | ||
114 | libgstdshowvideosink.dll | ||
115 | libgstffmpeg.dll | ||
116 | libgstffmpegcolorspace.dll | ||
117 | libgstflv.dll | ||
118 | libgstgdp.dll | ||
119 | libgstgio.dll | ||
120 | libgsth264parse.dll | ||
121 | libgsticydemux.dll | ||
122 | libgstid3demux.dll | ||
123 | libgstinterleave.dll | ||
124 | libgstjpeg.dll | ||
125 | libgstmpeg4videoparse.dll | ||
126 | libgstmpegaudioparse.dll | ||
127 | libgstmpegdemux.dll | ||
128 | libgstmpegstream.dll | ||
129 | libgstmpegtsmux.dll | ||
130 | libgstmpegvideoparse.dll | ||
131 | libgstmulaw.dll | ||
132 | libgstmultifile.dll | ||
133 | libgstneon.dll | ||
134 | libgstplaybin.dll | ||
135 | libgstpng.dll | ||
136 | libgstqtdemux.dll | ||
137 | libgstqtmux.dll | ||
138 | libgstqueue2.dll | ||
139 | libgstreal.dll | ||
140 | libgstrealmedia.dll | ||
141 | libgstrtpmanager.dll | ||
142 | libgstrtpmux.dll | ||
143 | libgstrtp_good.dll | ||
144 | libgstrtsp_good.dll | ||
145 | libgstselector.dll | ||
146 | libgstsmpte.dll | ||
147 | libgsttheora.dll | ||
148 | libgsttypefindfunctions.dll | ||
149 | libgstudp.dll | ||
150 | libgstvideobox.dll | ||
151 | libgstvideocrop.dll | ||
152 | libgstvideofilterbalance.dll | ||
153 | libgstvideofiltergamma.dll | ||
154 | libgstvideomixer.dll | ||
155 | libgstvideorate.dll | ||
156 | libgstvideoscale.dll | ||
157 | libgstvideosignal.dll | ||
158 | libgstvolume.dll | ||
159 | libgstwasapi.dll | ||
160 | libgstwaveform.dll | ||
161 | libgstwavparse.dll | ||
162 | libgstwininet.dll | ||
163 | libgstwinks.dll | ||
164 | libgstx264.dll | ||
165 | ) | ||
166 | |||
167 | copy_if_different( | ||
168 | ${gst_plugin_debug_dir} | ||
169 | "${CMAKE_CURRENT_BINARY_DIR}/Debug/lib/gstreamer-plugins" | ||
170 | out_targets | ||
171 | ${gst_plugin_debug_files} | ||
172 | ) | ||
173 | set(all_targets ${all_targets} ${out_targets}) | ||
174 | |||
175 | set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug") | 9 | set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug") |
176 | set(debug_files | 10 | set(debug_files |
177 | alut.dll | 11 | 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 @@ | |||
604 | <key>windows</key> | 604 | <key>windows</key> |
605 | <map> | 605 | <map> |
606 | <key>md5sum</key> | 606 | <key>md5sum</key> |
607 | <string>1a55b7f4b5b14bc65609ac703277dba0</string> | 607 | <string>9693550810903d5bca10e018fccd7994</string> |
608 | <key>url</key> | 608 | <key>url</key> |
609 | <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-windows-05172009.tar.bz2</uri> | 609 | <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-windows-20090608.tar.bz2</uri> |
610 | </map> | 610 | </map> |
611 | </map> | 611 | </map> |
612 | </map> | 612 | </map> |