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

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
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"

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
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.