From 08064af054a725ec8ef0b7d939ce4c243ed74100 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 17 Jul 2024 23:59:46 +0530 Subject: [PATCH] macos: Native file updates We ship a vpx wrap now, and we need to explicitly pass options to glib-networking and libnice. Also, ensure that we're building the right GL API/winsys/platform. This sets a default to protect us from stray Homebrew installations with XQuartz. Part-of: --- data/machine-files/macos-native-file.ini | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/data/machine-files/macos-native-file.ini b/data/machine-files/macos-native-file.ini index 2d71203005..776804be39 100644 --- a/data/machine-files/macos-native-file.ini +++ b/data/machine-files/macos-native-file.ini @@ -8,7 +8,6 @@ common_args = ['--sysroot=' + macosx_sdk, '-mmacosx-version-min=' + macosx_m # Uncomment for arm64 macs: homebrew_prefix = '/opt/homebrew' openssl_pc = homebrew_prefix / 'opt/openssl@1.1/lib/pkgconfig' -vpx_pc = homebrew_prefix / 'opt/libvpx/lib/pkgconfig' [built-in options] c_args = common_args @@ -19,10 +18,11 @@ c_link_args = common_args cpp_link_args = common_args objc_link_args = common_args objcpp_link_args = common_args -pkg_config_path = [openssl_pc, vpx_pc] -force_fallback_for = ['zlib', 'libffi'] +pkg_config_path = [openssl_pc] +force_fallback_for = ['zlib', 'libffi', 'glib', 'libvpx'] [project options] +ges = 'enabled' rs = 'enabled' libnice = 'enabled' tls = 'enabled' @@ -30,9 +30,19 @@ introspection = 'disabled' python = 'disabled' qt5 = 'enabled' +[libnice:project options] +crypto-library = 'openssl' + +[glib-networking:project options] +gnutls = 'disabled' +openssl = 'enabled' + [gst-plugins-base:project options] gl = 'enabled' pango = 'enabled' +gl_api = ['opengl'] +gl_platform = ['cgl'] +gl_winsys = ['cocoa'] [gst-plugins-bad:project options] applemedia = 'enabled'