diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 057b3431..9e7071ae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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: | diff --git a/patches/dav1d_config_change.patch b/patches/dav1d_config_change.patch new file mode 100644 index 00000000..2dae03e6 --- /dev/null +++ b/patches/dav1d_config_change.patch @@ -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 diff --git a/patches/revert_asm_changes.patch b/patches/revert_asm_changes.patch deleted file mode 100644 index 411310c5..00000000 --- a/patches/revert_asm_changes.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/third_party/dav1d/libdav1d/src/arm/asm.S b/third_party/dav1d/libdav1d/src/arm/asm.S -index fed73b3..dc50415 100644 ---- a/third_party/dav1d/libdav1d/src/arm/asm.S -+++ b/third_party/dav1d/libdav1d/src/arm/asm.S -@@ -34,50 +34,6 @@ - #define x18 do_not_use_x18 - #define w18 do_not_use_w18 - --#if HAVE_AS_ARCH_DIRECTIVE -- .arch AS_ARCH_LEVEL --#endif -- --#if HAVE_AS_ARCHEXT_DOTPROD_DIRECTIVE --#define ENABLE_DOTPROD .arch_extension dotprod --#define DISABLE_DOTPROD .arch_extension nodotprod --#else --#define ENABLE_DOTPROD --#define DISABLE_DOTPROD --#endif --#if HAVE_AS_ARCHEXT_I8MM_DIRECTIVE --#define ENABLE_I8MM .arch_extension i8mm --#define DISABLE_I8MM .arch_extension noi8mm --#else --#define ENABLE_I8MM --#define DISABLE_I8MM --#endif --#if HAVE_AS_ARCHEXT_SVE_DIRECTIVE --#define ENABLE_SVE .arch_extension sve --#define DISABLE_SVE .arch_extension nosve --#else --#define ENABLE_SVE --#define DISABLE_SVE --#endif --#if HAVE_AS_ARCHEXT_SVE2_DIRECTIVE --#define ENABLE_SVE2 .arch_extension sve2 --#define DISABLE_SVE2 .arch_extension nosve2 --#else --#define ENABLE_SVE2 --#define DISABLE_SVE2 --#endif -- --/* If we do support the .arch_extension directives, disable support for all -- * the extensions that we may use, in case they were implicitly enabled by -- * the .arch level. This makes it clear if we try to assemble an instruction -- * from an unintended extension set; we only allow assmbling such instructions -- * within regions where we explicitly enable those extensions. */ --DISABLE_DOTPROD --DISABLE_I8MM --DISABLE_SVE --DISABLE_SVE2 -- -- - /* Support macros for - * - Armv8.3-A Pointer Authentication and - * - Armv8.5-A Branch Target Identification \ No newline at end of file diff --git a/run.py b/run.py index 11b59151..9482678f 100644 --- a/run.py +++ b/run.py @@ -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": [ @@ -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": [