Skip to content

Commit 0be8e45

Browse files
udmadaudmada
committed
Merge with Master
1 parent 6ead9ba commit 0be8e45

37 files changed

Lines changed: 117 additions & 40 deletions

‎.env‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
# Ignore "Unused variables"
2+
# shellcheck shell=sh disable=SC2034
3+
14
PREFIX="${PREFIX:-/opt/local}"
25
STOWDIR="${PREFIX}/stow"
36
PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
47
CMAKE_GENERATOR="Ninja"
58
MACOSX_DEPLOYMENT_TARGET="$(sw_vers -productVersion 2>/dev/null || echo "15.4")"
69
CMAKE_POLICY_VERSION_MINIMUM="4.0"
10+
MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-15.5}"
711
CFLAGS="-mcpu=native"
812
CXXFLAGS="${CFLAGS}"

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ on:
77
branches:
88
- master
99
paths:
10-
- '.github/workflows/build.yml'
11-
- 'build-*'
12-
- 'fetch'
10+
- ".github/workflows/build.yml"
11+
- "build-*"
12+
- "fetch"
1313

1414
jobs:
1515
build:
@@ -26,7 +26,7 @@ jobs:
2626

2727
- name: Select Xcode
2828
run: |
29-
sudo xcode-select -s /Applications/Xcode_16.3.app
29+
sudo xcode-select -s /Applications/Xcode_16.4.app
3030
xcodebuild -version
3131
3232
- name: Create Stow Directory
@@ -46,7 +46,7 @@ jobs:
4646
- name: Build & Install
4747
run: ./build-all --bundle
4848
env:
49-
MACOSX_DEPLOYMENT_TARGET: 15.4
49+
MACOSX_DEPLOYMENT_TARGET: 15.5
5050

5151
- name: Upload Artifact
5252
id: upload

‎.github/workflows/lint.yml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
---
2+
name: Lint
3+
4+
on:
5+
push:
6+
pull_request:
7+
8+
jobs:
9+
shellcheck:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v4
14+
15+
- name: Check
16+
run: shellcheck .env build-* fetch
17+
18+
yamllint:
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Checkout
22+
uses: actions/checkout@v4
23+
24+
- name: Check
25+
run: yamllint --strict .
26+
27+
editorconfig:
28+
runs-on: ubuntu-latest
29+
steps:
30+
- name: Checkout
31+
uses: actions/checkout@v4
32+
33+
- name: Install
34+
uses: editorconfig-checker/action-editorconfig-checker@main
35+
36+
- name: Check
37+
run: editorconfig-checker
38+
39+
actionlint:
40+
runs-on: ubuntu-latest
41+
steps:
42+
- name: Checkout
43+
uses: actions/checkout@v4
44+
45+
- name: Check
46+
uses: raven-actions/actionlint@v2
47+
48+
prettier:
49+
runs-on: ubuntu-latest
50+
51+
steps:
52+
- name: Checkout
53+
uses: actions/checkout@v4
54+
55+
- name: Setup Node
56+
uses: actions/setup-node@v4
57+
58+
- name: Install
59+
run: npm install prettier@next
60+
61+
- name: Check
62+
run: npx prettier --check .

‎.shellcheckrc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
external-sources=true
22

3+
enable=avoid-nullary-conditions
4+
enable=quote-safe-variables
5+
enable=require-double-brackets
6+
enable=require-variable-braces
7+
38
# Ignore "Expressions don't expand in single quotes"
49
disable=SC2016
510

‎.yamllint.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
extends: default
3+
4+
rules:
5+
truthy: disable

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# mpv-build-macOS
22

33
[![Build & Upload Artifact](https://github.com/m154k1/mpv-build-macOS/actions/workflows/build.yml/badge.svg)](https://github.com/m154k1/mpv-build-macOS/actions/workflows/build.yml)
4+
[![Lint](https://github.com/m154k1/mpv-build-macOS/actions/workflows/lint.yml/badge.svg)](https://github.com/m154k1/mpv-build-macOS/actions/workflows/lint.yml)
45

56
A set of scripts that help build [mpv](https://mpv.io) on macOS.
67

78
> [!TIP]
89
> Prebuilt mpv.app from GitHub Actions is available at [nightly.link].
910
>
10-
> Download: [`mpv-macos-15-arm64.zip`] (macOS 15.4 & Apple M1 or newer)
11+
> Download: [`mpv-macos-15-arm64.zip`] (macOS 15.5 & Apple M1 or newer)
1112
1213
### Requirements
1314

‎build-all‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env -S bash -e
1+
#!/bin/bash -e
22

33
cd "$(dirname "$0")"
44

@@ -20,7 +20,6 @@ cd "$(dirname "$0")"
2020
./build-libjxl
2121
./build-freetype
2222
./build-harfbuzz
23-
./build-freetype
2423
./build-fribidi
2524
./build-libunibreak
2625
./build-libass

‎build-brotli‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env -S bash -e
1+
#!/bin/bash -e
22
#
33
# brotli
44
# https://github.com/google/brotli.git

‎build-dav1d‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env -S bash -e
1+
#!/bin/bash -e
22
#
33
# dav1d
44
# https://code.videolan.org/videolan/dav1d.git

‎build-ffmpeg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env -S bash -e
1+
#!/bin/bash -e
22
#
33
# FFmpeg
44
# https://git.ffmpeg.org/ffmpeg.git

0 commit comments

Comments
 (0)