Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-06-20 10:25:52 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
94e5e7070db0813fbf47b8e3b7c8cedc7d321cc2
94e5e707
1 parent
094d82bd
fix bug of freetype2 build for ffmpeg, depends on pkg-config
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
17 行增加
和
0 行删除
trunk/auto/build_ffmpeg.sh
trunk/auto/depends.sh
trunk/auto/build_ffmpeg.sh
查看文件 @
94e5e70
...
...
@@ -70,6 +70,7 @@ else
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
...
...
trunk/auto/depends.sh
查看文件 @
94e5e70
...
...
@@ -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
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.
...
...
@@ -202,6 +210,14 @@ function Centos_prepare()
sudo yum install -y zlib-devel;
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then return
$ret
;
fi
echo
"install zlib-devel success"
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
# for arm, install the cross build tool chain.
...
...
请
注册
或
登录
后发表评论