diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index d1f089891..5c434f4bf 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -29,12 +29,12 @@ else (STANDALONE) ) elseif (DARWIN) set(APR_LIBRARIES - debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.0.3.7.dylib - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.3.7.dylib + debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.0.dylib + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.dylib ) set(APRUTIL_LIBRARIES - debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.3.8.dylib - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.3.8.dylib + debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.dylib + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.dylib ) set(APRICONV_LIBRARIES iconv) else (WINDOWS) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index b492ddaef..8f49f94a9 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -514,8 +514,8 @@ class DarwinManifest(ViewerManifest): libfile = "lib%s.dylib" libdir = "../../libraries/universal-darwin/lib_release" - for libfile in ("libapr-1.0.3.7.dylib", - "libaprutil-1.0.3.8.dylib", + for libfile in ("libapr-1.0.dylib", + "libaprutil-1.0.dylib", "libexpat.0.5.0.dylib"): self.path(os.path.join(libdir, libfile), libfile) @@ -541,8 +541,8 @@ class DarwinManifest(ViewerManifest): mac_crash_logger_res_path = self.dst_path_of("mac-crash-logger.app/Contents/Resources") slplugin_res_path = self.dst_path_of("SLPlugin.app/Contents/Resources") for libfile in ("libllcommon.dylib", - "libapr-1.0.3.7.dylib", - "libaprutil-1.0.3.8.dylib", + "libapr-1.0.dylib", + "libaprutil-1.0.dylib", "libexpat.0.5.0.dylib"): target_lib = os.path.join('../../..', libfile) self.run_command("ln -sf %(target)r %(link)r" % diff --git a/install.xml b/install.xml index d7ce8c54d..23be3cc8d 100644 --- a/install.xml +++ b/install.xml @@ -29,7 +29,7 @@ - freeglut + freeglut copyright Copyright (c) 1999-2000 Pawel W. Olszta. @@ -90,9 +90,9 @@ darwin md5sum - 115d8ac44a91efdb173e9b3e478c46b6 + 2486db13c5ed9340855da3c1c48772af url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.7-darwin-20090805.tar.bz2 + https://github.com/downloads/LightDrake/SingularityViewer/apr_suite-1.4.2-darwin-20110217.tar.bz2 linux @@ -172,7 +172,7 @@ md5sum a2cde4f24bdcc260b661e139846b8acd url - http://imprudenceviewer.org/download/libs/imprudence-artwork-20101026.tar.bz2 + http://imprudenceviewer.org/download/libs/imprudence-artwork-20101026.tar.bz2 @@ -200,14 +200,14 @@ md5sum 2cad51575b429be4fdadb5d63da1c739 url - https://github.com/downloads/siana/SingularityViewer/boost-1.45.0-darwin-20110604.tar.bz2 + https://github.com/downloads/siana/SingularityViewer/boost-1.45.0-darwin-20110604.tar.bz2 linux md5sum a2d2fff5cc5555ffd9865daedfcd0dd5 url - https://github.com/downloads/siana/SingularityViewer/boost-1.45.0-linux-20110604.tar.bz2 + https://github.com/downloads/siana/SingularityViewer/boost-1.45.0-linux-20110604.tar.bz2 windows @@ -218,46 +218,46 @@ - curl - - copyright - Copyright (c) 1996 - 2008, Daniel Stenberg, <daniel@haxx.se>. - description - Client-side URL transfer library. Handles moving data across the net in many different protocols. Used to GET/POST/PUT/DELETE web resources. - license - curl - packages - - darwin - - md5sum - 525f6b18ea5af8fbd691c2ac1769056c - url - https://github.com/downloads/Shyotl/SingularityViewer/curl-7.20.1-darwin-20100606.tar.bz2 - - linux - - md5sum - 6244eec15fb26f9577785625fdb38f78 - url - https://github.com/downloads/Shyotl/SingularityViewer/curl-7.20.1-linux-20100527.tar.bz2 - - linux64 - - md5sum - 8a28849f4b9d99601dbc8db9d6a2f9ba - url - https://github.com/downloads/Shyotl/SingularityViewer/curl-7.16.4a-linux64-20090303.tar.bz2 - - windows - - md5sum - 60ed73408c4050ff9c96f26771fd6b46 - url - https://github.com/downloads/siana/SingularityViewer/curl-7.21.1-windows-20110504.tar.bz2 - - - + curl + + copyright + Copyright (c) 1996 - 2008, Daniel Stenberg, <daniel@haxx.se>. + description + Client-side URL transfer library. Handles moving data across the net in many different protocols. Used to GET/POST/PUT/DELETE web resources. + license + curl + packages + + darwin + + md5sum + 525f6b18ea5af8fbd691c2ac1769056c + url + https://github.com/downloads/Shyotl/SingularityViewer/curl-7.20.1-darwin-20100606.tar.bz2 + + linux + + md5sum + 6244eec15fb26f9577785625fdb38f78 + url + https://github.com/downloads/Shyotl/SingularityViewer/curl-7.20.1-linux-20100527.tar.bz2 + + linux64 + + md5sum + 8a28849f4b9d99601dbc8db9d6a2f9ba + url + https://github.com/downloads/Shyotl/SingularityViewer/curl-7.16.4a-linux64-20090303.tar.bz2 + + windows + + md5sum + 60ed73408c4050ff9c96f26771fd6b46 + url + https://github.com/downloads/siana/SingularityViewer/curl-7.21.1-windows-20110504.tar.bz2 + + + dbghelp copyright @@ -546,14 +546,14 @@ md5sum b190d8a0dce8dd8b514d2adb2c74b8d8 url - http://sldev.free.fr/libraries/google-perftools-1.8.3-linux-20110924.tar.bz2 + http://sldev.free.fr/libraries/google-perftools-1.8.3-linux-20110924.tar.bz2 windows md5sum 4f787437a5e063ccde6637dfb1ebc01d url - https://bitbucket.org/Ansariel/phoenix-prebuilts/downloads/google_perftools-1.8-windows-20111005.tar.bz2 + https://bitbucket.org/Ansariel/phoenix-prebuilts/downloads/google_perftools-1.8-windows-20111005.tar.bz2 @@ -995,7 +995,7 @@ anguage Infrstructure (CLI) international standard md5sum 38abfe002ba073b6824016db98269972 url - http://imprudenceviewer.org/download/libs/ndofdev-linux32-0.3.1-20100817.tar.bz2 + http://imprudenceviewer.org/download/libs/ndofdev-linux32-0.3.1-20100817.tar.bz2 linux64 @@ -1028,14 +1028,14 @@ anguage Infrstructure (CLI) international standard md5sum 5a154313bc30eacd8cfa1acd852ecd3e url - https://github.com/downloads/siana/SingularityViewer/ogg_vorbis-1.2.2-1.3.2-darwin-20110616.tar.bz2 + https://github.com/downloads/siana/SingularityViewer/ogg_vorbis-1.2.2-1.3.2-darwin-20110616.tar.bz2 linux md5sum 712b1d30790e9de83fea84ec3bc8fab0 url - https://github.com/downloads/siana/SingularityViewer/ogg_vorbis-1.2.2-1.3.2-linux-20110616.tar.bz2 + https://github.com/downloads/siana/SingularityViewer/ogg_vorbis-1.2.2-1.3.2-linux-20110616.tar.bz2 linux64 @@ -1227,10 +1227,10 @@ anguage Infrstructure (CLI) international standard 32bitcompatibilitylibs copyright - Copyrights: Libidn: Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 - Simon Josefsson. License GPL v3.0. - Freealut, libuuid, openal-soft: see copyright and license of the - according main packages. + Copyrights: Libidn: Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + Simon Josefsson. License GPL v3.0. + Freealut, libuuid, openal-soft: see copyright and license of the + according main packages. description 32bit libraries needed for using voice @@ -1300,9 +1300,9 @@ anguage Infrstructure (CLI) international standard darwin md5sum - c844e1b05723ce078dbbd5aea9cdd3ad + 58ef62004b508b234039f6a313d852eb url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.1.4-darwin-20080818.tar.bz2 + https://github.com/downloads/LightDrake/SingularityViewer/zlib-1.2.5-darwin-20110211.tar.bz2 linux