Merge branch 'master' into spiced

udmada · udmada · commit 494084e5bdc3 · 2025-12-18T00:24:36.000+13:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -60,7 +60,7 @@ jobs:
 
       - name: Upload Artifact
         id: upload
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: mpv-macos-26-arm64
           path: mpv.tar.gz
diff --git a/fetch b/fetch
@@ -125,7 +125,6 @@ fetch_libvpx() {
   local url="https://chromium.googlesource.com/webm/libvpx"
   rm -rf src/libvpx
   git -C src clone --depth 1 "${url}"
-  git -C src/libvpx apply --apply --stat "$(realpath patches/libvpx-darwin25.diff)"
 }
 
 fetch_libwebp() {
diff --git a/patches/libvpx-darwin25.diff b/patches/libvpx-darwin25.diff

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,6 @@ fetch_libvpx() {`
`125`	`125`	`local url="https://chromium.googlesource.com/webm/libvpx"`
`126`	`126`	`rm -rf src/libvpx`
`127`	`127`	`git -C src clone --depth 1 "${url}"`
`128`		`- git -C src/libvpx apply --apply --stat "$(realpath patches/libvpx-darwin25.diff)"`
`129`	`128`	`}`
`130`	`129`
`131`	`130`	`fetch_libwebp() {`