Skip to content

Commit 1c00ad6

Browse files
committed
Merge branch 'master' into spiced
2 parents e00fe6d + ec50f4e commit 1c00ad6

5 files changed

Lines changed: 13 additions & 16 deletions

File tree

.env

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ PREFIX="${PREFIX:-/opt/local}"
55
STOWDIR="${PREFIX}/stow"
66
PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
77
CMAKE_GENERATOR="Ninja"
8-
MACOSX_DEPLOYMENT_TARGET="$(sw_vers -productVersion 2>/dev/null || echo "15.4")"
8+
MACOSX_DEPLOYMENT_TARGET="$(sw_vers -productVersion 2>/dev/null || echo "26.2")"
99

10-
CMAKE_POLICY_VERSION_MINIMUM="4.1"
11-
MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-26.2}"
10+
CMAKE_POLICY_VERSION_MINIMUM="4.2"
11+
MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-26.3}"
1212
CFLAGS="-mcpu=native"
1313
CXXFLAGS="${CFLAGS}"

.github/workflows/build.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- name: Select Xcode
2929
run: |
30-
sudo xcode-select -s /Applications/Xcode_26.2.app
30+
sudo xcode-select -s /Applications/Xcode_26.3.app
3131
xcodebuild -version
3232
3333
- name: Create Stow Directory
@@ -47,7 +47,7 @@ jobs:
4747
- name: Build & Install
4848
run: ./build-all --bundle
4949
env:
50-
MACOSX_DEPLOYMENT_TARGET: 26.2
50+
MACOSX_DEPLOYMENT_TARGET: 26.3
5151

5252
- name: Print Summary
5353
run: |
@@ -60,16 +60,14 @@ jobs:
6060
6161
- name: Upload Artifact
6262
id: upload
63-
uses: actions/upload-artifact@v6
63+
uses: actions/upload-artifact@v7
6464
with:
65-
name: mpv-macos-26-arm64
6665
path: mpv.tar.gz
6766
if-no-files-found: error
68-
compression-level: 0
69-
overwrite: true
67+
archive: false
7068

7169
- name: Attest Artifact
72-
uses: actions/attest-build-provenance@v3
70+
uses: actions/attest-build-provenance@v4
7371
with:
74-
subject-name: mpv-macos-26-arm64.zip
72+
subject-name: mpv.tar.gz
7573
subject-digest: sha256:${{ steps.upload.outputs.artifact-digest }}

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
run: touch ./requirements.txt
2525

2626
- name: Check
27-
uses: reactive-firewall/shellcheck-scan@v1
27+
uses: reactive-firewall/shellcheck-scan@v2
2828
with:
2929
match: .env build-* fetch
3030
publish-artifacts: ${{ github.ref_name == github.event.repository.default_branch }}

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
A set of scripts that help build [mpv](https://mpv.io) on macOS.
77

88
> [!TIP]
9-
> Prebuilt mpv.app from GitHub Actions is available at [nightly.link].
9+
> Prebuilt mpv.app can be downloaded from [GitHub Actions](https://github.com/m154k1/mpv-build-macOS/actions/workflows/build.yml).
1010
>
11-
> Download: [`mpv-macos-26-arm64.zip`] (macOS 26 & Apple M1 or newer)
11+
> Look for `mpv.tar.gz` artifact (requires macOS 26 and Apple M1 or newer).
1212
1313
### Requirements
1414

@@ -83,6 +83,4 @@ mkdir /opt/local/stow
8383

8484
- `MTL_HUD_ENABLED=1` - enables the [Metal Performance HUD].
8585

86-
[nightly.link]: https://nightly.link/m154k1/mpv-build-macOS/workflows/build/master
87-
[`mpv-macos-26-arm64.zip`]: https://nightly.link/m154k1/mpv-build-macOS/workflows/build/master/mpv-macos-26-arm64.zip
8886
[Metal Performance HUD]: https://developer.apple.com/documentation/xcode/monitoring-your-metal-apps-graphics-performance

build-ffmpeg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ cd "${srcdir}"
4646
--enable-libx264 \
4747
--enable-libx265 \
4848
--enable-libxml2 \
49+
--enable-openssl \
4950
--enable-vulkan \
5051
--enable-whisper \
5152
--disable-static \

0 commit comments

Comments
 (0)