Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Install dependencies: added check for minimal version of x264

Browse Source 
Also fixed parsing of package version with epoch
This commit is contained in:
Sergey Sharybin
2012-11-17 17:58:15 +00:00
parent 469324b049
commit ecb11b43fc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build_files/build_environment/install_deps.sh
View File

@@ -55,6 +55,7 @@ XVID_USE=false
XVID_DEV="" XVID_DEV=""
X264_USE=false X264_USE=false
X264_DEV="" X264_DEV=""
X264_VERSION_MIN=0.118
VPX_USE=false VPX_USE=false
VPX_VERSION_MIN=0.9.7 VPX_VERSION_MIN=0.9.7
VPX_DEV="" VPX_DEV=""
@@ -605,7 +606,7 @@ check_package_DEB() {
} }
check_package_version_match_DEB() { check_package_version_match_DEB() {
v=`apt-cache policy $1 | grep 'Candidate:' | sed -r 's/.*:\s*(([0-9]+\.?)+).*/\1/'` v=`apt-cache policy $1 | grep 'Candidate:' | sed -r 's/.*:\s*([0-9]+:)(([0-9]+\.?)+).*/\2/'`
if [ -z "$v" ]; then if [ -z "$v" ]; then
return 1 return 1
@@ -616,7 +617,7 @@ check_package_version_match_DEB() {
} }
check_package_version_ge_DEB() { check_package_version_ge_DEB() {
v=`apt-cache policy $1 | grep 'Candidate:' | sed -r 's/.*:\s*(([0-9]+\.?)+).*/\1/'` v=`apt-cache policy $1 | grep 'Candidate:' | sed -r 's/.*:\s*([0-9]+:)?(([0-9]+\.?)+).*/\2/'`
if [ -z "$v" ]; then if [ -z "$v" ]; then
return 1 return 1
@@ -676,7 +677,7 @@ install_DEB() {
fi fi
X264_DEV="libx264-dev" X264_DEV="libx264-dev"
check_package_DEB $X264_DEV check_package_version_ge_DEB $X264_DEV $X264_VERSION_MIN
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
sudo apt-get install -y $X264_DEV sudo apt-get install -y $X264_DEV
X264_USE=true X264_USE=true