From f680c91a09a4d0560fd8e1065b4427afc3c6e3f3 Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Wed, 2 Mar 2011 14:50:49 -0800
Subject: update openjpeg package usage for windows.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 819bc27c1e..a6d594a6b5 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1356,9 +1356,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>039c65405b2bea7c1bf67cfeb15a67fe</string>
+ <string>ca5765af55f798724d601720afdf6953</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3-windows-20101001b.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openjpeg/rev/222548/arch/CYGWIN/installer/openjpeg-1.4-windows-20110302.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
--
cgit v1.2.3
From d0ed06ffcae08a11ee8b5ff35692b25b5cbbb48a Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Thu, 3 Mar 2011 11:23:09 -0800
Subject: resolve merge conflict.
---
build.sh | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/build.sh b/build.sh
index 31820f9058..625a09009b 100755
--- a/build.sh
+++ b/build.sh
@@ -51,26 +51,7 @@ pre_build()
{
local variant="$1"
begin_section "Pre$variant"
-<<<<<<< local
- #export PATH="/cygdrive/c/Program Files/Microsoft Visual Studio 8/Common7/IDE/:$PATH"
- python develop.py \
- --incredibuild \
- --unattended \
- -t $variant \
- -G "$cmake_generator" \
- configure \
- -DGRID:STRING="$viewer_grid" \
- -DVIEWER_CHANNEL:STRING="$viewer_channel" \
- -DVIEWER_LOGIN_CHANNEL:STRING="$login_channel" \
- -DINSTALL_PROPRIETARY:BOOL=ON \
- -DRELEASE_CRASH_REPORTING:BOOL=ON \
- -DLOCALIZESETUP:BOOL=ON \
- -DPACKAGE:BOOL=ON \
- -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
- -DLL_TESTS:BOOL="$run_tests"
-=======
- "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON -DUSE_PRECOMPILED_HEADERS=FALSE
->>>>>>> other
+ "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON -DUSE_PRECOMPILED_HEADERS=FALSE
end_section "Pre$variant"
}
--
cgit v1.2.3
From 9bd9a556087fa1fc2dc68ed807a55c4a35ffc622 Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Thu, 3 Mar 2011 14:42:48 -0800
Subject: hacky addition of VSTool postprocessing to set startup project and
default configuration.
---
autobuild.xml | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/autobuild.xml b/autobuild.xml
index a090833b51..abffc9fe28 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1904,6 +1904,14 @@
<key>arguments</key>
<array>
<string>..\indra</string>
+ <string>&&</string>
+ <string>..\indra\tools\vstool\VSTool.exe</string>
+ <string>--solution</string>
+ <string>SecondLife.sln</string>
+ <string>--config</string>
+ <string>Debug</string>
+ <string>--startup</string>
+ <string>secondlife-bin</string>
</array>
<key>options</key>
<array>
@@ -1935,6 +1943,14 @@
<key>arguments</key>
<array>
<string>..\indra</string>
+ <string>&&</string>
+ <string>..\indra\tools\vstool\VSTool.exe</string>
+ <string>--solution</string>
+ <string>SecondLife.sln</string>
+ <string>--config</string>
+ <string>RelWithDebInfo</string>
+ <string>--startup</string>
+ <string>secondlife-bin</string>
</array>
<key>options</key>
<array>
@@ -1961,7 +1977,7 @@
<array>
<string>/build</string>
<string>"/cfg=Release|Win32"</string>
- <string>"/CL_ADD=/m:1"</string>
+ <string>"/CL_ADD=/m:1"</string>
</array>
</map>
<key>configure</key>
@@ -1969,6 +1985,14 @@
<key>arguments</key>
<array>
<string>..\indra</string>
+ <string>&&</string>
+ <string>..\indra\tools\vstool\VSTool.exe</string>
+ <string>--solution</string>
+ <string>SecondLife.sln</string>
+ <string>--config</string>
+ <string>Release</string>
+ <string>--startup</string>
+ <string>secondlife-bin</string>
</array>
<key>options</key>
<array>
--
cgit v1.2.3
From 58e5c8476dfd30f8d303ce5a60db872066008b83 Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Thu, 3 Mar 2011 16:15:08 -0800
Subject: update to use new GL archive (includes only headers; that's all that
is needed)
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index abffc9fe28..1090453e05 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -42,9 +42,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>a94538d064cd0a235b2a95389e7e8ee8</string>
+ <string>f8d98cbe78d5aafbc7aaabf840325aaf</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-windows-20101001a.tar.bz2</string>
+ <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-0.0.0-windows-20110303.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
--
cgit v1.2.3
From fb8a2aa572624bd49fcbe899ba705c4f9d3ce256 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Thu, 3 Mar 2011 16:51:21 -0800
Subject: imported patch mac_archives
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 1090453e05..5851fc3221 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -90,9 +90,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>4e9cd47faf1e74e1a5bf386dc55dd47e</string>
+ <string>9868bfa0b6954e4884c49c6f30068c80</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.7-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-apr/rev/221588/arch/Darwin/installer/apr_suite-1.4.2-darwin-20110217.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
--
cgit v1.2.3
From 7285dd9e42ffd58ea51335de96eadadb652f6b49 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Fri, 4 Mar 2011 14:49:20 -0800
Subject: ares, boost, expat, freetype archives updated to latest builds.
---
autobuild.xml | 16 ++++++++--------
indra/cmake/APR.cmake | 4 ++--
indra/cmake/Boost.cmake | 10 +++++-----
indra/cmake/Copy3rdPartyLibs.cmake | 6 +++---
indra/newview/viewer_manifest.py | 12 ++++++------
5 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 5851fc3221..17bb0e91ce 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -138,9 +138,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>577e89e72a6df485ee0c42ef7bfd8c34</string>
+ <string>e6caaeea16131e1f2343ecd7765e3147</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ares/rev/220963/arch/Darwin/installer/ares-1.7.1-darwin-20110217.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -186,9 +186,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>3a8b4bc2ea3dde26c2a7e1481f039864</string>
+ <string>d98078791ce345bf6168ce9ba53ca2d7</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/222752/arch/Darwin/installer/boost-1.45.0-darwin-20110304.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -354,9 +354,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>594e0d61d115ab06ca11bc84d374d23a</string>
+ <string>180e03d0be1f1acfc3244e78742d7bef</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-expat/rev/221695/arch/Darwin/installer/expat-2.0.1-darwin-20110218.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -498,9 +498,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>753021e66345612b4fc77c711b426f11</string>
+ <string>3e7e133f1fa61d9acabdf01f5494209e</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-freetype/rev/222716/arch/Darwin/installer/freetype-2.4.4-darwin-20110304.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 5b31b0d237..daafa00fe2 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -32,8 +32,8 @@ else (STANDALONE)
)
elseif (DARWIN)
if (LLCOMMON_LINK_SHARED)
- set(APR_selector "0.3.7.dylib")
- set(APRUTIL_selector "0.3.8.dylib")
+ set(APR_selector "0.dylib")
+ set(APRUTIL_selector "0.dylib")
else (LLCOMMON_LINK_SHARED)
set(APR_selector "a")
set(APRUTIL_selector "a")
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index b9c047a764..67dc9f0891 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -50,11 +50,11 @@ else (STANDALONE)
debug libboost_filesystem-vc100-mt-gd-${BOOST_VERSION})
endif (MSVC80)
elseif (DARWIN)
- set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt)
- set(BOOST_REGEX_LIBRARY boost_regex-xgcc40-mt)
- set(BOOST_SIGNALS_LIBRARY boost_signals-xgcc40-mt)
- set(BOOST_SYSTEM_LIBRARY boost_system-xgcc40-mt)
- set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-xgcc40-mt)
+ set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options)
+ set(BOOST_REGEX_LIBRARY boost_regex)
+# set(BOOST_SIGNALS_LIBRARY boost_signals)
+ set(BOOST_SYSTEM_LIBRARY boost_system)
+ set(BOOST_FILESYSTEM_LIBRARY boost_filesystem)
elseif (LINUX)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-gcc41-mt)
set(BOOST_REGEX_LIBRARY boost_regex-gcc41-mt)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 0c65229afc..43b0347aa9 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -200,11 +200,11 @@ elseif(DARWIN)
)
set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(release_files
- libapr-1.0.3.7.dylib
+ libapr-1.0.dylib
libapr-1.dylib
- libaprutil-1.0.3.8.dylib
+ libaprutil-1.0.dylib
libaprutil-1.dylib
- libexpat.0.5.0.dylib
+ libexpat.1.5.2.dylib
libexpat.dylib
libllqtwebkit.dylib
libndofdev.dylib
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 3e09b9daa0..9be3aa709b 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -636,9 +636,9 @@ class DarwinManifest(ViewerManifest):
dylibs[lib] = True
if dylibs["llcommon"]:
- for libfile in ("libapr-1.0.3.7.dylib",
- "libaprutil-1.0.3.8.dylib",
- "libexpat.0.5.0.dylib",
+ for libfile in ("libapr-1.0.dylib",
+ "libaprutil-1.0.dylib",
+ "libexpat.1.5.2.dylib",
"libexception_handler.dylib",
):
self.path(os.path.join(libdir, libfile), libfile)
@@ -667,9 +667,9 @@ class DarwinManifest(ViewerManifest):
mac_updater_res_path = self.dst_path_of("mac-updater.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",
- "libexpat.0.5.0.dylib",
+ "libapr-1.0.dylib",
+ "libaprutil-1.0.dylib",
+ "libexpat.1.5.2.dylib",
"libexception_handler.dylib",
):
target_lib = os.path.join('../../..', libfile)
--
cgit v1.2.3
From 006674447a3f082ee2e352bc8a201929ad677897 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Mon, 7 Mar 2011 09:50:05 -0800
Subject: update darwin freetype archive.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 17bb0e91ce..1b7627fb37 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -498,9 +498,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>3e7e133f1fa61d9acabdf01f5494209e</string>
+ <string>c0eacb6348e032fbc69cfdc4bd215ee4</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-freetype/rev/222716/arch/Darwin/installer/freetype-2.4.4-darwin-20110304.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-freetype/rev/222819/arch/Darwin/installer/freetype-2.4.4-darwin-20110307.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
--
cgit v1.2.3
From 7587b1b3bbcd2c395729d6a203c45e754dd746bf Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Mon, 7 Mar 2011 10:43:18 -0800
Subject: update mac google_breakpad archive.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 1b7627fb37..f808339a49 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -692,9 +692,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>239e5be637bb6282a297a8636ef3c77e</string>
+ <string>21babc394dbf8572830f2e85adec7b9f</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-linux-20110119a.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/220211/arch/Darwin/installer/google_breakpad-0.0.0-rev599-darwin-20110202.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
--
cgit v1.2.3
From 33927b8451bde10feeda0fc3d3c478b79ef2e0e2 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Mon, 7 Mar 2011 11:44:51 -0800
Subject: update libpng and jpeglib archives for mac.
---
autobuild.xml | 8 ++++----
indra/cmake/JPEG.cmake | 2 +-
indra/cmake/PNG.cmake | 3 +++
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index f808339a49..37388a8fa4 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -836,9 +836,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>d94de5a98492018144b95a8022ed4e44</string>
+ <string>71bd6efbf508e1f2e7d98a6195a93e9e</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jpeglib/rev/222232/arch/Darwin/installer/jpeglib-8c-darwin-20110228.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -980,9 +980,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>4aa623811aff42df702e8d3fdd848ac3</string>
+ <string>6fe1adf12d98bce9111f60ee762007b9</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libpng/rev/221851/arch/Darwin/installer/libpng-1.5.1-darwin-20110222.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake
index 0f0bbb9564..4f99efd602 100644
--- a/indra/cmake/JPEG.cmake
+++ b/indra/cmake/JPEG.cmake
@@ -12,7 +12,7 @@ else (STANDALONE)
if (LINUX)
set(JPEG_LIBRARIES jpeg)
elseif (DARWIN)
- set(JPEG_LIBRARIES lljpeg)
+ set(JPEG_LIBRARIES jpeg)
elseif (WINDOWS)
set(JPEG_LIBRARIES jpeglib)
endif (LINUX)
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake
index 86b7267494..60f749869a 100644
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -11,6 +11,9 @@ else (STANDALONE)
if (WINDOWS)
set(PNG_LIBRARIES libpng15)
set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15)
+ elseif(DARWIN)
+ set(PNG_LIBRARIES png15)
+ set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15)
else()
set(PNG_LIBRARIES png12)
set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12)
--
cgit v1.2.3
From 12c2fd2ef051ca922f0d3076bc8160820980b6e2 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Mon, 7 Mar 2011 14:23:09 -0800
Subject: update ogg-vorbis archive usage for darwin.
---
autobuild.xml | 4 ++--
indra/llaudio/llaudiodecodemgr.cpp | 8 +++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 37388a8fa4..0736a6afca 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1196,9 +1196,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>510c88fb183556b8c5fba25eb0c3d85e</string>
+ <string>57f32a1a670f06a4dc036eb1164ad9d7</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.03-1.1.2-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ogvorbis/rev/221801/arch/Darwin/installer/ogg_vorbis-1.1.3-1.2.0-darwin-20110222.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp
index 01dfd03c18..84105ddfca 100644
--- a/indra/llaudio/llaudiodecodemgr.cpp
+++ b/indra/llaudio/llaudiodecodemgr.cpp
@@ -680,4 +680,10 @@ BOOL LLAudioDecodeMgr::addDecodeRequest(const LLUUID &uuid)
return FALSE;
}
-
+#ifdef LL_DARWIN
+// HACK: to fool the compiler into not emitting unused warnings.
+namespace {
+ const ov_callbacks callback_array[4] = {OV_CALLBACKS_DEFAULT, OV_CALLBACKS_NOCLOSE, OV_CALLBACKS_STREAMONLY,
+ OV_CALLBACKS_STREAMONLY_NOCLOSE};
+}
+#endif
--
cgit v1.2.3
From d9715317b17152c445f6c5933fbeb2c1e0900bba Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Mon, 7 Mar 2011 14:54:50 -0800
Subject: update openSSL archive usage for darwin.
---
autobuild.xml | 4 ++--
indra/cmake/OpenSSL.cmake | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 0736a6afca..aa3414efc5 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1244,9 +1244,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>9cf8e84cb91996616cf627ad18c85442</string>
+ <string>facee34b8bd57ad602157e65a5af1a49</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8l-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/220986/arch/Darwin/installer/openssl-0.9.8q-darwin-20110211.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
index c692b67b49..5982ee9a49 100644
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -19,5 +19,5 @@ endif (STANDALONE)
if (LINUX)
set(CRYPTO_LIBRARIES crypto)
elseif (DARWIN)
- set(CRYPTO_LIBRARIES llcrypto)
+ set(CRYPTO_LIBRARIES crypto)
endif (LINUX)
--
cgit v1.2.3
From e77de9352985079635af4f8f1e18d4ee218d18e7 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Mon, 7 Mar 2011 15:09:15 -0800
Subject: update openjpeg archive usage for darwin.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index aa3414efc5..061eec49fe 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1332,9 +1332,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>972088359b9472a3baf4dda695cbda44</string>
+ <string>4be51c7cca7d84831e30b63279df7ae5</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3.0-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openjpeg/rev/222548/arch/Darwin/installer/openjpeg-1.4-darwin-20110302.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
--
cgit v1.2.3
From 64293a808c9d0d7cae5a0a7aa916c037bc3e3d58 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Mon, 7 Mar 2011 15:21:47 -0800
Subject: update pth archive usage for darwin.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 061eec49fe..2e6c503554 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1380,9 +1380,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>d47d121c8eaed4ac6d8253ceda23b5c9</string>
+ <string>2172379794217d0ffba0db09b2ac17bf</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pth-2.0.7-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-pth/rev/222617/arch/Darwin/installer/pth-2.0.7-darwin-20110303.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
--
cgit v1.2.3
From d107e4b0a760778ee298f988e112b46dacaa4579 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Mon, 7 Mar 2011 16:08:56 -0800
Subject: update xmlrpc-epi archive for darwin.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 2e6c503554..7c709d7ee9 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1500,9 +1500,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>994193ab308ac40994421ca411249b65</string>
+ <string>a3e0fb4b4a51b01690a99747a1cca531</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-xmlrpc-epi/rev/222889/arch/Darwin/installer/xmlrpc_epi-0.54.1-darwin-20110307.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
--
cgit v1.2.3
From 1f4630a967db381a96b13ad448d29b340b062ef5 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Mon, 7 Mar 2011 16:18:09 -0800
Subject: updating zlib archive for darwin.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 7c709d7ee9..a8dc98c6c2 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1548,9 +1548,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>3d1b42e6c3fcfebe00c6b87a0228c0ab</string>
+ <string>49b8de20f3bb43537f51311894a72de1</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.1.4-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-zlib/rev/220983/arch/Darwin/installer/zlib-1.2.5-darwin-20110211.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
--
cgit v1.2.3
From 3ebe0dd12bef7e3443ec98c56203f6ed2e850687 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Mon, 7 Mar 2011 16:35:08 -0800
Subject: Backed out changeset 7f3922c6bbc4 -- updated linux by mistake.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index f808339a49..1b7627fb37 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -692,9 +692,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>21babc394dbf8572830f2e85adec7b9f</string>
+ <string>239e5be637bb6282a297a8636ef3c77e</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/220211/arch/Darwin/installer/google_breakpad-0.0.0-rev599-darwin-20110202.tar.bz2</string>
+ <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-linux-20110119a.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
--
cgit v1.2.3
From a60bf285b8fcfc3c00d1c96315db5cb6f236bee2 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Tue, 8 Mar 2011 09:18:44 -0800
Subject: really update google_breakpad archive usage for darwin.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 513cb76b5f..3a15dfe391 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -680,9 +680,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>5937f12de19ce4fa394048f22557b6c5</string>
+ <string>21babc394dbf8572830f2e85adec7b9f</string>
<key>url</key>
- <string> http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20110119.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/220211/arch/Darwin/installer/google_breakpad-0.0.0-rev599-darwin-20110202.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
--
cgit v1.2.3
From b1a71cbcd2a5ea524357f5c64fb3fafce067d85f Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Tue, 8 Mar 2011 11:02:10 -0800
Subject: update fmod and kdu archive usage for mac.
---
autobuild.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 3a15dfe391..9fd3430cff 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -402,9 +402,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>4521b86ff92c3843e47a58b38e76e667</string>
+ <string>61ead113e6479452e6b690c84b4e9d30</string>
<key>url</key>
- <string>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-darwin-20101004.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmod-private/rev/221852/arch/Darwin/installer/fmod-3.75-darwin-20110222.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -932,9 +932,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>408f1375f5a4d864cfb47b36c8ab6052</string>
+ <string>d91e1f483209cd3eba04135c6a59e829</string>
<key>url</key>
- <string>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-6.4.1-darwin-20110112.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-kdu-private/rev/221672/arch/Darwin/installer/kdu-6.4.1-darwin-20110218.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
--
cgit v1.2.3
From 49698a49de7840783ac12c6c6ccebedd686537f4 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Tue, 8 Mar 2011 14:14:57 -0800
Subject: update llqtwebkit usage on darwin.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 9fd3430cff..cb55ea3564 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1076,9 +1076,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>d3890220418a66607569fe406ebe24c7</string>
+ <string>0326cb770c7ff995cf822fb330ae9d0c</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.7.1-darwin-20110113.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/223111/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20110308.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
--
cgit v1.2.3
From eddf24a00fac10a5c2928b9797393cab8a547971 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Wed, 9 Mar 2011 08:58:52 -0800
Subject: update ndofdev archive usage on darwin.
---
autobuild.xml | 4 ++--
indra/newview/viewer_manifest.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index cb55ea3564..9cbf89d7db 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1148,9 +1148,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>d56bb37233e6f1308fb0a5b8e37a2429</string>
+ <string>674d37d2ba76a2df7f18c47bf50b5d03</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libndofdev/rev/223177/arch/Darwin/installer/libndofdev-0.1-darwin-20110308.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 9be3aa709b..cf7ece2284 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -574,7 +574,7 @@ class DarwinManifest(ViewerManifest):
self.path("Info-SecondLife.plist", dst="Info.plist")
# copy additional libs in <bundle>/Contents/MacOS/
- self.path("../packages/lib/release/libndofdev.dylib", dst="MacOS/libndofdev.dylib")
+ self.path("../packages/lib/release/libndofdev.dylib", dst="Resources/libndofdev.dylib")
self.path("../viewer_components/updater/scripts/darwin/update_install", "MacOS/update_install")
--
cgit v1.2.3
From fb86600a33adeb744b877959cafe4d1d063f662b Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Wed, 9 Mar 2011 09:26:12 -0800
Subject: update glui archive for darwin.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 9cbf89d7db..13f67dd01a 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -594,9 +594,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>c3bfca7ad2eb90ea33f3fd6f974ca394</string>
+ <string>2bb7adabbd1fe2c7f99ddc4240842cc4</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.36-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glui/rev/221069/arch/Darwin/installer/glui-2.36-darwin-20110309.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
--
cgit v1.2.3
From 4947062236f9abe280beac8ba8abea22f3d1d226 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Thu, 10 Mar 2011 00:48:20 +0000
Subject: update apr and sdl archives for linux; added new archive db (needed
for linux only).
---
autobuild.xml | 34 +++++++++++++++++++++++++++++-----
indra/cmake/BerkeleyDB.cmake | 3 ++-
indra/cmake/Copy3rdPartyLibs.cmake | 2 +-
indra/cmake/LLWindow.cmake | 2 +-
indra/newview/viewer_manifest.py | 5 ++++-
5 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 513cb76b5f..59d72cb9b6 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -66,9 +66,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>1bd5be9e91ae1ae4a1cfa7649890f72b</string>
+ <string>69ae3b1c9cdb0ebc0d0e1ac8413e3eb7</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.12-linux-20101001.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-sdl/rev/223253/arch/Linux/installer/SDL-1.2.14-linux-20110309.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -102,9 +102,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>ae785a90f124aa572515fc7b97efc671</string>
+ <string>ff62946c518a247c86e1066c1e9a5855</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.2.8-linux-20100930.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-apr/rev/223260/arch/Linux/installer/apr_suite-1.4.2-linux-20110309.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -267,6 +267,30 @@
</map>
</map>
</map>
+ <key>db</key>
+ <map>
+ <key>license</key>
+ <string>bsd</string>
+ <key>license_file</key>
+ <string>LICENSES/db.txt</string>
+ <key>name</key>
+ <string>db</string>
+ <key>platforms</key>
+ <map>
+ <key>linux</key>
+ <map>
+ <key>archive</key>
+ <map>
+ <key>hash</key>
+ <string>8f57c413e0786681cbcb9ed2fb8a6d37</string>
+ <key>url</key>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-db/rev/223263/arch/Linux/installer/db-5.1.25-linux-20110309.tar.bz2</string>
+ </map>
+ <key>name</key>
+ <string>linux</string>
+ </map>
+ </map>
+ </map>
<key>dbghelp</key>
<map>
<key>license</key>
@@ -1977,7 +2001,7 @@
<array>
<string>/build</string>
<string>"/cfg=Release|Win32"</string>
- <string>"/CL_ADD=/m:1"</string>
+ <string>"/CL_ADD=/m:1"</string>
</array>
</map>
<key>configure</key>
diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake
index e3ca0fd77d..57b53f46ff 100644
--- a/indra/cmake/BerkeleyDB.cmake
+++ b/indra/cmake/BerkeleyDB.cmake
@@ -8,7 +8,8 @@ if (STANDALONE)
else (STANDALONE)
if (LINUX)
# Need to add dependency pthread explicitely to support ld.gold.
- set(DB_LIBRARIES db-4.2 pthread)
+ use_prebuilt_binary(db)
+ set(DB_LIBRARIES db-5.1 pthread)
else (LINUX)
set(DB_LIBRARIES db-4.2)
endif (LINUX)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 43b0347aa9..81ce7852ff 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -245,7 +245,7 @@ elseif(LINUX)
libatk-1.0.so
libbreakpad_client.so.0
libcrypto.so.0.9.7
- libdb-4.2.so
+ libdb-5.1.so
libexpat.so
libexpat.so.1
libgmock_main.so
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
index a5b9cf47a4..b4bb9a078a 100644
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -18,7 +18,7 @@ else (STANDALONE)
use_prebuilt_binary(SDL)
set (SDL_FOUND TRUE)
set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux)
- set (SDL_LIBRARY SDL)
+ set (SDL_LIBRARY SDL directfb fusion direct)
endif (LINUX AND VIEWER)
endif (STANDALONE)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 9be3aa709b..68038121a0 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -934,12 +934,15 @@ class Linux_i686Manifest(LinuxManifest):
self.path("libapr-1.so.0")
self.path("libaprutil-1.so.0")
self.path("libbreakpad_client.so.0.0.0", "libbreakpad_client.so.0")
- self.path("libdb-4.2.so")
+ self.path("libdb-5.1.so")
self.path("libcrypto.so.0.9.7")
self.path("libexpat.so.1")
self.path("libssl.so.0.9.7")
self.path("libuuid.so.1")
self.path("libSDL-1.2.so.0")
+ self.path("libdirectfb-1.4.so.5")
+ self.path("libfusion-1.4.so.5")
+ self.path("libdirect-1.4.so.5")
self.path("libELFIO.so")
self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
self.path("libalut.so")
--
cgit v1.2.3
From 871677dc0bb391f05c3dadd34e7a41eec241e413 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Thu, 10 Mar 2011 01:31:40 +0000
Subject: ares archive updated for linux.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 0a8742d99a..0e7a6b8ee3 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -150,9 +150,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>3bf8f0f3c960cc594b2315b986b948fb</string>
+ <string>0745872db83d45f4ab3bdc697d98e264</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-linux-20100929.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ares/rev/223275/arch/Linux/installer/ares-1.7.1-linux-20110310.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
--
cgit v1.2.3
From acec15e723c066efc6eb1e38c98b7af4e9993809 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Thu, 10 Mar 2011 17:53:15 +0000
Subject: update boost archive usage for linux.
---
autobuild.xml | 4 ++--
indra/cmake/Boost.cmake | 9 +--------
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 0e7a6b8ee3..c85a273a99 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -198,9 +198,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>cb7cbafb06b878adf423db314b1787df</string>
+ <string>a34e7fffdb94a6a4d8a2966b1f216da3</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100929a.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/223302/arch/Linux/installer/boost-1.45.0-linux-20110310.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 67dc9f0891..2135f0584c 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -49,17 +49,10 @@ else (STANDALONE)
optimized libboost_filesystem-vc100-mt-${BOOST_VERSION}
debug libboost_filesystem-vc100-mt-gd-${BOOST_VERSION})
endif (MSVC80)
- elseif (DARWIN)
+ elseif (DARWIN OR LINUX)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options)
set(BOOST_REGEX_LIBRARY boost_regex)
-# set(BOOST_SIGNALS_LIBRARY boost_signals)
set(BOOST_SYSTEM_LIBRARY boost_system)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem)
- elseif (LINUX)
- set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-gcc41-mt)
- set(BOOST_REGEX_LIBRARY boost_regex-gcc41-mt)
- set(BOOST_SIGNALS_LIBRARY boost_signals-gcc41-mt)
- set(BOOST_SYSTEM_LIBRARY boost_system-gcc41-mt)
- set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-gcc41-mt)
endif (WINDOWS)
endif (STANDALONE)
--
cgit v1.2.3
From 33fbb63227fb131d7a161f6fbde142a800995b73 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Thu, 10 Mar 2011 19:05:10 +0000
Subject: update curl archive for linux.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index c85a273a99..df0e8047e4 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -246,9 +246,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>49d4ac6773a585ad13190746db1e6e85</string>
+ <string>65ca0a9b42de855ea574e454ec2e14c3</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/219379/arch/Linux/installer/curl-7.21.1-linux-20110121.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/220996/arch/Linux/installer/curl-7.21.1-linux-20110308.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
--
cgit v1.2.3
From 4a8e5d9df9c21884d172741d3a5aec7d94f3914f Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Thu, 10 Mar 2011 21:51:13 +0000
Subject: update dbusglib archive for linux.
---
autobuild.xml | 6 +++---
indra/cmake/DBusGlib.cmake | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index df0e8047e4..d5ee780629 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -320,7 +320,7 @@
<key>license</key>
<string>AFL2.1</string>
<key>license_file</key>
- <string>LICENSES/dbusglib.txt</string>
+ <string>LICENSES/dbus-glib.txt</string>
<key>name</key>
<string>dbusglib</string>
<key>platforms</key>
@@ -330,9 +330,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>bb9734fb6ae797e3fa34af1a4ef1ee7d</string>
+ <string>94b058b9a81114dc4567bd78e4335425</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/dbusglib-linux-20101013.tar.bz2</string>
+ <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/dbus_glib-0.76-linux-20110310.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake
index 33c6343a93..83c08d3350 100644
--- a/indra/cmake/DBusGlib.cmake
+++ b/indra/cmake/DBusGlib.cmake
@@ -10,7 +10,7 @@ elseif (LINUX)
use_prebuilt_binary(dbusglib)
set(DBUSGLIB_FOUND ON FORCE BOOL)
set(DBUSGLIB_INCLUDE_DIRS
- ${LIBS_PREBUILT_DIR}/include/glib-2.0
+ ${LIBS_PREBUILT_DIR}/include/dbus
)
# We don't need to explicitly link against dbus-glib itself, because
# the viewer probes for the system's copy at runtime.
--
cgit v1.2.3
From b01b10bba3708b10440d59a7d0fd79430f5e37d7 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Thu, 10 Mar 2011 22:43:33 +0000
Subject: remove ELFIO cruft; no longer needed now that we use google breakpad.
---
indra/cmake/CMakeLists.txt | 3 ---
indra/cmake/ELFIO.cmake | 19 -------------------
indra/newview/CMakeLists.txt | 3 ---
indra/newview/viewer_manifest.py | 1 -
4 files changed, 26 deletions(-)
delete mode 100644 indra/cmake/ELFIO.cmake
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 9ef49db07d..89c1c3691a 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -20,7 +20,6 @@ set(cmake_SOURCE_FILES
CSharpMacros.cmake
DBusGlib.cmake
DirectX.cmake
- ELFIO.cmake
EXPAT.cmake
FindAPR.cmake
FindBerkeleyDB.cmake
@@ -29,8 +28,6 @@ set(cmake_SOURCE_FILES
FindFMOD.cmake
FindGooglePerfTools.cmake
FindMono.cmake
-# MT deprecated in VS2010
-# FindMT.cmake
FindMySQL.cmake
FindOpenJPEG.cmake
FindXmlRpcEpi.cmake
diff --git a/indra/cmake/ELFIO.cmake b/indra/cmake/ELFIO.cmake
deleted file mode 100644
index e51993b0f7..0000000000
--- a/indra/cmake/ELFIO.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-
-set(ELFIO_FIND_QUIETLY ON)
-
-if (STANDALONE)
- include(FindELFIO)
-elseif (LINUX)
- use_prebuilt_binary(elfio)
- set(ELFIO_LIBRARIES ELFIO)
- set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
- set(ELFIO_FOUND "YES")
-endif (STANDALONE)
-
-if (ELFIO_FOUND)
- add_definitions(-DLL_ELFBIN=1)
-else (ELFIO_FOUND)
- set(ELFIO_INCLUDE_DIR "")
-endif (ELFIO_FOUND)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 3c24006fb8..4c8b3e84a2 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -9,7 +9,6 @@ include(DBusGlib)
include(DirectX)
include(OpenSSL)
include(DragDrop)
-include(ELFIO)
include(EXPAT)
include(FMOD)
include(OPENAL)
@@ -45,7 +44,6 @@ include(CMakeCopyIfDifferent)
include_directories(
${DBUSGLIB_INCLUDE_DIRS}
- ${ELFIO_INCLUDE_DIR}
${JSONCPP_INCLUDE_DIRS}
${LLAUDIO_INCLUDE_DIRS}
${LLCHARACTER_INCLUDE_DIRS}
@@ -1685,7 +1683,6 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${WINDOWS_LIBRARIES}
${EXPAT_LIBRARIES}
${XMLRPCEPI_LIBRARIES}
- ${ELFIO_LIBRARIES}
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
${LLLOGIN_LIBRARIES}
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 39fd2d8886..dd347c2778 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -943,7 +943,6 @@ class Linux_i686Manifest(LinuxManifest):
self.path("libdirectfb-1.4.so.5")
self.path("libfusion-1.4.so.5")
self.path("libdirect-1.4.so.5")
- self.path("libELFIO.so")
self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
self.path("libalut.so")
self.path("libopenal.so", "libopenal.so.1")
--
cgit v1.2.3
From f3c54b503a8b2c55dd97e7741f917c972640fc50 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Thu, 10 Mar 2011 22:55:22 +0000
Subject: update expat archive for linux.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index d5ee780629..8ca816db63 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -390,9 +390,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>7c334794bba026685f967734ca963c85</string>
+ <string>9bd79781b58e556ab1c36084ec4a1c0c</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-linux-20100929.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-expat/rev/221695/arch/Linux/installer/expat-2.0.1-linux-20110219.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
--
cgit v1.2.3
From 2ed71097ab67f84b67e575fbcbf790a1a8c56f6d Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Fri, 11 Mar 2011 00:16:23 +0000
Subject: fmod archive updated for linux.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 8ca816db63..89dcadbcce 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -438,9 +438,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>221ec16b66ea2b0d1acb3247ad984bc4</string>
+ <string>0c61d643db54d2e5999be8254569d8b3</string>
<key>url</key>
- <string>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-linux-20100929.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmod-private/rev/221852/arch/Linux/installer/fmod-3.75-linux-20110223.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
--
cgit v1.2.3
From 353c54d6682614ad62d73ace66146602d6682584 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Fri, 11 Mar 2011 00:27:44 +0000
Subject: update fontconfig archive for linux.
---
autobuild.xml | 4 ++--
indra/cmake/Copy3rdPartyLibs.cmake | 1 +
indra/newview/viewer_manifest.py | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 89dcadbcce..c326023c51 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -474,9 +474,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>9ebba6e0a1730992fa0643566f4e23cf</string>
+ <string>d8b08b657247566bde5fd853c7622478</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/fontconfig-2.2.3-linux-20100930.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-fontconfig/rev/223389/arch/Linux/installer/fontconfig-2.8.0-linux-20110311.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 81ce7852ff..c942fafabd 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -261,6 +261,7 @@ elseif(LINUX)
libtcmalloc.so
libuuid.so.1
libssl.so.0.9.7
+ libfontconfig.so.1.4.4
)
if (FMOD)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index dd347c2778..055bff378d 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -947,6 +947,7 @@ class Linux_i686Manifest(LinuxManifest):
self.path("libalut.so")
self.path("libopenal.so", "libopenal.so.1")
self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname
+ self.path("libfontconfig.so.1.4.4")
try:
self.path("libfmod-3.75.so")
pass
--
cgit v1.2.3
From 44543756d8b7a9adbaa194697b2ca45e798e1406 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Fri, 11 Mar 2011 00:35:10 +0000
Subject: update freetype archive for linux.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index c326023c51..bf3c9aa125 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -534,9 +534,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>a13ec6354d3a8a4576efcce895a74ceb</string>
+ <string>9b58d1a9c15807a1301e42a313641010</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-linux-2010-02-19a-20100929.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-freetype/rev/223377/arch/Linux/installer/freetype-2.4.4-linux-20110310.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
--
cgit v1.2.3
From 8c310339e281bc7344e6c7a7eb55cf5baa5debb4 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Fri, 11 Mar 2011 01:39:18 +0000
Subject: update google_breakpad archive for linux.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index bf3c9aa125..ccab09a7ef 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -716,9 +716,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>239e5be637bb6282a297a8636ef3c77e</string>
+ <string>204b02a9480c411232255798839431a2</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-linux-20110119a.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/223427/arch/Linux/installer/google_breakpad-0.0.0-rev599-linux-20110311.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
--
cgit v1.2.3
From d4427fafda6a56de3e6b8fb95e67dac05c189205 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Fri, 11 Mar 2011 19:17:14 +0000
Subject: package the exact shared library (manifest doesn't follow symlinks)
---
indra/newview/viewer_manifest.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 055bff378d..0574d8c005 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -931,18 +931,18 @@ class Linux_i686Manifest(LinuxManifest):
super(Linux_i686Manifest, self).construct()
if self.prefix("../packages/lib/release", dst="lib"):
- self.path("libapr-1.so.0")
- self.path("libaprutil-1.so.0")
- self.path("libbreakpad_client.so.0.0.0", "libbreakpad_client.so.0")
+ self.path("libapr-1.so.0.4.2")
+ self.path("libaprutil-1.so.0.3.10")
+ self.path("libbreakpad_client.so.0.0.0")
self.path("libdb-5.1.so")
self.path("libcrypto.so.0.9.7")
- self.path("libexpat.so.1")
+ self.path("libexpat.so.1.5.2")
self.path("libssl.so.0.9.7")
self.path("libuuid.so.1")
- self.path("libSDL-1.2.so.0")
- self.path("libdirectfb-1.4.so.5")
- self.path("libfusion-1.4.so.5")
- self.path("libdirect-1.4.so.5")
+ self.path("libSDL-1.2.so.0.11.3")
+ self.path("libdirectfb-1.4.so.5.0.4")
+ self.path("libfusion-1.4.so.5.0.4")
+ self.path("libdirect-1.4.so.5.0.4")
self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
self.path("libalut.so")
self.path("libopenal.so", "libopenal.so.1")
--
cgit v1.2.3
From 9603d73f1f0b13775aa50c08ca04d7711508f533 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Fri, 11 Mar 2011 19:32:18 +0000
Subject: update jpeglib archive for linux.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index ccab09a7ef..155810452c 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -872,9 +872,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>a059a32904c1c7f47804d744ac2d4925</string>
+ <string>fa1073ef1181f27e6bc01d571366070b</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-linux-20100929.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jpeglib/rev/222826/arch/Linux/installer/jpeglib-8c-linux-20110307.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
--
cgit v1.2.3
From 5b87c94fa7c2c991e2f225f0bc59614b8b32e4e0 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Fri, 11 Mar 2011 23:39:38 +0000
Subject: update kdu archive for linux.
---
autobuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 155810452c..ab98824d56 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -968,9 +968,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>9742279dfbe57be7a6aed12d60045459</string>
+ <string>fbf8a4f78dff986d7c16b3a0437e033e</string>
<key>url</key>
- <string>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-6.4.1-linux-20110119.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-kdu-private/rev/223538/arch/Linux/installer/kdu-6.4.1-linux-20110311.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
--
cgit v1.2.3
From fcdd82af83093a0e62200be7b1fc44e96fd76d57 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Fri, 11 Mar 2011 23:50:00 +0000
Subject: update libpng archive for linux.
---
autobuild.xml | 4 ++--
indra/cmake/PNG.cmake | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index ab98824d56..b5c4894841 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1016,9 +1016,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>adeeca61be1b8f47ce85660c8c20a904</string>
+ <string>0681ab7e1988dfdbdad7dd9edb7760ee</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-linux-20100929.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libpng/rev/221851/arch/Linux/installer/libpng-1.5.1-linux-20110223.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake
index 60f749869a..913c575672 100644
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -15,7 +15,7 @@ else (STANDALONE)
set(PNG_LIBRARIES png15)
set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15)
else()
- set(PNG_LIBRARIES png12)
- set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12)
+ set(PNG_LIBRARIES png15)
+ set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15)
endif()
endif (STANDALONE)
--
cgit v1.2.3
From c41d9949d797312626d44c639766b285111d608b Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Mon, 14 Mar 2011 20:01:31 +0000
Subject: update llqtwebkit usage.
---
autobuild.xml | 4 ++--
indra/cmake/WebKitLibPlugin.cmake | 4 ----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index b5c4894841..2848a7e0f7 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1112,9 +1112,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>c05a33ee8b6f253b5a744596dfc3707d</string>
+ <string>f53e2a255d4c4039203de3e4640a2d41</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-qt4.6-20101013.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/223655/arch/Linux/installer/llqtwebkit-4.7.1-linux-20110314.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index 1f5b0f5d84..8fb717cdb8 100644
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -62,10 +62,6 @@ elseif (LINUX)
else (STANDALONE)
set(WEBKIT_PLUGIN_LIBRARIES
llqtwebkit
-
- qgif
- qjpeg
-
QtWebKit
QtOpenGL
QtNetwork
--
cgit v1.2.3
From ec0c28ad8383dd6b342a317d15d44015fde15416 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Mon, 14 Mar 2011 20:24:55 +0000
Subject: update ogg-vorbis archive for linux.
---
autobuild.xml | 4 ++--
indra/llaudio/llaudiodecodemgr.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 2848a7e0f7..5be2a6fa70 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1232,9 +1232,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>d4bda5baabfbfbd92ea7bd2a48c7fb8a</string>
+ <string>17c000ceef32c0623d038b4c73791bee</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.2.0-linux-20100929.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ogvorbis/rev/222841/arch/Linux/installer/ogg_vorbis-1.1.3-1.2.0-linux-20110307.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp
index 84105ddfca..f0b44f97d2 100644
--- a/indra/llaudio/llaudiodecodemgr.cpp
+++ b/indra/llaudio/llaudiodecodemgr.cpp
@@ -680,7 +680,7 @@ BOOL LLAudioDecodeMgr::addDecodeRequest(const LLUUID &uuid)
return FALSE;
}
-#ifdef LL_DARWIN
+#if LL_DARWIN || LL_LINUX
// HACK: to fool the compiler into not emitting unused warnings.
namespace {
const ov_callbacks callback_array[4] = {OV_CALLBACKS_DEFAULT, OV_CALLBACKS_NOCLOSE, OV_CALLBACKS_STREAMONLY,
--
cgit v1.2.3
From 72d1febadb5f254eb7199bd26eb04a7553a6e55d Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Mon, 14 Mar 2011 21:18:24 +0000
Subject: update openjpeg archive for linux.
---
autobuild.xml | 4 ++--
indra/newview/viewer_manifest.py | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 5be2a6fa70..cdc724f571 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1368,9 +1368,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>c34975e8090d861c6e37ea606fd66940</string>
+ <string>fb2382014c79e0049746e4e29bd834f9</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3-linux-20100929.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openjpeg/rev/223705/arch/Linux/installer/openjpeg-1.4-linux-20110314.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 0574d8c005..229055fdb7 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -943,7 +943,9 @@ class Linux_i686Manifest(LinuxManifest):
self.path("libdirectfb-1.4.so.5.0.4")
self.path("libfusion-1.4.so.5.0.4")
self.path("libdirect-1.4.so.5.0.4")
- self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
+ self.path("libopenjpeg.so.1.4.0")
+ self.path("libopenjpeg.so.1")
+ self.path("libopenjpeg.so")
self.path("libalut.so")
self.path("libopenal.so", "libopenal.so.1")
self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname
--
cgit v1.2.3