Skip to content

Commit 99dad39

Browse files
committed
chore: raise minimum target to macOS 11.0 / iOS 14.0 / tvOS 14.0
1 parent 5058671 commit 99dad39

6 files changed

Lines changed: 27 additions & 56 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: CI
22

33
on:
44
push:
5+
branches:
6+
- develop
57
tags:
68
- '*'
79
workflow_dispatch:

Sources/BuildScripts/XCFrameworkBuild/base.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -983,9 +983,9 @@ enum PlatformType: String, CaseIterable {
983983
var minVersion: String {
984984
switch self {
985985
case .ios, .isimulator:
986-
return "13.0"
986+
return "14.0"
987987
case .tvos, .tvsimulator:
988-
return "13.0"
988+
return "14.0"
989989
case .macos:
990990
return "11.0"
991991
case .maccatalyst:

Sources/BuildScripts/XCFrameworkBuild/main.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ enum Library: String, CaseIterable {
5252
case .FFmpeg:
5353
return "n8.0.1"
5454
case .openssl:
55-
return "3.3.2-xcode"
55+
return "3.3.5"
5656
case .gnutls:
57-
return "3.8.8-xcode"
57+
return "3.8.11"
5858
case .nettle:
59-
return "3.8.8-xcode"
59+
return "3.8.11"
6060
case .gmp:
61-
return "3.8.8-xcode"
61+
return "3.8.11"
6262
case .libass:
6363
return "0.17.4"
6464
case .libunibreak:
@@ -70,23 +70,23 @@ enum Library: String, CaseIterable {
7070
case .libharfbuzz:
7171
return "0.17.4"
7272
case .libsmbclient:
73-
return "4.15.13-xcode"
73+
return "4.15.13-2512"
7474
case .libdav1d: // AV1 decoding
7575
return "1.5.2-xcode"
7676
case .lcms2:
77-
return "2.16.0-xcode"
77+
return "2.17.0"
7878
case .libplacebo:
79-
return "7.351.0-xcode"
79+
return "7.351.0-2512"
8080
case .libdovi:
81-
return "3.3.1-xcode"
81+
return "3.3.2"
8282
case .vulkan:
8383
return "1.4.1"
8484
case .libshaderc: // compiling GLSL (OpenGL Shading Language) shaders into SPIR-V (Standard Portable Intermediate Representation - Vulkan) code
85-
return "2025.4.0-xcode"
85+
return "2025.5.0"
8686
case .libuchardet:
8787
return "0.0.8-xcode"
8888
case .libbluray:
89-
return "1.3.4-xcode"
89+
return "1.4.0"
9090
case .libluajit:
9191
return "2.1.0-xcode"
9292
case .libuavs3d:
Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
diff --git forkSrcPrefix/osdep/mac/meson.build forkDstPrefix/osdep/mac/meson.build
2-
index d886e5406a03ad2d46171aba5fb4c56840aac4a8..aebee946a795b39834ffdd558810ef0761392b16 100644
2+
index 16605288419c54cb9d89680a6fafd6a2f315487e..a154dea05ea77243f760a05067ead7f32623b991 100644
33
--- forkSrcPrefix/osdep/mac/meson.build
44
+++ forkDstPrefix/osdep/mac/meson.build
5-
@@ -2,8 +2,8 @@
6-
bridge = join_paths(source_root, 'osdep/mac/app_bridge_objc.h')
7-
module = join_paths(build_root, 'osdep/mac/swift.swiftmodule')
5+
@@ -6,12 +6,12 @@ swift_flags = ['-c', '-emit-library', '-static', '-sdk', macos_sdk_path,
6+
'-emit-objc-header', '-parse-as-library']
87

9-
-swift_flags = ['-c', '-emit-library', '-static', '-sdk', macos_sdk_path,
10-
- '-emit-objc-header', '-parse-as-library']
11-
+swift_flags = ['-frontend', '-c', '-sdk', macos_sdk_path,
12-
+ '-enable-objc-interop', '-emit-objc-header', '-parse-as-library']
8+
# fallback to old swift frontend build
9+
-if swift_ver.version_compare('<5.8')
10+
+#if swift_ver.version_compare('<5.8')
11+
message('Falling back to old swift frontend build')
12+
swift_prog = find_program(run_command(xcrun, '-find', 'swift', check: true).stdout().strip())
13+
swift_flags = ['-frontend', '-c', '-sdk', macos_sdk_path,
14+
'-enable-objc-interop', '-emit-objc-header', '-parse-as-library']
15+
-endif
16+
+#endif
1317

1418
if swift_ver.version_compare('>=6.0')
1519
swift_flags += ['-swift-version', '5']

Sources/BuildScripts/patch/libmpv/0003-fix-ffmpeg-n8.0.patch

Lines changed: 0 additions & 35 deletions
This file was deleted.

docs/Package.template.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import PackageDescription
44

55
let package = Package(
66
name: "MPVKit",
7-
platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13)],
7+
platforms: [.macOS(.v11), .iOS(.v14), .tvOS(.v14)],
88
products: [
99
.library(
1010
name: "MPVKit",

0 commit comments

Comments
 (0)