add libfreetype2 for ffmpeg, remove the depends of freetype of build_ffmpeg.

trunk/3rdparty/readme.txt

@@ -35,6 +35,9 @@ gtest-1.6.0.zip
 gperftools-2.1.zip
     google性能分析和测试工具。
     编译和使用参考压缩文件中的README和doc目录。
+    
+freetype-2.4.0
+    ffmpeg用到的字体库，在加文字水印需要用到。
 
 links:
     nginx:
@@ -46,6 +49,9 @@ links:
     ffmpeg: 
         http://ffmpeg.org/ 
         http://ffmpeg.org/releases/ffmpeg-2.1.1.tar.gz
+    freetype:
+        http://www.freetype.org/index.html
+        http://download.savannah.gnu.org/releases/freetype/freetype-2.4.0.tar.bz2
     x264: 
         http://www.videolan.org/ 
         ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20131129-2245-stable.tar.bz2

trunk/auto/build_ffmpeg.sh

@@ -69,6 +69,17 @@ else
     ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build speex-1.2rc1 failed"; exit 1; fi
 fi
 
+# freetype-2.4.0
+if [[ -f ${ff_release_dir}/lib/libfreetype.a ]]; then
+    echo "libfreetype is ok"
+else
+    echo "build freetype-2.4.0"
+    cd $ff_current_dir &&
+    rm -rf freetype-2.4.0 && unzip -q ${ff_src_dir}/freetype-2.4.0.zip &&
+    cd freetype-2.4.0 && ./configure --prefix=${ff_release_dir} --enable-static && make ${SRS_JOBS} && make install
+    ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build freetype-2.4.0 failed"; exit 1; fi
+fi
+
 # x264 core.138
 if [[ -f ${ff_release_dir}/lib/libx264.a ]]; then
     echo "x264 is ok"

trunk/auto/depends.sh

@@ -102,13 +102,6 @@ function Ubuntu_prepare()
             sudo apt-get install -y --force-yes zlib1g-dev; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
             echo "install zlib1g-dev success"
         fi
-        
-        if [[ ! -d /usr/include/freetype2 ]]; then
-            echo "install libfreetype6-dev"
-            require_sudoer "sudo apt-get install -y --force-yes libfreetype6-dev"
-            sudo apt-get install -y --force-yes libfreetype6-dev; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
-            echo "install libfreetype6-dev success"
-        fi
     fi
     
     # for arm, install the cross build tool chain.
@@ -209,13 +202,6 @@ function Centos_prepare()
             sudo yum install -y zlib-devel; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
             echo "install zlib-devel success"
         fi
-        
-        if [[ ! -d /usr/include/freetype2 ]]; then
-            echo "install freetype-devel"
-            require_sudoer "sudo yum install -y freetype-devel"
-            sudo yum install -y freetype-devel; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
-            echo "install freetype-devel success"
-        fi
     fi
     
     # for arm, install the cross build tool chain.