external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
winlin 2014-06-19 16:15:49 +08:00
parent 6ee2ba049b
commit 603b3bcdcc
4 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
trunk/3rdparty/freetype-2.4.0.zip vendored Normal file
View file

Binary file not shown.

6
trunk/3rdparty/readme.txt vendored
View file

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

11
trunk/auto/build_ffmpeg.sh
View file

@ -69,6 +69,17 @@ else
ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build speex-1.2rc1 failed"; exit 1; fi ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build speex-1.2rc1 failed"; exit 1; fi
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 # x264 core.138
if [[ -f ${ff_release_dir}/lib/libx264.a ]]; then if [[ -f ${ff_release_dir}/lib/libx264.a ]]; then
echo "x264 is ok" echo "x264 is ok"

14
trunk/auto/depends.sh
View file

@ -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 sudo apt-get install -y --force-yes zlib1g-dev; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
echo "install zlib1g-dev success" echo "install zlib1g-dev success"
fi 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 fi
# for arm, install the cross build tool chain. # 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 sudo yum install -y zlib-devel; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
echo "install zlib-devel success" echo "install zlib-devel success"
fi 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 fi
# for arm, install the cross build tool chain. # for arm, install the cross build tool chain.