[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52310] trunk/blender/build_files/ build_environment/install_deps.sh: Install dependencies: added check for minimal version of x264

[Sergey Sharybin]

Revision: 52310
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52310
Author:   nazgul
Date:     2012-11-17 17:58:15 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
Install dependencies: added check for minimal version of x264

Also fixed parsing of package version with epoch

Modified Paths:
--------------
    trunk/blender/build_files/build_environment/install_deps.sh

Modified: trunk/blender/build_files/build_environment/install_deps.sh
===================================================================
--- trunk/blender/build_files/build_environment/install_deps.sh	2012-11-17 16:11:02 UTC (rev 52309)
+++ trunk/blender/build_files/build_environment/install_deps.sh	2012-11-17 17:58:15 UTC (rev 52310)
@@ -55,6 +55,7 @@
 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_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_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 @@
   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