Skip to content

Commit ee6f094

Browse files
committed
Merge remote-tracking branch 'upstream/main'
# Conflicts: # codex-rs/core/src/client.rs # codex-rs/core/src/tools/handlers/shell.rs # codex-rs/tui/src/app.rs # codex-rs/tui/src/lib.rs
2 parents 46ce794 + 598d6ff commit ee6f094

194 files changed

Lines changed: 8748 additions & 1209 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

MODULE.bazel

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,37 @@ osx.frameworks(names = [
4040
"ColorSync",
4141
"CoreFoundation",
4242
"CoreGraphics",
43+
"CoreImage",
44+
"CoreMedia",
45+
"CoreMIDI",
4346
"CoreServices",
4447
"CoreText",
48+
"CoreVideo",
49+
"DiskArbitration",
4550
"AudioToolbox",
51+
"AVFoundation",
52+
"AVFAudio",
53+
"AVRouting",
4654
"CFNetwork",
4755
"FontServices",
4856
"AudioUnit",
4957
"CoreAudio",
5058
"CoreAudioTypes",
5159
"Foundation",
5260
"ImageIO",
61+
"IOSurface",
5362
"IOKit",
5463
"Kernel",
64+
"Metal",
65+
"MetalKit",
66+
"OpenGL",
5567
"OSLog",
68+
"QuartzCore",
69+
"ScreenCaptureKit",
5670
"Security",
5771
"SystemConfiguration",
72+
"UniformTypeIdentifiers",
73+
"VideoToolbox",
5874
])
5975
use_repo(osx, "macos_sdk")
6076

@@ -345,6 +361,23 @@ crate.annotation(
345361

346362
inject_repo(crate, "llvm", "llvm-project", "macos_sdk")
347363

364+
crate.annotation(
365+
# Provide the hermetic SDK path so the build script doesn't try to invoke an unavailable `xcrun --show-sdk-path`.
366+
build_script_data = [
367+
"@macos_sdk//sysroot",
368+
],
369+
build_script_env = {
370+
"WEBRTC_SYS_DARWIN_SDK_PATH": "$(location @macos_sdk//sysroot)",
371+
"WEBRTC_SYS_LINK_OUT_DIR": "1",
372+
},
373+
crate = "webrtc-sys",
374+
gen_build_script = "on",
375+
patch_args = ["-p1"],
376+
patches = [
377+
"//patches:webrtc-sys_hermetic_darwin_sysroot.patch",
378+
],
379+
)
380+
348381
# Fix readme inclusions
349382
crate.annotation(
350383
crate = "windows-link",

MODULE.bazel.lock

Lines changed: 40 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)