remove the libfreetype for it fullfill with bugs and always cause build failed. 0.9.139

winlin
Commit 55989b4bc851883cd5369baaf49184aaab2bb522 55989b4b 1 parent cb2967c9
trunk/3rdparty/freetype-2.4.0.zip
trunk/3rdparty/readme.txt
trunk/auto/build_ffmpeg.sh
trunk/auto/depends.sh
trunk/conf/demo.conf
trunk/conf/full.conf
trunk/doc/FreeSerifBold.ttf
trunk/doc/readme.txt
trunk/doc/srs-logo.png
trunk/research/players/srs_player.html
trunk/src/core/srs_core.hpp
--- a/trunk/3rdparty/freetype-2.4.0.zip 已删除 100644 → 0
查看文件 @cb2967c
+++ b/trunk/3rdparty/freetype-2.4.0.zip 已删除 100644 → 0
查看文件 @cb2967c
--- a/trunk/3rdparty/readme.txt
查看文件 @55989b4
+++ b/trunk/3rdparty/readme.txt
查看文件 @55989b4
@@ -35,9 +35,6 @@ gtest-1.6.0.zip
 gperftools-2.1.zip
     google性能分析和测试工具。
     编译和使用参考压缩文件中的README和doc目录。
-    
-freetype-2.4.0
-    ffmpeg用到的字体库，在加文字水印需要用到。
 links:
     nginx:
@@ -49,9 +46,6 @@ 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
--- a/trunk/auto/build_ffmpeg.sh
查看文件 @55989b4
+++ b/trunk/auto/build_ffmpeg.sh
查看文件 @55989b4
@@ -69,23 +69,6 @@ else
     ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build speex-1.2rc1 failed"; exit 1; fi
 fi
-# freetype-2.4.0
-# remark: we must ensure the pkg-config tool installed.
-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
-# add pc to pkg-config
-pkg-config --exists --print-errors freetype2 >/dev/null 2>&1
-ret=$?; if [[ 0 -ne ${ret} ]]; then export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:$ff_current_dir/freetype-2.4.0/builds/unix; fi
-pkg-config --exists --print-errors freetype2 >/dev/null 2>&1
-ret=$?; if [[ 0 -ne ${ret} ]]; then echo "oops... pkg-config cannot find the freetype, please report bug."; exit 1; fi
-
 # x264 core.138
 if [[ -f ${ff_release_dir}/lib/libx264.a ]]; then
     echo "x264 is ok"
@@ -122,7 +105,6 @@ else
         --extra-ldflags='-L${ffmpeg_exported_release_dir}/lib -lm -ldl' \
         --disable-ffplay --disable-ffprobe --disable-ffserver --disable-doc \
         --enable-postproc --enable-bzlib --enable-zlib --enable-parsers \
-        --enable-libfreetype \
         --enable-libx264 --enable-libmp3lame --enable-libaacplus --enable-libspeex \
         --enable-pthreads --extra-libs=-lpthread \
         --enable-encoders --enable-decoders --enable-avfilter --enable-muxers --enable-demuxers && 
--- a/trunk/auto/depends.sh
查看文件 @55989b4
+++ b/trunk/auto/depends.sh
查看文件 @55989b4
@@ -102,14 +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
-        
-        # for freetype2
-        pkg-config --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
-            echo "install pkg-config"
-            require_sudoer "sudo apt-get install -y --force-yes pkg-config"
-            sudo apt-get install -y --force-yes pkg-config; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
-            echo "install pkg-config success"
-        fi
     fi
     # for arm, install the cross build tool chain.
