aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-05-02 22:49:55 +1000
committerDavid Walter Seikel2013-05-02 22:49:55 +1000
commitffe6207af4fd2e731aba4248629a622514a44852 (patch)
tree3a4278c5442430cad0051c2f85e3dba0fad6ed31 /linden
parentAdd more credits, including my own. (diff)
downloadmeta-impy-ffe6207af4fd2e731aba4248629a622514a44852.zip
meta-impy-ffe6207af4fd2e731aba4248629a622514a44852.tar.gz
meta-impy-ffe6207af4fd2e731aba4248629a622514a44852.tar.bz2
meta-impy-ffe6207af4fd2e731aba4248629a622514a44852.tar.xz
Update boost on Linux to 1.52.
Mac and Windows will be done when I can test them better.
Diffstat (limited to 'linden')
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py40
-rwxr-xr-xlinden/install.xml29
2 files changed, 32 insertions, 37 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index ea18cd2..01e422f 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1023,9 +1023,27 @@ class Linux_i686Manifest(LinuxManifest):
1023 #self.path("libgstvolume.so") 1023 #self.path("libgstvolume.so")
1024 #self.path("libgstvorbis.so") 1024 #self.path("libgstvorbis.so")
1025 #self.path("libgstwavparse.so") 1025 #self.path("libgstwavparse.so")
1026 1026
1027 #self.end_prefix("gstreamer-plugins") 1027 #self.end_prefix("gstreamer-plugins")
1028 1028
1029 # Wish I could kill it with fire. lol
1030 self.path("libboost_date_time-mt.so")
1031 self.path("libboost_date_time-mt.so.1.52.0")
1032 self.path("libboost_filesystem-mt.so")
1033 self.path("libboost_filesystem-mt.so.1.52.0")
1034 self.path("libboost_iostreams-mt.so")
1035 self.path("libboost_iostreams-mt.so.1.52.0")
1036 self.path("libboost_program_options-mt.so")
1037 self.path("libboost_program_options-mt.so.1.52.0")
1038 self.path("libboost_regex-mt.so")
1039 self.path("libboost_regex-mt.so.1.52.0")
1040 self.path("libboost_signals-mt.so")
1041 self.path("libboost_signals-mt.so.1.52.0")
1042 self.path("libboost_system-mt.so")
1043 self.path("libboost_system-mt.so.1.52.0")
1044 self.path("libboost_thread-mt.so")
1045 self.path("libboost_thread-mt.so.1.52.0")
1046
1029 self.end_prefix("lib") 1047 self.end_prefix("lib")
1030 1048
1031 # Vivox runtimes and libs 1049 # Vivox runtimes and libs
@@ -1128,23 +1146,21 @@ class Linux_x86_64Manifest(LinuxManifest):
1128 1146
1129 # Wish I could kill it with fire. lol 1147 # Wish I could kill it with fire. lol
1130 self.path("libboost_date_time-mt.so") 1148 self.path("libboost_date_time-mt.so")
1131 self.path("libboost_date_time-mt.so.1.48.0") 1149 self.path("libboost_date_time-mt.so.1.52.0")
1132 self.path("libboost_filesystem-mt.so") 1150 self.path("libboost_filesystem-mt.so")
1133 self.path("libboost_filesystem-mt.so.1.48.0") 1151 self.path("libboost_filesystem-mt.so.1.52.0")
1134 self.path("libboost_iostreams-mt.so") 1152 self.path("libboost_iostreams-mt.so")
1135 self.path("libboost_iostreams-mt.so.1.48.0") 1153 self.path("libboost_iostreams-mt.so.1.52.0")
1136 self.path("libboost_program_options-mt.so") 1154 self.path("libboost_program_options-mt.so")
1137 self.path("libboost_program_options-mt.so.1.48.0") 1155 self.path("libboost_program_options-mt.so.1.52.0")
1138 self.path("libboost_regex-mt.so") 1156 self.path("libboost_regex-mt.so")
1139 self.path("libboost_regex-mt.so.1.48.0") 1157 self.path("libboost_regex-mt.so.1.52.0")
1140 self.path("libboost_signals-mt.so") 1158 self.path("libboost_signals-mt.so")
1141 self.path("libboost_signals-mt.so.1.48.0") 1159 self.path("libboost_signals-mt.so.1.52.0")
1142 self.path("libboost_system-mt.so") 1160 self.path("libboost_system-mt.so")
1143 self.path("libboost_system-mt.so.1.48.0") 1161 self.path("libboost_system-mt.so.1.52.0")
1144 self.path("libboost_thread-mt.so") 1162 self.path("libboost_thread-mt.so")
1145 self.path("libboost_thread-mt.so.1.48.0") 1163 self.path("libboost_thread-mt.so.1.52.0")
1146 self.path("libboost_wave-mt.so")
1147 self.path("libboost_wave-mt.so.1.48.0")
1148 1164
1149 self.end_prefix("lib64") 1165 self.end_prefix("lib64")
1150 1166
diff --git a/linden/install.xml b/linden/install.xml
index c18e55a..dff0768 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -195,16 +195,16 @@
195 <key>linux</key> 195 <key>linux</key>
196 <map> 196 <map>
197 <key>md5sum</key> 197 <key>md5sum</key>
198 <string>4db3d74e40d149eeec06f4d97a609bb1</string> 198 <string>146ed8a8c2ef8ab3f0a6c4f214fc5c22</string>
199 <key>url</key> 199 <key>url</key>
200 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100624.tar.bz2</uri> 200 <uri>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/268347/arch/Linux/installer/boost-1.52.0-linux-20121218.tar.bz2</uri>
201 </map> 201 </map>
202 <key>linux64</key> 202 <key>linux64</key>
203 <map> 203 <map>
204 <key>md5sum</key> 204 <key>md5sum</key>
205 <string>fb26c88983b6bf9b5042d00bfdd3ade4</string> 205 <string>b9dbe1ab34187a9a6f53fd89f88060d2</string>
206 <key>url</key> 206 <key>url</key>
207 <uri>https://bitbucket.org/kokua/3p-boost/downloads/boost-1.48.0-linux64-20130103.tar.bz2</uri> 207 <uri>https://bitbucket.org/kokua/3p-boost-64/downloads/boost-1.52.0-linux64-20130107.tar.bz2</uri>
208 </map> 208 </map>
209 <key>windows</key> 209 <key>windows</key>
210 <map> 210 <map>
@@ -701,27 +701,6 @@ cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Re
701 </map> 701 </map>
702 </map> 702 </map>
703 </map> 703 </map>
704 <key>icu</key>
705 <map>
706 <key>copyright</key>
707 <string>various</string>
708 <key>description</key>
709 <string>Unicode and globalization support for software applications.</string>
710 <key>license</key>
711 <string>icu</string>
712 <key>license</key>
713 <string>unicode-license</string>
714 <key>packages</key>
715 <map>
716 <key>linux64</key>
717 <map>
718 <key>md5sum</key>
719 <string>bc3226223f0d14881a84c2e836c4a81a</string>
720 <key>url</key>
721 <uri>https://bitbucket.org/kokua/3p-icu4c-64/downloads/icu4c-48.1-linux64-20121227.tar.bz2</uri>
722 </map>
723 </map>
724 </map>
725 <key>jpeglib</key> 704 <key>jpeglib</key>
726 <map> 705 <map>
727 <key>copyright</key> 706 <key>copyright</key>