summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--autobuild.xml4
-rw-r--r--indra/cmake/Copy3rdPartyLibs.cmake1
-rw-r--r--indra/newview/viewer_manifest.py1
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