diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-18 16:13:59 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-18 16:24:09 +0300 |
commit | 3922d5194fcb0c708d43239f74007b3c7865b7e5 (patch) | |
tree | 8bc2b92503a23487db4667c64949e15f83175357 /build_files | |
parent | 2836003f6bd26e8d1e9dfd9ffb1d844384bebbd2 (diff) |
Fix install_deps.sh for new Ubuntu 17.04, which does not have libopenjpeg!
Diffstat (limited to 'build_files')
-rwxr-xr-x | build_files/build_environment/install_deps.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 82895acf25e..6b85ad3dde1 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -2601,7 +2601,6 @@ install_DEB() { fi # These libs should always be available in debian/ubuntu official repository... - OPENJPEG_DEV="libopenjpeg-dev" VORBIS_DEV="libvorbis-dev" OGG_DEV="libogg-dev" THEORA_DEV="libtheora-dev" @@ -2609,17 +2608,25 @@ install_DEB() { _packages="gawk cmake cmake-curses-gui build-essential libjpeg-dev libpng-dev libtiff-dev \ git libfreetype6-dev libx11-dev flex bison libtbb-dev libxxf86vm-dev \ libxcursor-dev libxi-dev wget libsqlite3-dev libxrandr-dev libxinerama-dev \ - libbz2-dev libncurses5-dev libssl-dev liblzma-dev libreadline-dev $OPENJPEG_DEV \ + libbz2-dev libncurses5-dev libssl-dev liblzma-dev libreadline-dev \ libopenal-dev libglew-dev yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV \ libsdl1.2-dev libfftw3-dev patch bzip2 libxml2-dev libtinyxml-dev libjemalloc-dev" # libglewmx-dev (broken in deb testing currently...) - OPENJPEG_USE=true VORBIS_USE=true OGG_USE=true THEORA_USE=true PRINT "" + # New Ubuntu crap (17.04 and more) have no openjpeg lib! + OPENJPEG_DEV="libopenjpeg-dev" + check_package_DEB $OPENJPEG_DEV + if [ $? -eq 0 ]; then + _packages="$_packages $OPENJPEG_DEV" + OPENJPEG_USE=true + fi + + PRINT "" # Some not-so-old distro (ubuntu 12.4) do not have it, do not fail in this case, just warn. YAMLCPP_DEV="libyaml-cpp-dev" check_package_DEB $YAMLCPP_DEV |