kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Partial fix to version_ge (greater or equal), was not working correctly with eaqual versions, now will do with exact same versions at least (yet have to fix case like comparing 1.0 and 1.0.0).

Browse Source 
Also refactored a bit osl/llvm/etc. stuff for DEB (so that now all osl-deps are only installed when we do have a valid llvm and want to [try to!] build osl).

And added osl/llvm/etc. code for RPM (osl does not compile under fedora currently, though :/ ).
This commit is contained in:
Bastien Montagne 2012-11-18 20:31:58 +00:00
parent 00c194718a
commit 0aadad0896
1 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
build_files/build_environment/install_deps.sh
View File

@ -81,7 +81,9 @@ INFO() {
# Return 0 if $1 >= $2, else 1. # Return 0 if $1 >= $2, else 1.
# $1 and $2 should be version numbers made of numbers only. # $1 and $2 should be version numbers made of numbers only.
version_ge() { version_ge() {
if [ $(echo -e "$1\n$2" | sort --version-sort | head --lines=1) = "$1" ]; then # XXX Not yet perfect, won't always work as expected with e.g. 1.0.0 and 1.0... :/
if [ "$1" != "$2" ] &&
[ $(echo -e "$1\n$2" | sort --version-sort | head --lines=1) = "$1" ]; then
return 1 return 1
else else
return 0 return 0
@ -599,8 +601,8 @@ compile_FFmpeg() {
fi fi
} }
deb_version() { get_package_version_DEB() {
dpkg-query -W -f '${Version}' $1 | sed -r 's/^([0-9]\.[0-9]+).*/\1/' dpkg-query -W -f '${Version}' $1 | sed -r 's/.*:\s*([0-9]+:)(([0-9]+\.?)+).*/\2/'
} }
check_package_DEB() { check_package_DEB() {
@ -657,7 +659,7 @@ install_DEB() {
libfreetype6-dev libx11-dev libxi-dev wget libsqlite3-dev libbz2-dev libncurses5-dev \ libfreetype6-dev libx11-dev libxi-dev wget libsqlite3-dev libbz2-dev libncurses5-dev \
libssl-dev liblzma-dev libreadline-dev $OPENJPEG_DEV libopenexr-dev libopenal-dev \ libssl-dev liblzma-dev libreadline-dev $OPENJPEG_DEV libopenexr-dev libopenal-dev \
libglew-dev yasm $SCHRO_DEV $THEORA_DEV $VORBIS_DEV libsdl1.2-dev \ libglew-dev yasm $SCHRO_DEV $THEORA_DEV $VORBIS_DEV libsdl1.2-dev \
libfftw3-dev libjack-dev python-dev patch flex bison libtbb-dev git libfftw3-dev libjack-dev python-dev patch
OPENJPEG_USE=true OPENJPEG_USE=true
SCHRO_USE=true SCHRO_USE=true
@ -716,7 +718,7 @@ install_DEB() {
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
sudo apt-get install -y libboost-dev sudo apt-get install -y libboost-dev
boost_version=`deb_version libboost-dev` boost_version=`get_package_version_DEB libboost-dev`
check_package_DEB libboost-locale$boost_version-dev check_package_DEB libboost-locale$boost_version-dev
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
@ -749,19 +751,20 @@ install_DEB() {
check_package_DEB llvm-$LLVM_VERSION-dev check_package_DEB llvm-$LLVM_VERSION-dev
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
sudo apt-get install -y llvm-$LLVM_VERSION-dev clang sudo apt-get install -y llvm-$LLVM_VERSION-dev
have_llvm=true have_llvm=true
LLVM_VERSION_FOUND=$LLVM_VERSION LLVM_VERSION_FOUND=$LLVM_VERSION
else else
check_package_DEB llvm-$LLVM_VERSION_MIN-dev check_package_DEB llvm-$LLVM_VERSION_MIN-dev
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
sudo apt-get install -y llvm-$LLVM_VERSION_MIN-dev clang sudo apt-get install -y llvm-$LLVM_VERSION_MIN-dev
have_llvm=true have_llvm=true
LLVM_VERSION_FOUND=$LLVM_VERSION_MIN LLVM_VERSION_FOUND=$LLVM_VERSION_MIN
fi fi
fi fi
if $have_llvm; then if $have_llvm; then
sudo apt-get install -y clang flex bison libtbb-dev git
# No package currently! # No package currently!
compile_OSL compile_OSL
fi fi
@ -772,7 +775,7 @@ install_DEB() {
# check_package_DEB ffmpeg # check_package_DEB ffmpeg
# if [ $? -eq 0 ]; then # if [ $? -eq 0 ]; then
# sudo apt-get install -y ffmpeg # sudo apt-get install -y ffmpeg
# ffmpeg_version=`deb_version ffmpeg` # ffmpeg_version=`get_package_version_DEB ffmpeg`
# INFO "ffmpeg version: $ffmpeg_version" # INFO "ffmpeg version: $ffmpeg_version"
# if [ ! -z "$ffmpeg_version" ]; then # if [ ! -z "$ffmpeg_version" ]; then
# if dpkg --compare-versions $ffmpeg_version gt 0.7.2; then # if dpkg --compare-versions $ffmpeg_version gt 0.7.2; then
@ -785,6 +788,10 @@ install_DEB() {
compile_FFmpeg compile_FFmpeg
} }
get_package_version_RPM() {
yum info $1 | grep Version | tail -n 1 | sed -r 's/.*:\s+(([0-9]+\.?)+).*/\1/'
}
check_package_RPM() { check_package_RPM() {
r=`yum info $1 | grep -c 'Summary'` r=`yum info $1 | grep -c 'Summary'`
@ -901,6 +908,37 @@ install_RPM() {
compile_OIIO compile_OIIO
fi fi
if $BUILD_OSL; then
have_llvm=false
check_package_RPM llvm-$LLVM_VERSION-devel
if [ $? -eq 0 ]; then
sudo yum install -y llvm-$LLVM_VERSION-devel
have_llvm=true
LLVM_VERSION_FOUND=$LLVM_VERSION
else
check_package_RPM llvm-$LLVM_VERSION_MIN-devel
if [ $? -eq 0 ]; then
sudo yum install -y llvm-$LLVM_VERSION_MIN-devel
have_llvm=true
LLVM_VERSION_FOUND=$LLVM_VERSION_MIN
else
check_package_version_ge_RPM llvm-devel $LLVM_VERSION_MIN
if [ $? -eq 0 ]; then
sudo yum install -y llvm-devel
have_llvm=true
LLVM_VERSION_FOUND=`get_package_version_RPM llvm-devel`
fi
fi
fi
if $have_llvm; then
sudo yum install -y flex bison clang tbb-devel git
# No package currently!
compile_OSL
fi
fi
# Always for now, not sure which packages should be installed # Always for now, not sure which packages should be installed
compile_FFmpeg compile_FFmpeg
} }