media-video/mpv: sync

3 files changed, 5 insertions, 91 deletions

diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 761ee91..98d3601 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,2 +1,2 @@
-DIST mpv-0.33.1.tar.gz 3259882 BLAKE2B 97ab101c2013ffb219d36a788020fb9fc4382d09971ac0beee42701a54667a6c766521be7b052193de4505b2117c2d47b3682ebafab46632fc40b637e0d19c04 SHA512 99d6c40d18c5cf83814b44ec6d8eade229800c5b51a734c9bbe831c3aeb95f8931124c94f6ae2360ffff62053c163bc3c55b254df021e005b350ebc3df7e952b
+DIST mpv-0.34.0.tar.gz 3287976 BLAKE2B 9fc412544d81b249c71eed0d6669121a1942771ecb48d50d3fda16b8f967c8a777529e28a234d7169617981cd909ff03aed0deaf15db900d605b8d8849939218 SHA512 9935a20730dbb8fbf4cd11fe2fc38b1981882fc85c93046837a9b99cae089b3f710e6af7d7ea977c177de5479aa24e413f76cab9b995e8b7e66d6b77c524fdf0
 DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
diff --git a/media-video/mpv/files/mpv-libplacebo-3.patch b/media-video/mpv/files/mpv-libplacebo-3.patch
deleted file mode 100644
index b684df8..0000000
--- a/media-video/mpv/files/mpv-libplacebo-3.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/media-video/mpv/mpv-0.33.1-r2.ebuild b/media-video/mpv/mpv-0.34.0-r1.ebuild
index 42fc273..d52040a 100644
--- a/media-video/mpv/mpv-0.33.1-r2.ebuild
+++ b/media-video/mpv/mpv-0.34.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
 	DOCS=( RELEASE_NOTES )
 else
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
@@ -71,7 +71,7 @@ COMMON_DEPEND="
 		>=media-libs/libdvdnav-4.2.0:=
 		>=media-libs/libdvdread-4.1.0:=
 	)
-	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+	egl? ( media-libs/mesa[egl(+),gbm(+)?,wayland(-)?] )
 	gamepad? ( media-libs/libsdl2 )
 	iconv? (
 		virtual/libiconv
@@ -93,7 +93,7 @@ COMMON_DEPEND="
 	vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
 	vdpau? ( x11-libs/libvdpau )
 	vulkan? (
-		>=media-libs/libplacebo-2.72.2:=[vulkan]
+		media-libs/libplacebo:=[vulkan]
 		media-libs/shaderc
 	)
 	wayland? (
@@ -131,8 +131,6 @@ BDEPEND="dev-python/docutils
 	test? ( >=dev-util/cmocka-1.0.0 )
 "
 
-PATCHES=( "${FILESDIR}/mpv-libplacebo-3.patch" )
-
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 }
@@ -338,7 +336,7 @@ pkg_postinst() {
 		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
 	fi
 
-	optfeature "URL support" net-misc/youtube-dl
+	optfeature "URL support" net-misc/yt-dlp
 
 	xdg_icon_cache_update
 	xdg_desktop_database_update