From a84b98e31e99b361ea08dddee6183902cefbca59 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Thu, 17 Sep 2009 15:51:29 -0400 Subject: Rebuilt windows boost for CRT version DLL hell, upgrading to 1.39 in the process. --- indra/cmake/Boost.cmake | 2 +- indra/llmath/llmath.h | 1 + install.xml | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 0578ae95ff..efe9ad74d3 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -15,7 +15,7 @@ else (STANDALONE) set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) if (WINDOWS) - set(BOOST_VERSION 1_34_1) + set(BOOST_VERSION 1_39) if (MSVC71) set(BOOST_PROGRAM_OPTIONS_LIBRARY optimized libboost_program_options-vc71-mt-s-${BOOST_VERSION} diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h index f85c4f39f4..7a5d51ff76 100644 --- a/indra/llmath/llmath.h +++ b/indra/llmath/llmath.h @@ -35,6 +35,7 @@ #include #include +#include #include "lldefs.h" //#include "llstl.h" // *TODO: Remove when LLString is gone //#include "llstring.h" // *TODO: Remove when LLString is gone diff --git a/install.xml b/install.xml index 1e585b1bd5..e51835de3a 100644 --- a/install.xml +++ b/install.xml @@ -228,9 +228,9 @@ windows md5sum - 76a436d78f34286a7d13faca5f522f6b + 4f05166629caa4c132a7448eefb8d592 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-windows-20090803.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20090917.tar.bz2 -- cgit v1.2.3 From 33130868b2c64e47ff7c0b3d9547c8fa19f72b12 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Thu, 17 Sep 2009 16:05:02 -0400 Subject: Rebuild windows apr to fix CRT dll hell. Also upgrading to apr-1.3.8/apr-util-1.3.9 in the process for DEV-38196 vulnerability. --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.xml b/install.xml index e51835de3a..42f61beb0e 100644 --- a/install.xml +++ b/install.xml @@ -106,9 +106,9 @@ windows md5sum - abb339b5147f90e20b6090ee235d77a6 + a02619c1e30a3db02d3883bf1ad7a1e6 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.2.12-windows-20090702.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.8-windows-20090911.tar.bz2 -- cgit v1.2.3 From c2623d5ab45c3674858008e8e5f80e63bb95948e Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Thu, 17 Sep 2009 16:24:16 -0400 Subject: Rebuilding of windows curl to fix CRT dll hell. Also upgrading to 7.19.6 to avoid the need for special patching (see DEV-28321 vulnerability). --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.xml b/install.xml index 42f61beb0e..1a9e39bfb1 100644 --- a/install.xml +++ b/install.xml @@ -268,9 +268,9 @@ windows md5sum - 8c9d135f0e7cd1fae5681d4595942ee3 + 3a938b17b23f7511c84da99f2fc426ef url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.4-windows-20090306.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.19.6-windows-20090917.tar.bz2 -- cgit v1.2.3 From 8e8a5bd24f0219d3667cf752cb9860df382095c8 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Thu, 17 Sep 2009 17:41:16 -0400 Subject: Rebuilt the following libs to fix CRT dll hell: ares expat jpeglib libpng ndofdev xmlrpc-epi zlib --- install.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/install.xml b/install.xml index 1a9e39bfb1..22dde9d1d6 100644 --- a/install.xml +++ b/install.xml @@ -146,9 +146,9 @@ windows md5sum - 6a53b02a07527de680f1336e20f74f08 + 4e2d4de03dce8a991a5727c15a284e8d url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.4.0-windows-20080723.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.3.0-windows-20090917.tar.bz2 @@ -361,9 +361,9 @@ windows md5sum - cca5ca3759f645d4a124d4b96df7f717 + 5dbbdb4a9b5bec86d180ef20a5f8ccfb url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-windows-20080715.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-windows-20090917.tar.bz2 @@ -719,9 +719,9 @@ windows md5sum - e40d2df9aaefb3bd57289fe96766353a + 95258a666a35f507b9df9d720db56717 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-windows-20080723.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-windows-20090917.tar.bz2 @@ -873,9 +873,9 @@ anguage Infrstructure (CLI) international standard windows md5sum - a3975dcdb9a3ba0ca179b673b5e9b55e + c781cd9846cf20afb90ac40ad1a0ce9d url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-windows-20090306.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-windows-20090917.tar.bz2 @@ -1038,9 +1038,9 @@ anguage Infrstructure (CLI) international standard windows md5sum - 8ac100b5b711231b06be891c91cb68f3 + f0df8a1e60991095e3adca1450b8c9c0 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-windows-20080723.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-windows-20090917.tar.bz2 @@ -1402,9 +1402,9 @@ anguage Infrstructure (CLI) international standard windows md5sum - af723ab6a9b0222613b2de060bcec98c + 67dc0796be6c44ea1935f2db9c1e1c1d url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-windows-20090727.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-windows-20090917.tar.bz2 @@ -1442,9 +1442,9 @@ anguage Infrstructure (CLI) international standard windows md5sum - ddb09c2dd7d2caed1bd7cc1686c4214c + aa9e87b626ccb557bd94270a3598a74c url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3-windows-20090505.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3-windows-20090917.tar.bz2 -- cgit v1.2.3 From 8ae5de0e312be5706b6e1e351356ee1b41cfda59 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Thu, 17 Sep 2009 19:45:00 -0400 Subject: Fix for broken windows curl package I just built. Still version 7.19.6 as per DEV-28321. --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.xml b/install.xml index 1a9e39bfb1..4a55721699 100644 --- a/install.xml +++ b/install.xml @@ -268,9 +268,9 @@ windows md5sum - 3a938b17b23f7511c84da99f2fc426ef + 8dc4e818c2d6fbde76e9a5e34f4ffa72 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.19.6-windows-20090917.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.19.6-windows-20090917b.tar.bz2 -- cgit v1.2.3 From 5b98de7a4b78b9636e55f89275503c1f014195d7 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Thu, 17 Sep 2009 19:49:10 -0400 Subject: Fix for broken jpeglib package I just uploaded. --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.xml b/install.xml index 22dde9d1d6..4691eeb1a2 100644 --- a/install.xml +++ b/install.xml @@ -719,9 +719,9 @@ windows md5sum - 95258a666a35f507b9df9d720db56717 + 6a6bb0143a2561e3276dab4bcfa425ef url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-windows-20090917.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-windows-20090917a.tar.bz2 -- cgit v1.2.3 From 9615727329e7f520259e364f02719c0dc0f458bc Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Thu, 17 Sep 2009 19:58:59 -0400 Subject: New build of windows freetype to fix CRT dll hell. This also upgrades to 2.3.9 (DEV-32831). When this merges to viewer-2.0 it should replace the build there. --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.xml b/install.xml index 4691eeb1a2..e0516706de 100644 --- a/install.xml +++ b/install.xml @@ -464,9 +464,9 @@ windows md5sum - 688944a961e16c2a89f81b60b2ff3acf + 88980fd6d91ac541b62dea877ebe6ba6 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.1.5-windows-20080822.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-windows-20090917.tar.bz2 -- cgit v1.2.3