[Bf-blender-cvs] [86928401278] tmp_libupdate_34: deps: fribidi and harfbuzz build support on linux

[Ray Molenkamp]

Commit: 8692840127823850fdc8f615373baeb2ad10c8e0
Author: Ray Molenkamp
Date:   Sat Aug 13 18:13:54 2022 -0600
Branches: tmp_libupdate_34
https://developer.blender.org/rB8692840127823850fdc8f615373baeb2ad10c8e0

deps: fribidi and harfbuzz build support on linux

still todo: harvest

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

M	build_files/build_environment/cmake/fribidi.cmake
M	build_files/build_environment/cmake/harfbuzz.cmake
M	build_files/build_environment/cmake/options.cmake

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

diff --git a/build_files/build_environment/cmake/fribidi.cmake b/build_files/build_environment/cmake/fribidi.cmake
index e836fbb751d..6e063eb5b26 100644
--- a/build_files/build_environment/cmake/fribidi.cmake
+++ b/build_files/build_environment/cmake/fribidi.cmake
@@ -9,7 +9,7 @@ ExternalProject_Add(external_fribidi
   URL_HASH ${FRIBIDI_HASH_TYPE}=${FRIBIDI_HASH}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/fribidi
-  CONFIGURE_COMMAND ${LIBDIR}/python/Scripts/meson setup --prefix ${LIBDIR}/fribidi -Ddocs=false --default-library static --libdir lib ${BUILD_DIR}/fribidi/src/external_fribidi-build ${BUILD_DIR}/fribidi/src/external_fribidi
+  CONFIGURE_COMMAND ${MESON} setup --prefix ${LIBDIR}/fribidi -Ddocs=false --default-library static --libdir lib ${BUILD_DIR}/fribidi/src/external_fribidi-build ${BUILD_DIR}/fribidi/src/external_fribidi
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
   INSTALL_DIR ${LIBDIR}/fribidi
diff --git a/build_files/build_environment/cmake/harfbuzz.cmake b/build_files/build_environment/cmake/harfbuzz.cmake
index db6c096fc8b..309dff867ea 100644
--- a/build_files/build_environment/cmake/harfbuzz.cmake
+++ b/build_files/build_environment/cmake/harfbuzz.cmake
@@ -1,23 +1,26 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 if(WIN32)
-  set(CONFIGURE_ENV ${CONFIGURE_ENV_MSVC})
-  set(FREETYPE_EXPORT set FREETYPE_DIR=${LIBDIR}/freetype)
+  set(HARFBUZZ_CONFIGURE_ENV ${CONFIGURE_ENV_MSVC} && set FREETYPE_DIR=${LIBDIR}/freetype)
 else()
-  set(FREETYPE_EXPORT export FREETYPE_DIR=${LIBDIR}/freetype)
+  set(HARFBUZZ_CONFIGURE_ENV ${CONFIGURE_ENV} && PKG_CONFIG_PATH=${LIBDIR}/freetype/lib/pkgconfig:${LIBDIR}/brotli/lib/pkgconfig)
 endif()
 
 set(HARFBUZZ_EXTRA_OPTIONS
   -Dtests=disabled
   -Dfreetype=enabled
+  -Dglib=disabled
+  -Dgobject=disabled
 )
 
+
+
 ExternalProject_Add(external_harfbuzz
   URL file://${PACKAGE_DIR}/${HARFBUZZ_FILE}
   URL_HASH ${HARFBUZZ_HASH_TYPE}=${HARFBUZZ_HASH}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/harfbuzz
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${FREETYPE_EXPORT} && ${LIBDIR}/python/Scripts/meson setup --prefix ${LIBDIR}/harfbuzz ${HARFBUZZ_EXTRA_OPTIONS} --default-library static --libdir lib ${BUILD_DIR}/harfbuzz/src/external_harfbuzz-build ${BUILD_DIR}/harfbuzz/src/external_harfbuzz
+  CONFIGURE_COMMAND ${HARFBUZZ_CONFIGURE_ENV} && ${MESON} setup --prefix ${LIBDIR}/harfbuzz ${HARFBUZZ_EXTRA_OPTIONS} --default-library static --libdir lib ${BUILD_DIR}/harfbuzz/src/external_harfbuzz-build ${BUILD_DIR}/harfbuzz/src/external_harfbuzz
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
   INSTALL_DIR ${LIBDIR}/harfbuzz
diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake
index 05d1cc84222..6a2cd66d284 100644
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -39,7 +39,7 @@ if(WIN32)
   set(LIBEXT ".lib")
   set(SHAREDLIBEXT ".lib")
   set(LIBPREFIX "")
-
+  set(MESON ${LIBDIR}/python/Scripts/meson)
   # For OIIO and OSL
   set(COMMON_DEFINES /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS)
 
@@ -114,8 +114,8 @@ else()
   set(PATCH_CMD patch)
   set(LIBEXT ".a")
   set(LIBPREFIX "lib")
-
-  if(APPLE)
+  set(MESON ${LIBDIR}/python/bin/meson)
+if(APPLE)
     set(SHAREDLIBEXT ".dylib")
 
     # Let's get the current Xcode dir, to support xcode-select