mpv: Update to 0.38.0

1 files changed, 10 insertions, 23 deletions

diff --git a/pkg/mpv/patch/0003-video-out-gpu-Prevent-empty-array-when-no-compilers-.patch b/pkg/mpv/patch/0003-video-out-gpu-Prevent-empty-array-when-no-compilers-.patch
index 2630466d..3f19d16a 100644
--- a/pkg/mpv/patch/0003-video-out-gpu-Prevent-empty-array-when-no-compilers-.patch
+++ b/pkg/mpv/patch/0003-video-out-gpu-Prevent-empty-array-when-no-compilers-.patch
@@ -1,4 +1,4 @@
-From 153cf9738ea8b6e108ead1707a7a9193f57f3685 Mon Sep 17 00:00:00 2001
+From 13ced625d99b119bde0bb207a6b2ace7098f3880 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Wed, 3 Jul 2019 02:21:16 -0700
 Subject: [PATCH] video/out/gpu: Prevent empty array when no compilers or
@@ -6,14 +6,13 @@ Subject: [PATCH] video/out/gpu: Prevent empty array when no compilers or
 
 ---
  video/out/gpu/context.c | 11 ++++++-----
- video/out/gpu/spirv.c   |  1 +
- 2 files changed, 7 insertions(+), 5 deletions(-)
+ 1 file changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/video/out/gpu/context.c b/video/out/gpu/context.c
-index 2203b5cad9..2836d72513 100644
+index 88d4f4232d..5630c81f88 100644
 --- a/video/out/gpu/context.c
 +++ b/video/out/gpu/context.c
-@@ -117,6 +117,7 @@ static const struct ra_ctx_fns *contexts[] = {
+@@ -115,6 +115,7 @@ static const struct ra_ctx_fns *contexts[] = {
  #if HAVE_DMABUF_WAYLAND
      &ra_ctx_wldmabuf,
  #endif
@@ -21,7 +20,7 @@ index 2203b5cad9..2836d72513 100644
  };
  
  static int ra_ctx_api_help(struct mp_log *log, const struct m_option *opt,
-@@ -124,7 +125,7 @@ static int ra_ctx_api_help(struct mp_log *log, const struct m_option *opt,
+@@ -122,7 +123,7 @@ static int ra_ctx_api_help(struct mp_log *log, const struct m_option *opt,
  {
      mp_info(log, "GPU APIs (contexts):\n");
      mp_info(log, "    auto (autodetect)\n");
@@ -30,7 +29,7 @@ index 2203b5cad9..2836d72513 100644
          if (!contexts[n]->hidden)
              mp_info(log, "    %s (%s)\n", contexts[n]->type, contexts[n]->name);
      }
-@@ -137,7 +138,7 @@ static int ra_ctx_validate_api(struct mp_log *log, const struct m_option *opt,
+@@ -134,7 +135,7 @@ static inline OPT_STRING_VALIDATE_FUNC(ra_ctx_validate_api)
      struct bstr param = bstr0(*value);
      if (bstr_equals0(param, "auto"))
          return 1;
@@ -39,7 +38,7 @@ index 2203b5cad9..2836d72513 100644
          if (bstr_equals0(param, contexts[i]->type) && !contexts[i]->hidden)
              return 1;
      }
-@@ -149,7 +150,7 @@ static int ra_ctx_context_help(struct mp_log *log, const struct m_option *opt,
+@@ -146,7 +147,7 @@ static int ra_ctx_context_help(struct mp_log *log, const struct m_option *opt,
  {
      mp_info(log, "GPU contexts (APIs):\n");
      mp_info(log, "    auto (autodetect)\n");
@@ -48,7 +47,7 @@ index 2203b5cad9..2836d72513 100644
          if (!contexts[n]->hidden)
              mp_info(log, "    %s (%s)\n", contexts[n]->name, contexts[n]->type);
      }
-@@ -162,7 +163,7 @@ static int ra_ctx_validate_context(struct mp_log *log, const struct m_option *op
+@@ -158,7 +159,7 @@ static inline OPT_STRING_VALIDATE_FUNC(ra_ctx_validate_context)
      struct bstr param = bstr0(*value);
      if (bstr_equals0(param, "auto"))
          return 1;
@@ -57,7 +56,7 @@ index 2203b5cad9..2836d72513 100644
          if (bstr_equals0(param, contexts[i]->name) && !contexts[i]->hidden)
              return 1;
      }
-@@ -186,7 +187,7 @@ struct ra_ctx *ra_ctx_create(struct vo *vo, struct ra_ctx_opts opts)
+@@ -182,7 +183,7 @@ struct ra_ctx *ra_ctx_create(struct vo *vo, struct ra_ctx_opts opts)
      bool old_probing = vo->probing;
      vo->probing = opts.probing;
  
@@ -66,18 +65,6 @@ index 2203b5cad9..2836d72513 100644
          if (contexts[i]->hidden)
              continue;
          if (!opts.probing && strcmp(contexts[i]->name, opts.context_name) != 0)
-diff --git a/video/out/gpu/spirv.c b/video/out/gpu/spirv.c
-index 67088bc7df..69100497eb 100644
---- a/video/out/gpu/spirv.c
-+++ b/video/out/gpu/spirv.c
-@@ -16,6 +16,7 @@ static const struct spirv_compiler_fns *compilers[] = {
- #if HAVE_SHADERC
-     [SPIRV_SHADERC] = &spirv_shaderc,
- #endif
-+    NULL
- };
- 
- static const struct m_opt_choice_alternatives compiler_choices[] = {
 -- 
-2.37.3
+2.44.0