diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-17 11:21:15 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-17 11:21:15 -0400 |
| commit | 27085e91fd97a4e641386ec54787c8c94bac909b (patch) | |
| tree | eea06a3ab9ba5017bb4d8e7d1d7e0dbf5cbc319f | |
| parent | 11c173368fd5720c7ea8b088f86081f8e51eeec6 (diff) | |
| parent | d106f4c15bf1222e595dee1beadd05890f25fc4b (diff) | |
Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/
| -rw-r--r-- | indra/cmake/APR.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 1 | ||||
| -rw-r--r-- | indra/cmake/ViewerMiscLibs.cmake | 1 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 1 | ||||
| -rw-r--r-- | install.xml | 23 |
5 files changed, 25 insertions, 3 deletions
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index b6f1e06edd..180504d286 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -56,7 +56,7 @@ else (STANDALONE) if (LINUX) if (VIEWER) - list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES}) + list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid) endif (VIEWER) list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} rt) endif (LINUX) diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 428b151c11..9900a8fb45 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -236,6 +236,7 @@ elseif(LINUX) libssl.so libstacktrace.so libtcmalloc.so + libuuid.so.1 libssl.so.0.9.7 ) diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index 5710360de2..32c4bc81df 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -2,6 +2,7 @@ include(Prebuilt) if (NOT STANDALONE) + use_prebuilt_binary(libuuid) use_prebuilt_binary(vivox) use_prebuilt_binary(fontconfig) endif(NOT STANDALONE) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 2da5aff8d6..8296c28e80 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -930,6 +930,7 @@ class Linux_i686Manifest(LinuxManifest): self.path("libexpat.so.1") self.path("libglod.so") self.path("libssl.so.0.9.7") + self.path("libuuid.so.1") self.path("libSDL-1.2.so.0") self.path("libELFIO.so") self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3") diff --git a/install.xml b/install.xml index 43bcbd0dec..080fb7b216 100644 --- a/install.xml +++ b/install.xml @@ -63,9 +63,9 @@ <key>linux</key> <map> <key>md5sum</key> - <string>cb9409ee84d5f33db14335ed5bfd7ca7</string> + <string>d0ee98de1861afdf3df1ab8741b09afc</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-linux-20100910.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-linux-20100914.tar.bz2</uri> </map> <key>windows</key> <map> @@ -957,6 +957,25 @@ anguage Infrstructure (CLI) international standard</string> </map> </map> </map> + <key>libuuid</key> + <map> + <key>copyright</key> + <string>Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/></string> + <key>description</key> + <string>Generates UUIDs under Linux. Originally a part of the ext2fs filesystem. Also see lluuid.cpp for all platforms. Part of the e2fsprogs package.</string> + <key>license</key> + <string>lgpl</string> + <key>packages</key> + <map> + <key>linux</key> + <map> + <key>md5sum</key> + <string>91b194aed4b38bc23493b198009a8c6a</string> + <key>url</key> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libuuid-linux-20090417.tar.bz2</uri> + </map> + </map> + </map> <key>libxml</key> <map> <key>license</key> |