Merge branch 'master' into spiced

Author: udmada

.editorconfig

@@ -2,9 +2,10 @@ root = true
 
 [*]
 charset = utf-8
-insert_final_newline = true
-indent_style = space
+end_of_line = lf
 indent_size = 2
+indent_style = space
+insert_final_newline = true
 max_line_length = 100
 trim_trailing_whitespace = true
 
@@ -13,8 +14,8 @@ max_line_length = unset
 
 [{homebrew,patches,src}/**]
 charset = unset
-insert_final_newline = unset
-indent_style = unset
 indent_size = unset
+indent_style = unset
+insert_final_newline = unset
 max_line_length = unset
 trim_trailing_whitespace = unset

.github/workflows/build.yml

@@ -8,6 +8,7 @@ on:
       - master
     paths:
       - ".github/workflows/build.yml"
+      - ".env"
       - "build-*"
       - "fetch"
 
@@ -22,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Select Xcode
         run: |
@@ -48,6 +49,15 @@ jobs:
         env:
           MACOSX_DEPLOYMENT_TARGET: 26.1
 
+      - name: Print Summary
+        run: |
+          {
+            echo '### mpv'
+            echo '```'
+            /opt/local/bin/mpv --version
+            echo '```'
+          } >> "${GITHUB_STEP_SUMMARY}"
+
       - name: Upload Artifact
         id: upload
         uses: actions/upload-artifact@v5

.github/workflows/lint.yml

@@ -5,18 +5,22 @@ on:
   push:
   pull_request:
 
+permissions:
+  actions: read
+  contents: read
+  checks: write
+  pull-requests: write
+  security-events: write
+
 jobs:
   shellcheck:
     runs-on: ubuntu-latest
-    permissions:
-      security-events: write
-      contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Create requirements.txt
-        if: hashFiles('**/requirements.txt', '**/pyproject.toml') == ''
+        if: ${{ hashFiles('**/requirements.txt', '**/pyproject.toml') == '' }}
         run: touch ./requirements.txt
 
       - name: Check
@@ -29,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Check
         run: yamllint --strict .
@@ -38,7 +42,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install
         uses: editorconfig-checker/action-editorconfig-checker@main
@@ -50,23 +54,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Check
         uses: raven-actions/actionlint@v2
-
-  prettier:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Setup Node
-        uses: actions/setup-node@v6
-
-      - name: Install
-        run: npm install prettier@next
-
-      - name: Check
-        run: npx prettier --check .
+        with:
+          cache: false
+          pyflakes: false

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-26-arm64.zip`] (macOS 26.0 & Apple M1 or newer)
+> Download: [`mpv-macos-26-arm64.zip`] (macOS 26 & Apple M1 or newer)
 
 ### Requirements
 

build-brotli

@@ -11,8 +11,7 @@ pkgdir="${STOWDIR}/${pkgname}"
 srcdir="src/brotli"
 builddir="${TMPDIR:-/tmp}/build.${pkgname}"
 
-echo
-echo "*** $0: started"
+echo "::group::$0"
 
 rm -rf "${builddir}"
 
@@ -35,4 +34,4 @@ stow -Rd "${STOWDIR}" "${pkgname}"
 
 rm -rf "${builddir}"
 
-echo "*** $0: finished"
+echo "::endgroup::"

build-dav1d

@@ -11,8 +11,7 @@ pkgdir="${STOWDIR}/${pkgname}"
 srcdir="src/dav1d"
 builddir="${TMPDIR:-/tmp}/build.${pkgname}"
 
-echo
-echo "*** $0: started"
+echo "::group::$0"
 
 rm -rf "${builddir}"
 
@@ -35,4 +34,4 @@ stow -Rd "${STOWDIR}" "${pkgname}"
 
 rm -rf "${builddir}"
 
-echo "*** $0: finished"
+echo "::endgroup::"

build-ffmpeg

@@ -10,8 +10,7 @@ pkgname="ffmpeg"
 pkgdir="${STOWDIR}/${pkgname}"
 srcdir="src/ffmpeg"
 
-echo
-echo "*** $0: started"
+echo "::group::$0"
 
 cd "${srcdir}"
 
@@ -69,4 +68,4 @@ make install
 rm -rf "${pkgdir}"/share
 stow -Rd "${STOWDIR}" "${pkgname}"
 
-echo "*** $0: finished"
+echo "::endgroup::"

build-freetype

@@ -11,8 +11,7 @@ pkgdir="${STOWDIR}/${pkgname}"
 srcdir="src/freetype"
 builddir="${TMPDIR:-/tmp}/build.${pkgname}"
 
-echo
-echo "*** $0: started"
+echo "::group::$0"
 
 rm -rf "${builddir}"
 
@@ -39,4 +38,4 @@ stow -Rd "${STOWDIR}" "${pkgname}"
 
 rm -rf "${builddir}"
 
-echo "*** $0: finished"
+echo "::endgroup::"

build-fribidi

@@ -11,8 +11,7 @@ pkgdir="${STOWDIR}/${pkgname}"
 srcdir="src/fribidi"
 builddir="${TMPDIR:-/tmp}/build.${pkgname}"
 
-echo
-echo "*** $0: started"
+echo "::group::$0"
 
 rm -rf "${builddir}"
 
@@ -37,4 +36,4 @@ stow -Rd "${STOWDIR}" "${pkgname}"
 
 rm -rf "${builddir}"
 
-echo "*** $0: finished"
+echo "::endgroup::"

build-harfbuzz

@@ -11,8 +11,7 @@ pkgdir="${STOWDIR}/${pkgname}"
 srcdir="src/harfbuzz"
 builddir="${TMPDIR:-/tmp}/build.${pkgname}"
 
-echo
-echo "*** $0: started"
+echo "::group::$0"
 
 rm -rf "${builddir}"
 
@@ -44,4 +43,4 @@ stow -Rd "${STOWDIR}" "${pkgname}"
 
 rm -rf "${builddir}"
 
-echo "*** $0: finished"
+echo "::endgroup::"