diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-17 21:58:15 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-17 21:58:15 +0400 |
| commit | ecb11b43fcc241cd7896561b83d255023ac2905b (patch) | |
| tree | 1485c108c5c5647469d57232e7381459a9791614 /build_files/build_environment | |
| parent | 469324b049012667a083017afa21538026008734 (diff) | |
Install dependencies: added check for minimal version of x264
Also fixed parsing of package version with epoch
Diffstat (limited to 'build_files/build_environment')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index fcf5fb227f9..444bf8ea50b 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -55,6 +55,7 @@ XVID_USE=false XVID_DEV="" X264_USE=false X264_DEV="" +X264_VERSION_MIN=0.118 VPX_USE=false VPX_VERSION_MIN=0.9.7 VPX_DEV="" @@ -605,7 +606,7 @@ check_package_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 return 1 @@ -616,7 +617,7 @@ check_package_version_match_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 return 1 @@ -676,7 +677,7 @@ install_DEB() { fi X264_DEV="libx264-dev" - check_package_DEB $X264_DEV + check_package_version_ge_DEB $X264_DEV $X264_VERSION_MIN if [ $? -eq 0 ]; then sudo apt-get install -y $X264_DEV X264_USE=true |