mpv: Update to 0.31.0

5 files changed, 5 insertions, 111 deletions

diff --git a/pkg/mpv/patch/0002-Remove-stray-top-level.patch b/pkg/mpv/patch/0002-Remove-stray-top-level.patch
deleted file mode 100644
index 28f3d04c..00000000
--- a/pkg/mpv/patch/0002-Remove-stray-top-level.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ca6d8b57abcd14969f6595196a3ed5d497dd6a72 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 2 Jul 2019 17:25:30 -0700
-Subject: [PATCH] Remove stray top-level ';'
-
----
- video/out/gpu/ra.c    | 2 +-
- video/out/gpu/video.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/video/out/gpu/ra.c b/video/out/gpu/ra.c
-index 0c1565149f..2ca94583ba 100644
---- a/video/out/gpu/ra.c
-+++ b/video/out/gpu/ra.c
-@@ -104,7 +104,7 @@ struct ra_renderpass_params *ra_renderpass_params_copy(void *ta_parent,
-     res->frag_shader = talloc_strdup(res, res->frag_shader);
-     res->compute_shader = talloc_strdup(res, res->compute_shader);
-     return res;
--};
-+}
- 
- struct glsl_fmt {
-     enum ra_ctype ctype;
-diff --git a/video/out/gpu/video.c b/video/out/gpu/video.c
-index 08cd08ebe4..254ee931d2 100644
---- a/video/out/gpu/video.c
-+++ b/video/out/gpu/video.c
-@@ -4149,7 +4149,7 @@ static void *gl_video_dr_alloc_buffer(struct gl_video *p, size_t size)
-     p->dr_buffers[p->num_dr_buffers++] = (struct dr_buffer){ .buf = buf };
- 
-     return buf->data;
--};
-+}
- 
- static void gl_video_dr_free_buffer(void *opaque, uint8_t *data)
- {
--- 
-2.23.0
-
diff --git a/pkg/mpv/patch/0003-Use-memset-to-initialize-large-structures.patch b/pkg/mpv/patch/0002-Use-memset-to-initialize-large-structures.patch
index 225f725d..27f66929 100644
--- a/pkg/mpv/patch/0003-Use-memset-to-initialize-large-structures.patch
+++ b/pkg/mpv/patch/0002-Use-memset-to-initialize-large-structures.patch
@@ -1,4 +1,4 @@
-From 861d233cc210b21f798877fb6b4d4f852ed18b88 Mon Sep 17 00:00:00 2001
+From 665c55ba23093af8663e2d5117482fa2bee63821 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Tue, 2 Jul 2019 17:41:43 -0700
 Subject: [PATCH] Use memset to initialize large structures
@@ -9,10 +9,10 @@ These are over 256 KiB in size.
  1 file changed, 8 insertions(+), 9 deletions(-)
 
 diff --git a/video/out/gpu/video.c b/video/out/gpu/video.c
-index 254ee931d2..ad5ce24e28 100644
+index a7369f185c..e9e16c5203 100644
 --- a/video/out/gpu/video.c
 +++ b/video/out/gpu/video.c
-@@ -3448,7 +3448,7 @@ static void frame_perf_data(struct pass_info pass[], struct mp_frame_perf *out)
+@@ -3497,7 +3497,7 @@ static void frame_perf_data(struct pass_info pass[], struct mp_frame_perf *out)
  
  void gl_video_perfdata(struct gl_video *p, struct voctrl_performance_data *out)
  {
@@ -21,7 +21,7 @@ index 254ee931d2..ad5ce24e28 100644
      frame_perf_data(p->pass_fresh,  &out->fresh);
      frame_perf_data(p->pass_redraw, &out->redraw);
  }
-@@ -3920,14 +3920,13 @@ struct gl_video *gl_video_init(struct ra *ra, struct mp_log *log,
+@@ -3969,14 +3969,13 @@ struct gl_video *gl_video_init(struct ra *ra, struct mp_log *log,
                                 struct mpv_global *g)
  {
      struct gl_video *p = talloc_ptrtype(NULL, p);
@@ -44,5 +44,5 @@ index 254ee931d2..ad5ce24e28 100644
      p->pass = p->pass_fresh;
      struct gl_video_opts *opts = p->opts_cache->opts;
 -- 
-2.23.0
+2.24.1
 
diff --git a/pkg/mpv/patch/0006-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 d3b7be6b..d3b7be6b 100644
--- a/pkg/mpv/patch/0006-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
diff --git a/pkg/mpv/patch/0004-video-out-vo_tct-Use-octal-escape-sequence-instead-o.patch b/pkg/mpv/patch/0004-video-out-vo_tct-Use-octal-escape-sequence-instead-o.patch
deleted file mode 100644
index cab6ac59..00000000
--- a/pkg/mpv/patch/0004-video-out-vo_tct-Use-octal-escape-sequence-instead-o.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 62a585b1b6a51d9d32b8dbe5b9edb32ac75af8b1 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Wed, 3 Jul 2019 02:12:44 -0700
-Subject: [PATCH] video/out/vo_tct: Use octal escape sequence instead of
- non-standard \e
-
----
- video/out/vo_tct.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/video/out/vo_tct.c b/video/out/vo_tct.c
-index 6a07786996..14b6883647 100644
---- a/video/out/vo_tct.c
-+++ b/video/out/vo_tct.c
-@@ -36,15 +36,15 @@
- 
- #define ALGO_PLAIN 1
- #define ALGO_HALF_BLOCKS 2
--#define ESC_HIDE_CURSOR "\e[?25l"
--#define ESC_RESTORE_CURSOR "\e[?25h"
--#define ESC_CLEAR_SCREEN "\e[2J"
--#define ESC_CLEAR_COLORS "\e[0m"
--#define ESC_GOTOXY "\e[%d;%df"
--#define ESC_COLOR_BG "\e[48;2;%d;%d;%dm"
--#define ESC_COLOR_FG "\e[38;2;%d;%d;%dm"
--#define ESC_COLOR256_BG "\e[48;5;%dm"
--#define ESC_COLOR256_FG "\e[38;5;%dm"
-+#define ESC_HIDE_CURSOR "\033[?25l"
-+#define ESC_RESTORE_CURSOR "\033[?25h"
-+#define ESC_CLEAR_SCREEN "\033[2J"
-+#define ESC_CLEAR_COLORS "\033[0m"
-+#define ESC_GOTOXY "\033[%d;%df"
-+#define ESC_COLOR_BG "\033[48;2;%d;%d;%dm"
-+#define ESC_COLOR_FG "\033[38;2;%d;%d;%dm"
-+#define ESC_COLOR256_BG "\033[48;5;%dm"
-+#define ESC_COLOR256_FG "\033[38;5;%dm"
- #define DEFAULT_WIDTH 80
- #define DEFAULT_HEIGHT 25
- 
--- 
-2.22.0
-
diff --git a/pkg/mpv/patch/0005-video-out-bitmap_packer-Avoid-empty-initializer-list.patch b/pkg/mpv/patch/0005-video-out-bitmap_packer-Avoid-empty-initializer-list.patch
deleted file mode 100644
index 93a73242..00000000
--- a/pkg/mpv/patch/0005-video-out-bitmap_packer-Avoid-empty-initializer-list.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8cb378367350e0e54688b279e9b99943c192c029 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Wed, 3 Jul 2019 02:20:12 -0700
-Subject: [PATCH] video/out/bitmap_packer: Avoid empty initializer list
-
----
- video/out/bitmap_packer.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/video/out/bitmap_packer.c b/video/out/bitmap_packer.c
-index 5169357e3a..921b7331ce 100644
---- a/video/out/bitmap_packer.c
-+++ b/video/out/bitmap_packer.c
-@@ -93,7 +93,7 @@ static int pack_rectangles(struct pos *in, struct pos *out, int num_rects,
-         bins[i] = bins[i << HEIGHT_SORT_BITS] - sizes[i << HEIGHT_SORT_BITS];
-     struct {
-         int size, x, bottom;
--    } stack[16] = {{15, 0, h}}, s = {};
-+    } stack[16] = {{15, 0, h}}, s = {0};
-     int stackpos = 1;
-     int y;
-     while (stackpos) {
--- 
-2.22.0
-