[packages/mpv] up to 0.34.0
atler
atler at pld-linux.org
Tue Nov 2 11:36:21 CET 2021
commit 80c75f4f93379a523923872cf0c9c752d53b362e
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Nov 2 11:35:22 2021 +0100
up to 0.34.0
- mpv prefers maintained yt-dlp now
libplacebo.patch | 84 --------------------------------------------------------
mpv.spec | 14 ++++------
2 files changed, 6 insertions(+), 92 deletions(-)
---
diff --git a/mpv.spec b/mpv.spec
index 55991cf..d9af45e 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -12,16 +12,15 @@
Summary: Movie player based on MPlayer and mplayer2
Summary(pl.UTF-8): Odtwarzacz filmów oparty na projektach MPlayer i mplayer2
Name: mpv
-Version: 0.33.1
-Release: 2
+Version: 0.34.0
+Release: 1
License: GPL v2+
Group: Applications/Multimedia
#Source0Download: http://github.com/mpv-player/mpv/releases
Source0: https://github.com/mpv-player/mpv/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 2549341eda0f5770c221469197186038
+# Source0-md5: 14cd51160f41aee105d2b9d572bd8974
Source1: %{name}.conf
Patch0: %{name}-shaderc.patch
-Patch1: libplacebo.patch
URL: http://mpv.io/
BuildRequires: EGL-devel
BuildRequires: Mesa-libgbm-devel
@@ -47,7 +46,7 @@ BuildRequires: libdvdnav-devel >= 4.2.0
BuildRequires: libdvdread-devel >= 4.1.0
%endif
BuildRequires: libjpeg-devel
-%{?with_libplacebo:BuildRequires: libplacebo-devel >= 1.18.0}
+%{?with_libplacebo:BuildRequires: libplacebo-devel >= 3.104.0}
BuildRequires: libva-devel >= 1.4.0
BuildRequires: libva-glx-devel >= 1.4.0
BuildRequires: libvdpau-devel >= 0.2
@@ -90,7 +89,7 @@ Requires: libdrm >= 2.4.74
Requires: libdvdnav >= 4.2.0
Requires: libdvdread >= 4.1.0
%endif
-%{?with_libplacebo:Requires: libplacebo >= 1.18.0}
+%{?with_libplacebo:Requires: libplacebo >= 3.104.0}
Requires: libva >= 1.4.0
Requires: libva-glx >= 1.4.0
Requires: libvdpau >= 0.2
@@ -107,7 +106,7 @@ Requires: xorg-lib-libXinerama >= 1.0.0
Requires: xorg-lib-libXrandr >= 1.2.0
Requires: xorg-lib-libxkbcommon >= 0.3.0
%{?with_zimg:Requires: zimg >= 2.9}
-Suggests: youtube-dl >= 2:20150223
+Suggests: yt-dlp
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _noautoreqdep libGL.so.1 libGLU.so.1
@@ -169,7 +168,6 @@ Dopełnianie parametrów mpv dla powłoki ZSH.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%waf configure \
diff --git a/libplacebo.patch b/libplacebo.patch
deleted file mode 100644
index 5aaaf7b..0000000
--- a/libplacebo.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 7c4465cefb27d4e0d07535d368febdf77b579566 Mon Sep 17 00:00:00 2001
-From: Niklas Haas <git at 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 f8df590511..8244acff26 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;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mpv.git/commitdiff/80c75f4f93379a523923872cf0c9c752d53b362e
More information about the pld-cvs-commit
mailing list