Skip to content

Commit 0ffde45

Browse files
committed
Merge branch 'master' into spiced
2 parents 5f6d784 + eac50e9 commit 0ffde45

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ STOWDIR="${PREFIX}/stow"
66
PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
77
CMAKE_GENERATOR="Ninja"
88
CMAKE_POLICY_VERSION_MINIMUM="4.3"
9-
MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-26.4}"
9+
MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-26.5}"
1010
CFLAGS="-mcpu=native"
1111
CXXFLAGS="${CFLAGS}"
1212
CPATH="${PREFIX}/include"

.github/workflows/build.yml

Lines changed: 2 additions & 2 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.4.app
30+
sudo xcode-select -s /Applications/Xcode_26.5.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.4
50+
MACOSX_DEPLOYMENT_TARGET: 26.5
5151

5252
- name: Print Summary
5353
run: |

build-mpv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ meson setup "${builddir}" "${srcdir}" \
3939
-Djavascript=enabled \
4040
-Db_lto=true \
4141
-Db_lto_mode=thin \
42+
-Dlibcurl=enabled \
4243
-Dlua=luajit \
4344
-Dgl=disabled \
4445
-Dmacos-touchbar=disabled \

0 commit comments

Comments
 (0)