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

fix bug of freetype2 build for ffmpeg, depends on pkg-config

Browse source
This commit is contained in:
winlin 2014-06-20 10:25:52 +08:00
parent 094d82bd06
commit 94e5e7070d
2 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/auto/build_ffmpeg.sh
View file

@ -70,6 +70,7 @@ else
fi fi
# freetype-2.4.0 # freetype-2.4.0
# remark: we must ensure the pkg-config tool installed.
if [[ -f ${ff_release_dir}/lib/libfreetype.a ]]; then if [[ -f ${ff_release_dir}/lib/libfreetype.a ]]; then
echo "libfreetype is ok" echo "libfreetype is ok"
else else

16
trunk/auto/depends.sh
View file

@ -102,6 +102,14 @@ 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
# 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 fi
# for arm, install the cross build tool chain. # for arm, install the cross build tool chain.
@ -202,6 +210,14 @@ 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
# for freetype2
pkg-config --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
echo "install pkg-config"
require_sudoer "sudo yum install -y pkg-config"
sudo yum install -y pkg-config; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
echo "install pkg-config success"
fi
fi fi
# for arm, install the cross build tool chain. # for arm, install the cross build tool chain.