--- a/trunk/conf/demo.conf
查看文件 @55989b4
+++ b/trunk/conf/demo.conf
查看文件 @55989b4
@@ -68,7 +68,8 @@ vhost demo.srs.com {
         engine ld {
             enabled         on;
             vfilter {
-                vf                  'drawtext=text=SimpleRtmpServer(SRS):x=10:y=10:fontsize=30:fontcolor=#cccccc:fontfile=./doc/FreeSerifBold.ttf';
+                i               ./doc/srs-logo.png;
+                filter_complex      'overlay=10:10';
             }
             vcodec          libx264;
             vbitrate        300;
@@ -135,7 +136,8 @@ vhost players {
         engine hls {
             enabled         on;
             vfilter {
-                vf                  'drawtext=text=SRS(SimpleRtmpServer):x=10:y=10:fontcolor=#cccccc:fontfile=./doc/FreeSerifBold.ttf';
+                i               ./doc/srs-logo.png;
+                filter_complex      'overlay=10:10';
             }
             vcodec          libx264;
             vbitrate        300;
--- a/trunk/conf/full.conf
查看文件 @55989b4
+++ b/trunk/conf/full.conf
查看文件 @55989b4
@@ -513,36 +513,11 @@ vhost mirror.transcode.srs.com {
         }
     }
 }
+#
 # the drawtext filter of ffmpeg, @see: http://ffmpeg.org/ffmpeg-filters.html#drawtext-1
-vhost drawtext.transcode.srs.com {
-    transcode {
-        enabled     on;
-        ffmpeg      ./objs/ffmpeg/bin/ffmpeg;
-        engine drawtext {
-            enabled         on;
-            vfilter {
-                vf                  'drawtext=text=SimpleRtmpServer(SRS):x=10:y=10:fontcolor=#cccccc:fontfile=./doc/FreeSerifBold.ttf';
-            }
-            vcodec          libx264;
-            vbitrate        300;
-            vfps            20;
-            vwidth          768;
-            vheight         320;
-            vthreads        2;
-            vprofile        baseline;
-            vpreset         superfast;
-            vparams {
-            }
-            acodec          libaacplus;
-            abitrate        45;
-            asample_rate    44100;
-            achannels       2;
-            aparams {
-            }
-            output          rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine];
-        }
-    }
-}
+# remark: we remove the libfreetype which always cause build failed, you must add it manual if needed.
+#
+#######################################################################################################
 # the crop filter of ffmpeg, @see: http://ffmpeg.org/ffmpeg-filters.html#crop
 vhost crop.transcode.srs.com {
     transcode {
--- a/trunk/doc/FreeSerifBold.ttf 已删除 100644 → 0
查看文件 @cb2967c
+++ b/trunk/doc/FreeSerifBold.ttf 已删除 100644 → 0
查看文件 @cb2967c
--- a/trunk/doc/readme.txt
查看文件 @55989b4
+++ b/trunk/doc/readme.txt
查看文件 @55989b4
@@ -4,11 +4,6 @@ ffmpeg-min.png
 source.flv
     avatar预告片，400kbps。
-FreeSerifBold.ttf
-    字体文件，ffmpeg的drawtext filter需要使用。
-    参考：http://ffmpeg.org/ffmpeg-filters.html#drawtext-1
-    下载地址：http://www.fonts2u.com/free-serif.font
-    
 aac-iso-13818-7.pdf
     aac标准，aac的编码等。
--- a/trunk/doc/srs-logo.png 0 → 100644
查看文件 @55989b4
+++ b/trunk/doc/srs-logo.png 0 → 100644
查看文件 @55989b4
--- a/trunk/research/players/srs_player.html
查看文件 @55989b4
+++ b/trunk/research/players/srs_player.html
查看文件 @55989b4
@@ -336,7 +336,7 @@
                 <div id="collapse2" class="accordion-body collapse">
                     <div class="accordion-inner">
                         <a href="#" id="srs_publish_ld">rtmp://demo.srs.com/live/livestream_ld</a> <br/>
-                        <span>对原始流加了<a href="http://ffmpeg.org/ffmpeg-filters.html#drawtext-1">FFMPEG文字水印</a></span>
+                        <span>对原始流加了<a href="http://ffmpeg.org/ffmpeg-filters.html#overlay">FFMPEG图片水印</a></span>
                     </div>
                 </div>
             </div>
--- a/trunk/src/core/srs_core.hpp
查看文件 @55989b4
+++ b/trunk/src/core/srs_core.hpp
查看文件 @55989b4
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 #define VERSION_MAJOR "0"
 #define VERSION_MINOR "9"
-#define VERSION_REVISION "138"
+#define VERSION_REVISION "139"
 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
 // server info.
 #define RTMP_SIG_SRS_KEY "SRS"