fix: fix mpv patch for v0.40.0

Author: cxfksword

Sources/BuildScripts/patch/libmpv/0001-player-add-moltenvk-context.patch

@@ -1,6 +1,40 @@
+diff --git forkSrcPrefix/meson.build forkDstPrefix/meson.build
+index 7572769e0e6f280391668c6797d67e37e2dea30f..e6109987a3d38025a5eede04441c03ee23413255 100644
+--- forkSrcPrefix/meson.build
++++ forkDstPrefix/meson.build
+@@ -1315,6 +1315,17 @@ if features['vulkan'] and features['x11']
+      sources += files('video/out/vulkan/context_xlib.c')
+ endif
+ 
++if host_machine.system() == 'darwin'
++    moltenvk = get_option('moltenvk').require(
++        features['vulkan'],
++        error_message: 'vulkan or moltenvk header could not be found!',
++    )
++    features += {'moltenvk': moltenvk.allowed()}
++    if features['vulkan'] and features['moltenvk']
++        sources += files('video/out/vulkan/context_moltenvk.m')
++    endif
++endif
++
+ features += {'vk-khr-display': vulkan.type_name() == 'internal' or
+                                cc.has_function('vkCreateDisplayPlaneSurfaceKHR', prefix: '#include <vulkan/vulkan_core.h>',
+                                                dependencies: [vulkan])}
+diff --git forkSrcPrefix/meson.options forkDstPrefix/meson.options
+index dae0a333ef71b75a6bb36a236de7feebd99bda40..6ed28af20a09501b4997ca81e86bb198e75327fd 100644
+--- forkSrcPrefix/meson.options
++++ forkDstPrefix/meson.options
+@@ -101,6 +101,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('moltenvk', type: 'feature', value: 'auto', description: 'Moltenvk context')
+ 
+ # macOS features
+ option('macos-10-15-4-features', type: 'feature', value: 'auto', description: 'macOS 10.15.4 SDK Features')
 diff --git forkSrcPrefix/video/out/vulkan/context_moltenvk.m forkDstPrefix/video/out/vulkan/context_moltenvk.m
 new file mode 100644
-index 0000000000000000000000000000000000000000..e24572375775622c9e00f11f200bafb4bc38c4b4
+index 0000000000000000000000000000000000000000..445b907f795b24b8df80389394d4ae7b3f94c6e5
 --- /dev/null
 +++ forkDstPrefix/video/out/vulkan/context_moltenvk.m
 @@ -0,0 +1,96 @@
@@ -61,7 +95,7 @@ index 0000000000000000000000000000000000000000..e24572375775622c9e00f11f200bafb4
 +         .pLayer = p->layer,
 +    };
 +
-+    struct ra_vk_ctx_params params = {0};
++    struct ra_ctx_params params = {0};
 +
 +    VkInstance inst = vk->vkinst->instance;
 +    VkResult res = vkCreateMetalSurfaceEXT(inst, &info, NULL, &vk->surface);
@@ -100,9 +134,22 @@ index 0000000000000000000000000000000000000000..e24572375775622c9e00f11f200bafb4
 +    .init           = moltenvk_init,
 +    .uninit         = moltenvk_uninit,
 +};
-\ No newline at end of file
+diff --git forkSrcPrefix/video/out/vulkan/common.h forkDstPrefix/video/out/vulkan/common.h
+index e75cb228f8d99462ccecf7780098ea97ae7cfe02..afc17284773204563f4c90b4860758e61068d460 100644
+--- forkSrcPrefix/video/out/vulkan/common.h
++++ forkDstPrefix/video/out/vulkan/common.h
+@@ -22,6 +22,9 @@
+ #if HAVE_WIN32_DESKTOP
+ #define VK_USE_PLATFORM_WIN32_KHR
+ #endif
++#if HAVE_MOLTENVK
++#include <MoltenVK/mvk_vulkan.h>
++#endif
+ #if HAVE_COCOA
+ #define VK_USE_PLATFORM_METAL_EXT
+ #endif
 diff --git forkSrcPrefix/video/out/gpu/context.c forkDstPrefix/video/out/gpu/context.c
