[Bf-blender-cvs] [8af30fd7e0a] tmp_libupdate_34: Merge remote-tracking branch 'origin/master' into tmp_libupdate_34

[Brecht Van Lommel]

Commit: 8af30fd7e0ac0808ffcf9c4e7f1e7fcdc29e0000
Author: Brecht Van Lommel
Date:   Wed Aug 17 19:40:09 2022 +0200
Branches: tmp_libupdate_34
https://developer.blender.org/rB8af30fd7e0ac0808ffcf9c4e7f1e7fcdc29e0000

Merge remote-tracking branch 'origin/master' into tmp_libupdate_34

===================================================================



===================================================================

diff --cc build_files/build_environment/cmake/check_software.cmake
index 08820a234b7,cc8fead6f81..0756b058b2d
--- a/build_files/build_environment/cmake/check_software.cmake
+++ b/build_files/build_environment/cmake/check_software.cmake
@@@ -12,7 -12,8 +12,9 @@@ if(UNIX
      automake
      bison
      ${_libtoolize_name}
+     meson
+     ninja
 +    patchelf
      pkg-config
      tclsh
      yasm
@@@ -55,10 -46,10 +47,10 @@@
        "  ${_software_missing}\n"
        "\n"
        "On Debian and Ubuntu:\n"
 -      "  apt install autoconf automake libtool yasm tcl ninja-build meson python3-mako\n"
 +      "  apt install autoconf automake libtool yasm tcl ninja-build meson python3-mako patchelf\n"
        "\n"
        "On macOS (with homebrew):\n"
-       "  brew install autoconf automake bison flex libtool pkg-config yasm\n"
+       "  brew install autoconf automake bison flex libtool meson ninja pkg-config yasm\n"
        "\n"
        "Other platforms:\n"
        "  Install equivalent packages.\n")
diff --cc build_files/build_environment/cmake/harvest.cmake
index 0a13a023851,6ed98398fde..99bc0e6661e
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@@ -96,14 -72,10 +93,14 @@@ harvest(fftw3/lib fftw3/lib "*.a"
  harvest(flac/lib sndfile/lib "libFLAC.a")
  harvest(freetype/include freetype/include "*.h")
  harvest(freetype/lib/libfreetype2ST.a freetype/lib/libfreetype.a)
 +harvest(fribidi/include fribidi/include "*.h")
 +harvest(fribidi/lib fribidi/lib "*.a")
- harvest(glew/include glew/include "*.h")
- harvest(glew/lib glew/lib "*.a")
+ harvest(epoxy/include epoxy/include "*.h")
+ harvest(epoxy/lib epoxy/lib "*.a")
  harvest(gmp/include gmp/include "*.h")
  harvest(gmp/lib gmp/lib "*.a")
 +harvest(harfbuzz/include harfbuzz/include "*.h")
 +harvest(harfbuzz/lib harfbuzz/lib "*.a")
  harvest(jemalloc/include jemalloc/include "*.h")
  harvest(jemalloc/lib jemalloc/lib "*.a")
  harvest(jpeg/include jpeg/include "*.h")