diff options
| -rw-r--r-- | autobuild.xml | 34 | ||||
| -rw-r--r-- | indra/cmake/BerkeleyDB.cmake | 3 | ||||
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/LLWindow.cmake | 2 | ||||
| -rw-r--r-- | 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") |