Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2014-02-04 19:40:15 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2014-02-04 19:52:33 +0400
commit2ebffd01da229ab0fd678dcda5b0c0c2e4fcf9ee (patch)
tree8f00f92f404034333a502743f589727053ecc971 /build_files
parent28e6d05e0952bf96eec0320231178c883e0b8079 (diff)
Deb-like distro may use either jack or jack2, add support for this.
Diffstat (limited to 'build_files')
-rwxr-xr-xbuild_files/build_environment/install_deps.sh21
1 files changed, 20 insertions, 1 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 27ee0102d9f..fc70cffbeae 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 ""