Merge branch 'master' into spiced

Author: udmada

.env

@@ -7,6 +7,6 @@ PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
 CMAKE_GENERATOR="Ninja"
 MACOSX_DEPLOYMENT_TARGET="$(sw_vers -productVersion 2>/dev/null || echo "15.4")"
 CMAKE_POLICY_VERSION_MINIMUM="4.0"
-MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-15.5}"
+MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-26.0}"
 CFLAGS="-mcpu=native"
 CXXFLAGS="${CFLAGS}"

.github/workflows/build.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   build:
-    runs-on: macos-15
+    runs-on: macos-26
 
     permissions:
       contents: read
@@ -47,20 +47,20 @@ jobs:
       - name: Build & Install
         run: ./build-all --bundle
         env:
-          MACOSX_DEPLOYMENT_TARGET: 15.5
+          MACOSX_DEPLOYMENT_TARGET: 26.0
 
       - name: Upload Artifact
         id: upload
         uses: actions/upload-artifact@v4
         with:
-          name: mpv-macos-15-arm64
+          name: mpv-macos-26-arm64
           path: mpv.tar.gz
           if-no-files-found: error
           compression-level: 0
           overwrite: true
 
       - name: Attest Artifact
-        uses: actions/attest-build-provenance@v2
+        uses: actions/attest-build-provenance@v3
         with:
-          subject-name: mpv-macos-15-arm64.zip
+          subject-name: mpv-macos-26-arm64.zip
           subject-digest: sha256:${{ steps.upload.outputs.artifact-digest }}

.github/workflows/lint.yml

@@ -37,6 +37,7 @@ jobs:
         run: editorconfig-checker
 
   actionlint:
+    if: false # doesn't support macos-26
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -53,7 +54,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
 
       - name: Install
         run: npm install prettier@next

.yamllint.yml

@@ -3,3 +3,5 @@ extends: default
 
 rules:
   truthy: disable
+  comments:
+    min-spaces-from-content: 1

README.md

