Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/m129.6668
Browse files Browse the repository at this point in the history
  • Loading branch information
melpon committed Aug 22, 2024
2 parents 45319f5 + 9ab5484 commit 39f4e88
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 59 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ jobs:
runs-on: macos-14
steps:
- uses: actions/checkout@v4
- name: Select Xcode 14.3.1
run: sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
- name: Select Xcode 15.4
run: sudo xcode-select --switch /Applications/Xcode_15.4.app/Contents/Developer
- run: brew install ninja
- name: Setup Git User
run: |
Expand Down
15 changes: 15 additions & 0 deletions patches/dav1d_config_change.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/third_party/dav1d/config/apple/arm64/config.h b/third_party/dav1d/config/apple/arm64/config.h
index 9a15fc5393f..83a88db75b7 100644
--- a/third_party/dav1d/config/apple/arm64/config.h
+++ b/third_party/dav1d/config/apple/arm64/config.h
@@ -43,9 +43,9 @@

#define HAVE_ASM 1

-#define HAVE_AS_ARCHEXT_DOTPROD_DIRECTIVE 1
+#define HAVE_AS_ARCHEXT_DOTPROD_DIRECTIVE 0

-#define HAVE_AS_ARCHEXT_I8MM_DIRECTIVE 1
+#define HAVE_AS_ARCHEXT_I8MM_DIRECTIVE 0

#define HAVE_AS_ARCHEXT_SVE2_DIRECTIVE 1
55 changes: 0 additions & 55 deletions patches/revert_asm_changes.patch

This file was deleted.

4 changes: 2 additions & 2 deletions run.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ def get_depot_tools(source_dir, fetch=False):
"h265.patch",
"h265_ios.patch",
"arm_neon_sve_bridge.patch",
"revert_asm_changes.patch",
"dav1d_config_change.patch",
"fix_perfetto.patch",
],
"ios": [
Expand All @@ -240,7 +240,7 @@ def get_depot_tools(source_dir, fetch=False):
"h265.patch",
"h265_ios.patch",
"arm_neon_sve_bridge.patch",
"revert_asm_changes.patch",
"dav1d_config_change.patch",
"fix_perfetto.patch",
],
"android": [
Expand Down

0 comments on commit 39f4e88

Please sign in to comment.