From e0a03420d00db679cbfb166f54da027ea5e566a4 Mon Sep 17 00:00:00 2001 From: cxfksword <718792+cxfksword@users.noreply.github.com> Date: Tue, 24 Sep 2024 12:46:32 +0800 Subject: [PATCH] fix: build error --- Sources/BuildScripts/XCFrameworkBuild/main.swift | 2 +- .../0001-player-add-moltenvk-context.patch | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Sources/BuildScripts/XCFrameworkBuild/main.swift b/Sources/BuildScripts/XCFrameworkBuild/main.swift index c623a0f..d538fe5 100644 --- a/Sources/BuildScripts/XCFrameworkBuild/main.swift +++ b/Sources/BuildScripts/XCFrameworkBuild/main.swift @@ -78,7 +78,7 @@ enum Library: String, CaseIterable { case .libdovi: return "3.3.0" case .vulkan: - return "1.2.9" + return "1.2.9-fix" case .libshaderc: // compiling GLSL (OpenGL Shading Language) shaders into SPIR-V (Standard Portable Intermediate Representation - Vulkan) code return "2024.2.0" case .libuchardet: diff --git a/Sources/BuildScripts/patch/libmpv/0001-player-add-moltenvk-context.patch b/Sources/BuildScripts/patch/libmpv/0001-player-add-moltenvk-context.patch index a91177d..f165da0 100644 --- a/Sources/BuildScripts/patch/libmpv/0001-player-add-moltenvk-context.patch +++ b/Sources/BuildScripts/patch/libmpv/0001-player-add-moltenvk-context.patch @@ -138,10 +138,10 @@ index e75cb228f8d99462ccecf7780098ea97ae7cfe02..afc17284773204563f4c90b4860758e6 #define VK_USE_PLATFORM_METAL_EXT #endif diff --git forkSrcPrefix/meson.build forkDstPrefix/meson.build -index 2c2246ba232a603d67e68dc14df51caf0faf2f9a..c516c42df77163aa9d525d56ccb82972b40d010c 100644 +index b7bcb1b0badb21743f40f707d908092042de6db3..ebba7eeb7365b0e3cced1b3f2f23971101b0f66b 100644 --- forkSrcPrefix/meson.build +++ forkDstPrefix/meson.build -@@ -1288,6 +1288,17 @@ if features['vulkan'] and features['x11'] +@@ -1310,6 +1310,17 @@ if features['vulkan'] and features['x11'] sources += files('video/out/vulkan/context_xlib.c') endif @@ -156,18 +156,18 @@ index 2c2246ba232a603d67e68dc14df51caf0faf2f9a..c516c42df77163aa9d525d56ccb82972 + endif +endif + - features += {'vk-khr-display': cc.has_function('vkCreateDisplayPlaneSurfaceKHR', prefix: '#include ', + features += {'vk-khr-display': vulkan.type_name() == 'internal' or + cc.has_function('vkCreateDisplayPlaneSurfaceKHR', prefix: '#include ', dependencies: [vulkan])} - if features['vk-khr-display'] diff --git forkSrcPrefix/meson_options.txt forkDstPrefix/meson_options.txt -index e488f6ee881f89eb453916adf13846849b52d60b..e4ee27aab17d7bc9d4e39a29d6674dd09ffc46c7 100644 +index c6e6337d68b3e1210513c767db79cc204f404000..55fc334edf27f4e495dbb75f6316ecaffc661a8c 100644 --- forkSrcPrefix/meson_options.txt +++ forkDstPrefix/meson_options.txt -@@ -103,6 +103,7 @@ option('ios-gl', type: 'feature', value: 'auto', description: 'iOS OpenGL ES int +@@ -103,6 +103,7 @@ option('gl-dxinterop-d3d9', type: 'feature', value: 'auto', description: 'OpenGL + option('ios-gl', type: 'feature', value: 'auto', description: 'iOS OpenGL ES interop support') option('videotoolbox-gl', type: 'feature', value: 'auto', description: 'Videotoolbox with OpenGL') option('videotoolbox-pl', type: 'feature', value: 'auto', description: 'Videotoolbox with libplacebo') - option('vulkan-interop', type: 'feature', value: 'auto', description: 'Vulkan graphics interop') +option('moltenvk', type: 'feature', value: 'auto', description: 'Moltenvk context') # macOS features - option('macos-cocoa-cb', type: 'feature', value: 'auto', description: 'macOS libmpv backend') + option('macos-10-15-4-features', type: 'feature', value: 'auto', description: 'macOS 10.15.4 SDK Features')