@@ -8,7 +8,7 @@ A set of scripts that help build [mpv](https://mpv.io) on macOS.
 > [!TIP]
 > Prebuilt mpv.app from GitHub Actions is available at [nightly.link].
 >
-> Download: [`mpv-macos-15-arm64.zip`] (macOS 15.5 & Apple M1 or newer)
+> Download: [`mpv-macos-26-arm64.zip`] (macOS 26.0 & Apple M1 or newer)
 
 ### Requirements
 
@@ -93,5 +93,5 @@ macos-render-timer=feedback
 - `MTL_HUD_ENABLED=1` - enables the [Metal Performance HUD].
 
 [nightly.link]: https://nightly.link/m154k1/mpv-build-macOS/workflows/build/master
-[`mpv-macos-15-arm64.zip`]: https://nightly.link/m154k1/mpv-build-macOS/workflows/build/master/mpv-macos-15-arm64.zip
+[`mpv-macos-26-arm64.zip`]: https://nightly.link/m154k1/mpv-build-macOS/workflows/build/master/mpv-macos-26-arm64.zip
 [Metal Performance HUD]: https://developer.apple.com/documentation/xcode/monitoring-your-metal-apps-graphics-performance

build-libvpx

@@ -10,13 +10,16 @@ pkgname="libvpx"
 pkgdir="${STOWDIR}/${pkgname}"
 srcdir="src/libvpx"
 
+target="$(uname -m)-darwin$(uname -r | cut -d . -f 1)-gcc"
+
 echo
 echo "*** $0: started"
 
 cd "${srcdir}"
 
 ./configure \
   --prefix="${pkgdir}" \
+  --target="${target}" \
   --enable-shared \
   --enable-runtime-cpu-detect \
   --enable-pic \

build-shaderc

@@ -27,6 +27,7 @@ cmake -B "${builddir}" -S "${srcdir}" \
   -DCMAKE_INSTALL_NAME_DIR="${pkgdir}/lib" \
   -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
+  -DSHADERC_SKIP_EXECUTABLES=ON \
   -DSHADERC_SKIP_TESTS=ON \
   -DSHADERC_SKIP_EXAMPLES=ON \
   "$@"
@@ -36,7 +37,7 @@ cmake --build "${builddir}"
 rm -rf "${pkgdir}"
 
 cmake --install "${builddir}"
-rm -rf "${pkgdir}"/{bin,lib/{*.a,pkgconfig/*{combined,static}.pc}}
+rm -rf "${pkgdir}"/lib/{*.a,pkgconfig/*{combined,static}.pc}
 stow -Rd "${STOWDIR}" "${pkgname}"
 
 rm -rf "${builddir}"

fetch

@@ -126,6 +126,7 @@ 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() {
@@ -153,9 +154,16 @@ fetch_mpv() {
 }
 
 fetch_opus() {
-  local version="1.5.2"
-  local url="https://downloads.xiph.org/releases/opus/opus-${version}.tar.gz"
-  fetch_tar "${url}" opus
+  local url="https://github.com/xiph/opus.git"
+  rm -rf src/opus
+  git -C src clone --single-branch "${url}"
+
+  local model
+  cd src/opus
+  model="$(sed -nE 's;^dnn/download_model\.sh "(.+)"$;\1;p' autogen.sh)"
+  echo "dnn model checksum: '${model}'"
+  ./dnn/download_model.sh "${model}"
+  cd -
 }
 
 fetch_shaderc() {

patches/libvpx-darwin25.diff

@@ -0,0 +1,42 @@
+diff --git a/build/make/configure.sh b/build/make/configure.sh
+index d1d89aa..5434e83 100644
+--- a/build/make/configure.sh
++++ b/build/make/configure.sh
+@@ -832,7 +832,7 @@ process_common_toolchain() {
+         tgt_isa=x86_64
+         tgt_os=`echo $gcctarget | sed 's/.*\(darwin1[0-9]\).*/\1/'`
+         ;;
+-      *darwin2[0-4]*)
++      *darwin2[0-5]*)
+         tgt_isa=`uname -m`
+         tgt_os=`echo $gcctarget | sed 's/.*\(darwin2[0-9]\).*/\1/'`
+         ;;
+@@ -991,7 +991,7 @@ EOF
+       add_cflags  "-mmacosx-version-min=10.15"
+       add_ldflags "-mmacosx-version-min=10.15"
+       ;;
+-    *-darwin2[0-4]-*)
++    *-darwin2[0-5]-*)
+       add_cflags  "-arch ${toolchain%%-*}"
+       add_ldflags "-arch ${toolchain%%-*}"
+       ;;
+diff --git a/configure b/configure
+index 356bbe2..8eee4e4 100755
+--- a/configure
++++ b/configure
+@@ -104,6 +104,7 @@ all_platforms="${all_platforms} arm64-darwin21-gcc"
+ all_platforms="${all_platforms} arm64-darwin22-gcc"
+ all_platforms="${all_platforms} arm64-darwin23-gcc"
+ all_platforms="${all_platforms} arm64-darwin24-gcc"
++all_platforms="${all_platforms} arm64-darwin25-gcc"
+ all_platforms="${all_platforms} arm64-linux-gcc"
+ all_platforms="${all_platforms} arm64-win64-gcc"
+ all_platforms="${all_platforms} arm64-win64-vs15"
+@@ -169,6 +170,7 @@ all_platforms="${all_platforms} x86_64-darwin21-gcc"
+ all_platforms="${all_platforms} x86_64-darwin22-gcc"
+ all_platforms="${all_platforms} x86_64-darwin23-gcc"
+ all_platforms="${all_platforms} x86_64-darwin24-gcc"
++all_platforms="${all_platforms} x86_64-darwin25-gcc"
+ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"
+ all_platforms="${all_platforms} x86_64-linux-gcc"
+ all_platforms="${all_platforms} x86_64-linux-icc"