mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
remove the libfreetype for it fullfill with bugs and always cause build failed. 0.9.139
This commit is contained in:
parent
cb2967c967
commit
55989b4bc8
11 changed files with 10 additions and 70 deletions
|
@ -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 &&
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue