From f0828916cc64c9a8528dcb4b61a71d52d98c16b1 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Tue, 3 Nov 2009 01:05:36 -0600
Subject: Created our own Linux freetype package, 2.3.11.

---
 ChangeLog.txt                      |  6 ++++++
 linden/indra/cmake/00-Common.cmake |  1 -
 linden/indra/llrender/llfont.cpp   |  3 +--
 linden/install.xml                 | 18 ++----------------
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 73ef469..41852d3 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
 2009-11-03  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+	* Created our own Linux freetype package, 2.3.11.
+
+	  modified:   linden/indra/cmake/00-Common.cmake
+	  modified:   linden/indra/llrender/llfont.cpp
+	  modified:   linden/install.xml
+
 	* Updated ndofdev to the version used in SL 1.23.4.
 
 	  modified:   linden/install.xml
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index e15e8a2..8c6ca2d 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -210,7 +210,6 @@ else (STANDALONE)
       glib-2.0
       gstreamer-0.10
       gtk-2.0
-      llfreetype2
       pango-1.0
       )
 endif (STANDALONE)
diff --git a/linden/indra/llrender/llfont.cpp b/linden/indra/llrender/llfont.cpp
index d7310bd..2ac7bdb 100644
--- a/linden/indra/llrender/llfont.cpp
+++ b/linden/indra/llrender/llfont.cpp
@@ -37,8 +37,7 @@
 #if !defined(LL_LINUX) || defined(LL_STANDALONE)
 # include <ft2build.h>
 #else
-// I had to do some work to avoid the system-installed FreeType headers... --ryan.
-# include "llfreetype2/freetype/ft2build.h"
+# include "ft2build.h"
 #endif
 
 // For some reason, this won't work if it's not wrapped in the ifdef
diff --git a/linden/install.xml b/linden/install.xml
index 7c9c73f..793147c 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -453,23 +453,9 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>07665d74d37c56fd884610ec80a1d19f</string>
+            <string>efc845cf291073b1e4d381a271f194eb</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.1.5-linux-20080812.tar.bz2</uri>
-          </map>
-          <key>linux32</key>
-          <map>
-            <key>md5sum</key>
-            <string>c22a667d4b6b518cc7f942e2c861ca77</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.1.5-linux-i686-gcc-4.1-20080915.tar.bz2</uri>
-          </map>
-          <key>linux64</key>
-          <map>
-            <key>md5sum</key>
-            <string>35f6fa557ba90f9cda0a18d1af2055a4</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.1.5-linux64-20080909.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/freetype-2.3.11-linux-20091103.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
-- 
cgit v1.1