diff options
author | Brecht Van Lommel <brecht@blender.org> | 2022-06-23 19:18:59 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2022-06-28 16:57:06 +0300 |
commit | d5dcbabdd24a3e3854ac6367d3c641a9a3cde84e (patch) | |
tree | 5b74dc4c6997546d4317b898abe4012345c783ff /build_files/build_environment | |
parent | 4d982cbb5d950f10493fa911a4955fd4a2e65589 (diff) |
Build: remove GLEW version checking from install_deps.sh
Latest OpenSubdiv builds without GLEW by default, which is also what we do
for precompiled libraries. So there is no need for compatibility checking
with system GLEW.
Additionally WITH_SYSTEM_GLEW is turned off by default for Blender, and this
logic was presumably added when it was still on by default a few years ago.
Also remove outdated mention of glew-mx, we use intern/glew-mx and no
external library for this.
Differential Revision: https://developer.blender.org/D15281
Diffstat (limited to 'build_files/build_environment')
-rwxr-xr-x | build_files/build_environment/install_deps.sh | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 8b9af14545b..cfba4f12c73 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -635,9 +635,6 @@ MP3LAME_DEV="" OPENJPEG_USE=false OPENJPEG_DEV="" -# Whether to use system GLEW or not (OpenSubDiv needs recent glew to work). -NO_SYSTEM_GLEW=false - # Switch to english language, else some things (like check_package_DEB()) won't work! LANG_BACK=$LANG LANG="" @@ -1193,7 +1190,7 @@ Those libraries should be available as packages in all recent distributions (opt * libx11, libxcursor, libxi, libxrandr, libxinerama (and other libx... as needed). * libwayland-client0, libwayland-cursor0, libwayland-egl1, libxkbcommon0, libdbus-1-3, libegl1 (Wayland) * libsqlite3, libzstd, libbz2, libssl, libfftw3, libxml2, libtinyxml, yasm, libyaml-cpp, flex. - * libsdl2, libglew, libpugixml, libpotrace, [libgmp], [libglewmx], fontconfig, [libharu/libhpdf].\"" + * libsdl2, libglew, libpugixml, libpotrace, [libgmp], fontconfig, [libharu/libhpdf].\"" DEPS_SPECIFIC_INFO="\"BUILDABLE DEPENDENCIES: @@ -2701,9 +2698,8 @@ compile_OSD() { cmake_d="$cmake_d -D TBB_LOCATION=$INST/tbb" fi cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst" - # ptex is only needed when nicholas bishop is ready cmake_d="$cmake_d -D NO_PTEX=1" - cmake_d="$cmake_d -D NO_CLEW=1 -D NO_CUDA=1 -D NO_OPENCL=1" + cmake_d="$cmake_d -D NO_CLEW=1 -D NO_CUDA=1 -D NO_OPENCL=1 -D NO_GLEW=1" # maya plugin, docs, tutorials, regression tests and examples are not needed cmake_d="$cmake_d -D NO_MAYA=1 -D NO_DOC=1 -D NO_TUTORIALS=1 -D NO_REGRESSION=1 -DNO_EXAMPLES=1" @@ -4062,7 +4058,6 @@ install_DEB() { libopenal-dev libglew-dev yasm \ libsdl2-dev libfftw3-dev patch bzip2 libxml2-dev libtinyxml-dev libjemalloc-dev \ libgmp-dev libpugixml-dev libpotrace-dev libhpdf-dev libzstd-dev libpystring-dev" - # libglewmx-dev (broken in deb testing currently...) VORBIS_USE=true OGG_USE=true @@ -4171,7 +4166,7 @@ install_DEB() { fi fi - # Check cmake/glew versions and disable features for older distros. + # Check cmake version and disable features for older distros. # This is so Blender can at least compile. PRINT "" _cmake=`get_package_version_DEB cmake` @@ -4189,28 +4184,6 @@ install_DEB() { fi PRINT "" - _glew=`get_package_version_DEB libglew-dev` - if [ -z $_glew ]; then - # Stupid virtual package in Ubuntu 12.04 doesn't show version number... - _glew=`apt-cache showpkg libglew-dev|tail -n1|awk '{print $2}'|sed 's/-.*//'` - fi - version_ge $_glew "1.9.0" - if [ $? -eq 1 ]; then - version_ge $_glew "1.7.0" - if [ $? -eq 1 ]; then - WARNING "OpenSubdiv disabled because GLEW-$_glew is not enough" - WARNING "Blender will not use system GLEW library" - OSD_SKIP=true - NO_SYSTEM_GLEW=true - else - WARNING "OpenSubdiv will compile with GLEW-$_glew but with limited capability" - WARNING "Blender will not use system GLEW library" - NO_SYSTEM_GLEW=true - fi - fi - - - PRINT "" _do_compile_python=false if [ "$PYTHON_SKIP" = true ]; then WARNING "Skipping Python installation, as requested..." @@ -6290,12 +6263,6 @@ print_info() { fi fi - if [ "$NO_SYSTEM_GLEW" = true ]; then - _1="-D WITH_SYSTEM_GLEW=OFF" - PRINT " $_1" - _buildargs="$_buildargs $_1" - fi - if [ "$FFMPEG_SKIP" = false ]; then _1="-D WITH_CODEC_FFMPEG=ON" PRINT " $_1" |