-index 88d4f4232ddd3886e42ddf23dd2970b13bdd1e92..df9bd99de126d2e2371544248d528b21b99be263 100644
+index 75dd804005ba3a1e36375b47dcc9d9bb756ab867..4ab72a00b3dd3539a06129702e41796fd00a8af3 100644
 --- forkSrcPrefix/video/out/gpu/context.c
 +++ forkDstPrefix/video/out/gpu/context.c
 @@ -50,6 +50,7 @@ extern const struct ra_ctx_fns ra_ctx_vulkan_xlib;
@@ -113,61 +160,13 @@ index 88d4f4232ddd3886e42ddf23dd2970b13bdd1e92..df9bd99de126d2e2371544248d528b21
 
  /* Direct3D 11 */
  extern const struct ra_ctx_fns ra_ctx_d3d11;
-@@ -91,6 +92,9 @@ static const struct ra_ctx_fns *contexts[] = {
- // Vulkan contexts:
- #if HAVE_VULKAN
+@@ -126,6 +127,9 @@ static const struct ra_ctx_fns *contexts[] = {
 
+ // Vulkan contexts (fallbacks):
+ #if HAVE_VULKAN
 +#if HAVE_MOLTENVK
 +     &ra_ctx_vulkan_moltenvk,
 +#endif
  #if HAVE_ANDROID
      &ra_ctx_vulkan_android,
  #endif
-diff --git forkSrcPrefix/video/out/vulkan/common.h forkDstPrefix/video/out/vulkan/common.h
-index e75cb228f8d99462ccecf7780098ea97ae7cfe02..afc17284773204563f4c90b4860758e61068d460 100644
---- forkSrcPrefix/video/out/vulkan/common.h
-+++ forkDstPrefix/video/out/vulkan/common.h
-@@ -22,6 +22,9 @@
- #if HAVE_WIN32_DESKTOP
- #define VK_USE_PLATFORM_WIN32_KHR
- #endif
-+#if HAVE_MOLTENVK
-+#include <MoltenVK/mvk_vulkan.h>
-+#endif
- #if HAVE_COCOA
- #define VK_USE_PLATFORM_METAL_EXT
- #endif
-diff --git forkSrcPrefix/meson.build forkDstPrefix/meson.build
-index b7bcb1b0badb21743f40f707d908092042de6db3..ebba7eeb7365b0e3cced1b3f2f23971101b0f66b 100644
---- forkSrcPrefix/meson.build
-+++ forkDstPrefix/meson.build
-@@ -1310,6 +1310,17 @@ if features['vulkan'] and features['x11']
-      sources += files('video/out/vulkan/context_xlib.c')
- endif
- 
-+if host_machine.system() == 'darwin'
-+    moltenvk = get_option('moltenvk').require(
-+        features['vulkan'],
-+        error_message: 'vulkan or moltenvk header could not be found!',
-+    )
-+    features += {'moltenvk': moltenvk.allowed()}
-+    if features['vulkan'] and features['moltenvk']
-+        sources += files('video/out/vulkan/context_moltenvk.m')
-+    endif
-+endif
-+
- features += {'vk-khr-display': vulkan.type_name() == 'internal' or
-                                cc.has_function('vkCreateDisplayPlaneSurfaceKHR', prefix: '#include <vulkan/vulkan_core.h>',
-                                                dependencies: [vulkan])}
-diff --git forkSrcPrefix/meson_options.txt forkDstPrefix/meson_options.txt
-index c6e6337d68b3e1210513c767db79cc204f404000..55fc334edf27f4e495dbb75f6316ecaffc661a8c 100644
---- forkSrcPrefix/meson_options.txt
-+++ forkDstPrefix/meson_options.txt
-@@ -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('moltenvk', type: 'feature', value: 'auto', description: 'Moltenvk context')
- 
- # macOS features
- option('macos-10-15-4-features', type: 'feature', value: 'auto', description: 'macOS 10.15.4 SDK Features')