[Bf-blender-cvs] [2ebffd0] master: Deb-like distro may use either jack or jack2, add support for this.
Bastien Montagne
noreply at git.blender.org
Tue Feb 4 16:52:23 CET 2014
Commit: 2ebffd01da229ab0fd678dcda5b0c0c2e4fcf9ee
Author: Bastien Montagne
Date: Tue Feb 4 16:40:15 2014 +0100
https://developer.blender.org/rB2ebffd01da229ab0fd678dcda5b0c0c2e4fcf9ee
Deb-like distro may use either jack or jack2, add support for this.
===================================================================
M build_files/build_environment/install_deps.sh
===================================================================
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 27ee010..fc70cff 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1652,6 +1652,16 @@ check_package_DEB() {
fi
}
+check_package_installed_DEB() {
+ r=`dpkg -s $1 | grep -c '$1'`
+
+ if [ $r -ge 1 ]; then
+ return 0
+ else
+ return 1
+ fi
+}
+
check_package_version_match_DEB() {
v=`apt-cache policy $1 | grep 'Candidate:' | sed -r 's/.*:\s*([0-9]+:)(([0-9]+\.?)+).*/\2/'`
@@ -1778,7 +1788,16 @@ install_DEB() {
fi
if $WITH_ALL; then
- _packages="$_packages libspnav-dev libjack-dev"
+ _packages="$_packages libspnav-dev"
+ # Only install jack if jack2 is not already installed!
+ JACK="libjack-dev"
+ JACK2="libjack-jackd2-dev"
+ check_package_installed_DEB JACK2
+ if [ $? -eq 0 ]; then
+ _packages="$_packages $JACK2"
+ else
+ _packages="$_packages $JACK"
+ fi
fi
PRINT ""
More information about the Bf-blender-cvs
mailing list