diff options
author | Bastien Montagne <bastien@blender.org> | 2020-09-16 12:21:50 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-09-16 12:23:58 +0300 |
commit | c5c22d1ce1ce874625ccdae51430b8fd9a18b24b (patch) | |
tree | 06b61c622342894b43052f4788dea2c8279915e7 /build_files | |
parent | 7cae58adf5cfeee168d25d3432cf9ca82eeb0290 (diff) |
Install_deps: update to add pugixml and potrace new deps.
Also fixed OpenVDB maximum version, it appears that even 7.1 is not
compatible with 7.0?
Re T80818 and D8628.
Diffstat (limited to 'build_files')
-rwxr-xr-x | build_files/build_environment/install_deps.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 43606f49c78..499e05ed311 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -474,7 +474,7 @@ OPENVDB_BLOSC_VERSION="1.5.0" OPENVDB_VERSION="7.0.0" OPENVDB_VERSION_SHORT="7.0" OPENVDB_VERSION_MIN="7.0" -OPENVDB_VERSION_MAX="8.0" +OPENVDB_VERSION_MAX="7.1" OPENVDB_FORCE_BUILD=false OPENVDB_FORCE_REBUILD=false OPENVDB_SKIP=false @@ -1087,7 +1087,7 @@ Those libraries should be available as packages in all recent distributions (opt * libjpeg, libpng, libtiff, [openjpeg2], [libopenal]. * libx11, libxcursor, libxi, libxrandr, libxinerama (and other libx... as needed). * libsqlite3, libbz2, libssl, libfftw3, libxml2, libtinyxml, yasm, libyaml-cpp. - * libsdl2, libglew, [libgmp], [libglewmx], fontconfig.\"" + * libsdl2, libglew, libpugixml, libpotrace, [libgmp], [libglewmx], fontconfig.\"" DEPS_SPECIFIC_INFO="\"BUILDABLE DEPENDENCIES: @@ -3659,7 +3659,7 @@ install_DEB() { libbz2-dev libncurses5-dev libssl-dev liblzma-dev libreadline-dev \ libopenal-dev libglew-dev yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV \ libsdl2-dev libfftw3-dev patch bzip2 libxml2-dev libtinyxml-dev libjemalloc-dev \ - libgmp-dev" + libgmp-dev libpugixml-dev libpotrace-dev" # libglewmx-dev (broken in deb testing currently...) VORBIS_USE=true @@ -4325,7 +4325,8 @@ install_RPM() { libX11-devel libXi-devel libXcursor-devel libXrandr-devel libXinerama-devel \ wget ncurses-devel readline-devel $OPENJPEG_DEV openal-soft-devel \ glew-devel yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV patch \ - libxml2-devel yaml-cpp-devel tinyxml-devel jemalloc-devel gmp-devel" + libxml2-devel yaml-cpp-devel tinyxml-devel jemalloc-devel \ + gmp-devel pugixml-devel potrace-devel" OPENJPEG_USE=true VORBIS_USE=true @@ -4901,7 +4902,7 @@ install_ARCH() { _packages="$BASE_DEVEL git cmake fontconfig \ libxi libxcursor libxrandr libxinerama glew libpng libtiff wget openal \ $OPENJPEG_DEV $VORBIS_DEV $OGG_DEV $THEORA_DEV yasm sdl2 fftw \ - libxml2 yaml-cpp tinyxml python-requests jemalloc gmp" + libxml2 yaml-cpp tinyxml python-requests jemalloc gmp potrace pugixml" OPENJPEG_USE=true VORBIS_USE=true |