multimedia/mpv: Updated for version 0.34.0

Signed-off-by: Christoph Willing <chris.willing@linux.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 5 insertions, 91 deletions

diff --git a/multimedia/mpv/libplacebo-api.patch b/multimedia/mpv/libplacebo-api.patch
deleted file mode 100644
index b684df8c9f..0000000000
--- a/multimedia/mpv/libplacebo-api.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 7c4465cefb27d4e0d07535d368febdf77b579566 Mon Sep 17 00:00:00 2001
-From: Niklas Haas <git@haasn.xyz>
-Date: Thu, 3 Dec 2020 08:25:23 +0100
-Subject: [PATCH] vo_gpu: placebo: update for upstream API changes
-
-The concept of sample/address modes was moved from `pl_tex` to
-`pl_desc_binding`.
-
-The `pl_tex_blit()` function also underwent an API change.
----
- video/out/placebo/ra_pl.c | 31 +++++++++++++++++++++++++++++--
- 1 file changed, 29 insertions(+), 2 deletions(-)
-
-diff --git a/video/out/placebo/ra_pl.c b/video/out/placebo/ra_pl.c
-index f8df590511d..8244acff261 100644
---- a/video/out/placebo/ra_pl.c
-+++ b/video/out/placebo/ra_pl.c
-@@ -144,8 +144,14 @@ bool mppl_wrap_tex(struct ra *ra, const struct pl_tex *pltex,
-             .blit_dst = pltex->params.blit_dst,
-             .host_mutable = pltex->params.host_writable,
-             .downloadable = pltex->params.host_readable,
-+#if PL_API_VER >= 103
-+            // These don't exist upstream, so just pick something reasonable
-+            .src_linear = pltex->params.format->caps & PL_FMT_CAP_LINEAR,
-+            .src_repeat = false,
-+#else
-             .src_linear = pltex->params.sample_mode == PL_TEX_SAMPLE_LINEAR,
-             .src_repeat = pltex->params.address_mode == PL_TEX_ADDRESS_REPEAT,
-+#endif
-         },
-         .priv = (void *) pltex,
-     };
-@@ -195,10 +201,12 @@ static struct ra_tex *tex_create_pl(struct ra *ra,
-         .blit_dst = params->blit_dst || params->render_dst,
-         .host_writable = params->host_mutable,
-         .host_readable = params->downloadable,
-+#if PL_API_VER < 103
-         .sample_mode = params->src_linear ? PL_TEX_SAMPLE_LINEAR
-                                           : PL_TEX_SAMPLE_NEAREST,
-         .address_mode = params->src_repeat ? PL_TEX_ADDRESS_REPEAT
-                                            : PL_TEX_ADDRESS_CLAMP,
-+#endif
-         .initial_data = params->initial_data,
-     });
- 
-@@ -399,7 +407,18 @@ static void blit_pl(struct ra *ra, struct ra_tex *dst, struct ra_tex *src,
-         pldst.y1 = MPMIN(MPMAX(dst_rc->y1, 0), dst->params.h);
-     }
- 
-+#if PL_API_VER >= 103
-+    pl_tex_blit(get_gpu(ra), &(struct pl_tex_blit_params) {
-+        .src = src->priv,
-+        .dst = dst->priv,
-+        .src_rc = plsrc,
-+        .dst_rc = pldst,
-+        .sample_mode = src->params.src_linear ? PL_TEX_SAMPLE_LINEAR
-+                                              : PL_TEX_SAMPLE_NEAREST,
-+    });
-+#else
-     pl_tex_blit(get_gpu(ra), dst->priv, src->priv, pldst, plsrc);
-+#endif
- }
- 
- static const enum pl_var_type var_type[RA_VARTYPE_COUNT] = {
-@@ -627,9 +646,17 @@ static void renderpass_run_pl(struct ra *ra,
-             struct pl_desc_binding bind;
-             switch (inp->type) {
-             case RA_VARTYPE_TEX:
--            case RA_VARTYPE_IMG_W:
--                bind.object = (* (struct ra_tex **) val->data)->priv;
-+            case RA_VARTYPE_IMG_W: {
-+                struct ra_tex *tex = *((struct ra_tex **) val->data);
-+                bind.object = tex->priv;
-+#if PL_API_VER >= 103
-+                bind.sample_mode = tex->params.src_linear ? PL_TEX_SAMPLE_LINEAR
-+                                                          : PL_TEX_SAMPLE_NEAREST;
-+                bind.address_mode = tex->params.src_repeat ? PL_TEX_ADDRESS_REPEAT
-+                                                           : PL_TEX_ADDRESS_CLAMP;
-+#endif
-                 break;
-+            }
-             case RA_VARTYPE_BUF_RO:
-             case RA_VARTYPE_BUF_RW:
-                 bind.object = (* (struct ra_buf **) val->data)->priv;
diff --git a/multimedia/mpv/mpv.SlackBuild b/multimedia/mpv/mpv.SlackBuild
index 4b9e1c3b70..a2a773a1df 100644
--- a/multimedia/mpv/mpv.SlackBuild
+++ b/multimedia/mpv/mpv.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2015 John Vogel Corning, NY USA
 # Copyright 2017,2018 (versions 0.25.0-0.29.1) Andreas Guldstrand
-# Copyright 2020 Christoph Willing  Brisbane Australia
+# Copyright 2020-2021 Christoph Willing  Brisbane Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mpv
-VERSION=${VERSION:-0.33.1}
+VERSION=${VERSION:-0.34.0}
 WAF_VERSION=${WAF_VERSION:-2.0.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -87,8 +87,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 < $CWD/libplacebo-api.patch
-
 DOCS="Copyright LICENSE.GPL LICENSE.LGPL README.md RELEASE_NOTES VERSION"
 MANUAL="DOCS/*.md DOCS/*.rst DOCS/*.txt"
 
diff --git a/multimedia/mpv/mpv.info b/multimedia/mpv/mpv.info
index c90c271d63..d50d7b748b 100644
--- a/multimedia/mpv/mpv.info
+++ b/multimedia/mpv/mpv.info
@@ -1,9 +1,9 @@
 PRGNAM="mpv"
-VERSION="0.33.1"
+VERSION="0.34.0"
 HOMEPAGE="https://mpv.io/"
-DOWNLOAD="https://github.com/mpv-player/mpv/archive/v0.33.1/mpv-0.33.1.tar.gz \
+DOWNLOAD="https://github.com/mpv-player/mpv/archive/v0.34.0/mpv-0.34.0.tar.gz \
           https://waf.io/waf-2.0.20"
-MD5SUM="2549341eda0f5770c221469197186038 \
+MD5SUM="14cd51160f41aee105d2b9d572bd8974 \
         eb0cd320fc8838971cfa735ad78f6de8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""