From cde1930e55ce97ea7b0df14be2ba9d374197d40c Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 30 Jun 2020 21:14:28 +0100 Subject: [PATCH 01/25] rebuild --- mpv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index 4ee714d..d20389b 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,6 +1,6 @@ Name: mpv Version: 0.32.0 -Release: 6%{?gitrelease}%{?dist} +Release: 7%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -185,6 +185,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Tue Jun 30 2020 Leigh Scott - 0.32.0-7 +- rebuilt + * Wed Jun 24 2020 Leigh Scott - 0.32.0-6 - Enable vapoursynth (rfbz#5681) From a551ccf1e381f5f7075195b6aa083bb57597fa0f Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 1 Jul 2020 16:09:31 +0100 Subject: [PATCH 02/25] Rebuilt for new libplacebo --- mpv.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mpv.spec b/mpv.spec index d20389b..63d1497 100644 --- a/mpv.spec +++ b/mpv.spec @@ -56,8 +56,8 @@ BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libquvi-0.9) BuildRequires: pkgconfig(libva) -%if 0%{?fedora} < 31 -BuildRequires: pkgconfig(lua-5.1) +%if 0%{?fedora} +BuildRequires: pkgconfig(lua) %else BuildRequires: pkgconfig(luajit) %endif @@ -186,7 +186,7 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %changelog * Tue Jun 30 2020 Leigh Scott - 0.32.0-7 -- rebuilt +- Rebuilt for new libplacebo * Wed Jun 24 2020 Leigh Scott - 0.32.0-6 - Enable vapoursynth (rfbz#5681) From f6ce6dac47b25ee67395c7f1c0cd657c0cc636dc Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 4 Jul 2020 09:45:04 +0100 Subject: [PATCH 03/25] Fix lua mistake --- mpv.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mpv.spec b/mpv.spec index 63d1497..a94d45f 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,6 +1,6 @@ Name: mpv Version: 0.32.0 -Release: 7%{?gitrelease}%{?dist} +Release: 8%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -56,11 +56,7 @@ BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libquvi-0.9) BuildRequires: pkgconfig(libva) -%if 0%{?fedora} -BuildRequires: pkgconfig(lua) -%else BuildRequires: pkgconfig(luajit) -%endif BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(smbclient) BuildRequires: pkgconfig(vdpau) @@ -185,6 +181,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Sat Jul 04 2020 Leigh Scott - 0.32.0-8 +- Fix lua mistake + * Tue Jun 30 2020 Leigh Scott - 0.32.0-7 - Rebuilt for new libplacebo From fee197602777f5fae3f6a06df13a258ef7884bd6 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 18 Aug 2020 17:34:12 +0100 Subject: [PATCH 04/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Leigh Scott --- mpv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index a94d45f..65e10e1 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,6 +1,6 @@ Name: mpv Version: 0.32.0 -Release: 8%{?gitrelease}%{?dist} +Release: 9%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -181,6 +181,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Tue Aug 18 2020 RPM Fusion Release Engineering - 0.32.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jul 04 2020 Leigh Scott - 0.32.0-8 - Fix lua mistake From efcb2fb9499f6d7ab5988eaf8d5ab1ca44732332 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 21 Oct 2020 11:56:20 +0100 Subject: [PATCH 05/25] Rebuild for new libdvdread --- mpv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index 65e10e1..81ea472 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,6 +1,6 @@ Name: mpv Version: 0.32.0 -Release: 9%{?gitrelease}%{?dist} +Release: 10%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -181,6 +181,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Wed Oct 21 2020 Leigh Scott - 0.32.0-10 +- Rebuild for new libdvdread + * Tue Aug 18 2020 RPM Fusion Release Engineering - 0.32.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 25bdd1cf6a2597152acfb6851db835affe705534 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 22 Nov 2020 18:42:23 +0000 Subject: [PATCH 06/25] Update to 0.33.0 --- mpv.spec | 9 +++++---- sources | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mpv.spec b/mpv.spec index 81ea472..6702156 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,6 +1,6 @@ Name: mpv -Version: 0.32.0 -Release: 10%{?gitrelease}%{?dist} +Version: 0.33.0 +Release: 1%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -58,7 +58,6 @@ BuildRequires: pkgconfig(libquvi-0.9) BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(luajit) BuildRequires: pkgconfig(sdl2) -BuildRequires: pkgconfig(smbclient) BuildRequires: pkgconfig(vdpau) %ifarch x86_64 %if 0%{?fedora} || 0%{?rhel} > 7 @@ -140,7 +139,6 @@ sed -i -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc. %if 0%{?fedora} > 30 || 0%{?rhel} > 8 --enable-libarchive \ %endif - --enable-libsmbclient \ --enable-dvdnav \ --enable-cdda \ --enable-html-build \ @@ -181,6 +179,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Sun Nov 22 2020 Leigh Scott - 0.33.0-1 +- Update to 0.33.0 + * Wed Oct 21 2020 Leigh Scott - 0.32.0-10 - Rebuild for new libdvdread diff --git a/sources b/sources index 7aa4c7d..fc36925 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mpv-0.32.0.tar.gz) = f6426c0254ec0bf2f120e2196904f1e15fe17032b06764abca1d5e074f0cabb452eaf1cd09f8fd9b25b591accee7b881bfc3b06c19d5c98980305c4712486bd6 +SHA512 (mpv-0.33.0.tar.gz) = 5a4af74ba2c9656c6b61adcf944c734923c7b4527a49cd79ec63a0617911629438a138d887dfbd4b6c0c9c53e2c68c18839d98d9765179e52cc5675d0682e077 From 3f010b8eab86ed43564da570599a970993a58084 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 22 Nov 2020 19:12:08 +0000 Subject: [PATCH 07/25] Enable legacy X11 vdpau --- mpv.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mpv.spec b/mpv.spec index 6702156..304f5a3 100644 --- a/mpv.spec +++ b/mpv.spec @@ -143,6 +143,7 @@ sed -i -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc. --enable-cdda \ --enable-html-build \ %{?_with_rpi:--enable-rpi --disable-vaapi} \ + --enable-gl-x11 \ --enable-dvbin From f6e5629b9c0d17167cbe977f61a066c8e7f5a77c Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 31 Dec 2020 19:19:08 +0000 Subject: [PATCH 08/25] Rebuilt for new ffmpeg snapshot --- mpv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index 304f5a3..cb6f826 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,6 +1,6 @@ Name: mpv Version: 0.33.0 -Release: 1%{?gitrelease}%{?dist} +Release: 2%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -180,6 +180,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Thu Dec 31 2020 Leigh Scott - 0.33.0-2 +- Rebuilt for new ffmpeg snapshot + * Sun Nov 22 2020 Leigh Scott - 0.33.0-1 - Update to 0.33.0 From e82319b85274d23400304d96e64f9b514da170fc Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 3 Feb 2021 20:47:42 +0000 Subject: [PATCH 09/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Leigh Scott --- mpv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index cb6f826..ae4511f 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,6 +1,6 @@ Name: mpv Version: 0.33.0 -Release: 2%{?gitrelease}%{?dist} +Release: 3%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -180,6 +180,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Wed Feb 03 2021 RPM Fusion Release Engineering - 0.33.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Dec 31 2020 Leigh Scott - 0.33.0-2 - Rebuilt for new ffmpeg snapshot From 0493bab3274cc3d57dfb768c330818be5380bdd2 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 3 Feb 2021 21:11:29 +0000 Subject: [PATCH 10/25] Remove unused libquvi build requires --- mpv.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index ae4511f..2cac012 100644 --- a/mpv.spec +++ b/mpv.spec @@ -54,7 +54,6 @@ BuildRequires: pkgconfig(libcdio_paranoia) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libpulse) -BuildRequires: pkgconfig(libquvi-0.9) BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(luajit) BuildRequires: pkgconfig(sdl2) From 763ed44feb22aa3b290c928a60b1e40849e91617 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 11 Feb 2021 21:42:24 +0100 Subject: [PATCH 11/25] Rebuilt --- mpv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index 2cac012..4e045ca 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,6 +1,6 @@ Name: mpv Version: 0.33.0 -Release: 3%{?gitrelease}%{?dist} +Release: 4%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -179,6 +179,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Thu Feb 11 2021 Nicolas Chauvet - 0.33.0-4 +- Rebuilt + * Wed Feb 03 2021 RPM Fusion Release Engineering - 0.33.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a9983a8231765fb52906fe26c29910d91b86e68a Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 11 Feb 2021 21:05:37 +0000 Subject: [PATCH 12/25] Patch for new libplacebo API --- ...65cefb27d4e0d07535d368febdf77b579566.patch | 84 +++++++++++++++++++ mpv.spec | 7 +- 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 7c4465cefb27d4e0d07535d368febdf77b579566.patch diff --git a/7c4465cefb27d4e0d07535d368febdf77b579566.patch b/7c4465cefb27d4e0d07535d368febdf77b579566.patch new file mode 100644 index 0000000..5aaaf7b --- /dev/null +++ b/7c4465cefb27d4e0d07535d368febdf77b579566.patch @@ -0,0 +1,84 @@ +From 7c4465cefb27d4e0d07535d368febdf77b579566 Mon Sep 17 00:00:00 2001 +From: Niklas Haas +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; diff --git a/mpv.spec b/mpv.spec index 4e045ca..36dba68 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,10 +1,12 @@ +%global giturl https://github.com/mpv-player/mpv + Name: mpv Version: 0.33.0 Release: 4%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ -Source0: https://github.com/mpv-player/mpv/archive/v%{version}/%{name}-%{version}.tar.gz +Source0: %{giturl}/archive/v%{version}/%{name}-%{version}.tar.gz # set defaults for Fedora Patch0: %{name}-config.patch @@ -13,6 +15,9 @@ Patch0: %{name}-config.patch # https://github.com/mpv-player/mpv/issues/3776 Patch1: ppc_fix.patch +# Patch for new libplacebo API +Patch2: %{giturl}/commit/7c4465cefb27d4e0d07535d368febdf77b579566.patch + BuildRequires: pkgconfig(alsa) BuildRequires: desktop-file-utils BuildRequires: gcc From 69eb584adb0c0d281ee67afa1b1e683da7cdbbc0 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 24 Mar 2021 23:31:16 +0000 Subject: [PATCH 13/25] rebuild --- mpv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index 36dba68..344fe75 100644 --- a/mpv.spec +++ b/mpv.spec @@ -2,7 +2,7 @@ Name: mpv Version: 0.33.0 -Release: 4%{?gitrelease}%{?dist} +Release: 5%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -184,6 +184,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Wed Mar 24 2021 Leigh Scott - 0.33.0-5 +- rebuilt + * Thu Feb 11 2021 Nicolas Chauvet - 0.33.0-4 - Rebuilt From e12bceb16db6e331d77b54562d8d4cd9434c8a83 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 2 Apr 2021 16:22:43 +0100 Subject: [PATCH 14/25] Rebuild --- mpv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index 344fe75..c0e4ec9 100644 --- a/mpv.spec +++ b/mpv.spec @@ -2,7 +2,7 @@ Name: mpv Version: 0.33.0 -Release: 5%{?gitrelease}%{?dist} +Release: 6%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -184,6 +184,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Fri Apr 02 2021 Leigh Scott - 0.33.0-6 +- rebuilt + * Wed Mar 24 2021 Leigh Scott - 0.33.0-5 - rebuilt From 8a4162dd8d3f484ccbafa9cdc3aa12da4f3c6da4 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 5 Apr 2021 18:13:29 +0100 Subject: [PATCH 15/25] Update to 0.33.1 --- mpv.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mpv.spec b/mpv.spec index c0e4ec9..0692662 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,8 +1,8 @@ %global giturl https://github.com/mpv-player/mpv Name: mpv -Version: 0.33.0 -Release: 6%{?gitrelease}%{?dist} +Version: 0.33.1 +Release: 1%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -184,6 +184,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Mon Apr 05 2021 Leigh Scott - 0.33.1-1 +- Update to 0.33.1 + * Fri Apr 02 2021 Leigh Scott - 0.33.0-6 - rebuilt diff --git a/sources b/sources index fc36925..05d4cc6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mpv-0.33.0.tar.gz) = 5a4af74ba2c9656c6b61adcf944c734923c7b4527a49cd79ec63a0617911629438a138d887dfbd4b6c0c9c53e2c68c18839d98d9765179e52cc5675d0682e077 +SHA512 (mpv-0.33.1.tar.gz) = 99d6c40d18c5cf83814b44ec6d8eade229800c5b51a734c9bbe831c3aeb95f8931124c94f6ae2360ffff62053c163bc3c55b254df021e005b350ebc3df7e952b From 531959b933eac30e43ab877caf235e41c59f7555 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 3 Aug 2021 12:49:55 +0100 Subject: [PATCH 16/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Leigh Scott --- mpv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index 0692662..f721ab1 100644 --- a/mpv.spec +++ b/mpv.spec @@ -2,7 +2,7 @@ Name: mpv Version: 0.33.1 -Release: 1%{?gitrelease}%{?dist} +Release: 2%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -184,6 +184,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Tue Aug 03 2021 RPM Fusion Release Engineering - 0.33.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Apr 05 2021 Leigh Scott - 0.33.1-1 - Update to 0.33.1 From 3a4f1a953af326e25e733c0833e33fe226442945 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 3 Aug 2021 13:13:40 +0100 Subject: [PATCH 17/25] kernel-headers-5.14 has dropped /usr/include/linux/dvb/video.h --- mpv.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mpv.spec b/mpv.spec index f721ab1..96675e1 100644 --- a/mpv.spec +++ b/mpv.spec @@ -138,6 +138,10 @@ sed -i -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc. --docdir=%{_docdir}/%{name} \ --confdir=%{_sysconfdir}/%{name} \ --disable-build-date \ +%if 0%{?fedora} > 34 +# kernel-headers-5.14 has dropped /usr/include/linux/dvb/video.h + --enable-dvbin \ +%endif --enable-libmpv-shared \ --enable-sdl2 \ %if 0%{?fedora} > 30 || 0%{?rhel} > 8 @@ -147,8 +151,7 @@ sed -i -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc. --enable-cdda \ --enable-html-build \ %{?_with_rpi:--enable-rpi --disable-vaapi} \ - --enable-gl-x11 \ - --enable-dvbin + --enable-gl-x11 %{_bindir}/waf -v build %{?_smp_mflags} From 399f0b5a9aad04189128980d4b9442c80c52a58e Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 3 Aug 2021 13:40:53 +0100 Subject: [PATCH 18/25] Remove comment --- mpv.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mpv.spec b/mpv.spec index 96675e1..bb1a0af 100644 --- a/mpv.spec +++ b/mpv.spec @@ -138,10 +138,6 @@ sed -i -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc. --docdir=%{_docdir}/%{name} \ --confdir=%{_sysconfdir}/%{name} \ --disable-build-date \ -%if 0%{?fedora} > 34 -# kernel-headers-5.14 has dropped /usr/include/linux/dvb/video.h - --enable-dvbin \ -%endif --enable-libmpv-shared \ --enable-sdl2 \ %if 0%{?fedora} > 30 || 0%{?rhel} > 8 @@ -151,8 +147,11 @@ sed -i -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc. --enable-cdda \ --enable-html-build \ %{?_with_rpi:--enable-rpi --disable-vaapi} \ - --enable-gl-x11 - + --enable-gl-x11 \ +%if 0%{?fedora} < 35 + --enable-dvbin +%endif + %{_bindir}/waf -v build %{?_smp_mflags} From d9b37e1bbc0c576c9ba4c811cba83470ddf4e5bb Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 19 Aug 2021 16:41:24 +0200 Subject: [PATCH 19/25] rebuilt --- mpv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index bb1a0af..ddc2fe7 100644 --- a/mpv.spec +++ b/mpv.spec @@ -2,7 +2,7 @@ Name: mpv Version: 0.33.1 -Release: 2%{?gitrelease}%{?dist} +Release: 3%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -186,6 +186,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Thu Aug 19 2021 Nicolas Chauvet - 0.33.1-3 +- rebuilt + * Tue Aug 03 2021 RPM Fusion Release Engineering - 0.33.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 570dd938c4870baf757a1afb05c9f15b708f2310 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 20 Sep 2021 14:56:47 +0100 Subject: [PATCH 20/25] rebuilt --- mpv.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mpv.spec b/mpv.spec index ddc2fe7..b26fdc6 100644 --- a/mpv.spec +++ b/mpv.spec @@ -2,7 +2,7 @@ Name: mpv Version: 0.33.1 -Release: 3%{?gitrelease}%{?dist} +Release: 4%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -60,7 +60,7 @@ BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libva) -BuildRequires: pkgconfig(luajit) +BuildRequires: pkgconfig(lua-5.1) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(vdpau) %ifarch x86_64 @@ -186,6 +186,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Mon Sep 20 2021 Leigh Scott - 0.33.1-4 +- rebuilt + * Thu Aug 19 2021 Nicolas Chauvet - 0.33.1-3 - rebuilt From 1e06772dfd7a94a7bfe7c558f371b0c47d974f7c Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Mon, 1 Nov 2021 18:34:45 +0100 Subject: [PATCH 21/25] Updated to version 0.34.0. --- ...65cefb27d4e0d07535d368febdf77b579566.patch | 84 ------------------- mpv-config.patch | 12 --- mpv.spec | 59 ++++++------- sources | 2 +- 4 files changed, 27 insertions(+), 130 deletions(-) delete mode 100644 7c4465cefb27d4e0d07535d368febdf77b579566.patch delete mode 100644 mpv-config.patch diff --git a/7c4465cefb27d4e0d07535d368febdf77b579566.patch b/7c4465cefb27d4e0d07535d368febdf77b579566.patch deleted file mode 100644 index 5aaaf7b..0000000 --- a/7c4465cefb27d4e0d07535d368febdf77b579566.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 7c4465cefb27d4e0d07535d368febdf77b579566 Mon Sep 17 00:00:00 2001 -From: Niklas Haas -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; diff --git a/mpv-config.patch b/mpv-config.patch deleted file mode 100644 index a411259..0000000 --- a/mpv-config.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/etc/mpv.conf -+++ b/etc/mpv.conf -@@ -8,7 +8,7 @@ - # no builtin or example mpv.conf with all the defaults. - # - # --# Configuration files are read system-wide from /usr/local/etc/mpv.conf -+# Configuration files are read system-wide from /etc/mpv/mpv.conf - # and per-user from ~/.config/mpv/mpv.conf, where per-user settings override - # system-wide settings, all of which are overridden by the command line. - # - diff --git a/mpv.spec b/mpv.spec index b26fdc6..af648dc 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,23 +1,16 @@ -%global giturl https://github.com/mpv-player/mpv - Name: mpv -Version: 0.33.1 -Release: 4%{?gitrelease}%{?dist} -Summary: Movie player playing most video formats and DVDs -License: GPLv2+ and LGPLv2+ -URL: http://mpv.io/ -Source0: %{giturl}/archive/v%{version}/%{name}-%{version}.tar.gz +Version: 0.34.0 +Release: 1%{?dist} -# set defaults for Fedora -Patch0: %{name}-config.patch +License: GPLv2+ and LGPLv2+ +Summary: Movie player playing most video formats and DVDs +URL: https://%{name}.io/ +Source0: https://github.com/%{name}-player/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz # Fix ppc as upstream refuse to fix the issue # https://github.com/mpv-player/mpv/issues/3776 Patch1: ppc_fix.patch -# Patch for new libplacebo API -Patch2: %{giturl}/commit/7c4465cefb27d4e0d07535d368febdf77b579566.patch - BuildRequires: pkgconfig(alsa) BuildRequires: desktop-file-utils BuildRequires: gcc @@ -88,16 +81,13 @@ BuildRequires: /usr/bin/rst2man BuildRequires: perl(Math::BigInt) BuildRequires: perl(Math::BigRat) BuildRequires: perl(Encode) - -%ifarch armv7hl armv7hnl -%{?_with_rpi: -BuildRequires: raspberrypi-vc-devel -} +%ifarch %{arm} +%{?_with_rpi:BuildRequires: raspberrypi-vc-devel} %endif # Obsoletes older ci/cd -Obsoletes: mpv-master < %{version}-100 -Provides: mpv-master = %{version}-100 +Obsoletes: %{name}-master < %{version}-100 +Provides: %{name}-master = %{version}-100 Requires: hicolor-icon-theme Provides: mplayer-backend @@ -117,16 +107,15 @@ This package contains the dynamic library libmpv, which provides access to Mpv. %package libs-devel Summary: Development package for libmpv -Requires: mpv-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description libs-devel Libmpv development header files and libraries. %prep -%autosetup -p1 -n mpv-%{?commit}%{?!commit:%{version}} - -sed -i -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc.standard_includes.append('$(pkgconf --variable=includedir libavcodec)')|" wscript - +%autosetup -p1 +sed -e "s|/usr/local/etc|%{_sysconfdir}/%{name}|" -i etc/%{name}.conf +sed -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc.standard_includes.append('$(pkgconf --variable=includedir libavcodec)')|" -i wscript %build %set_build_flags @@ -151,41 +140,45 @@ sed -i -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc. %if 0%{?fedora} < 35 --enable-dvbin %endif - - %{_bindir}/waf -v build %{?_smp_mflags} %install %{_bindir}/waf install --destdir=%{buildroot} +%check desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop -install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}/%{name}/ %files %docdir %{_docdir}/%{name}/ -%{_docdir}/%{name}/ +%doc README.md etc/input.conf etc/%{name}.conf %license LICENSE.GPL LICENSE.LGPL Copyright +%{_docdir}/%{name}/ %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %dir %{_datadir}/bash-completion/ %dir %{_datadir}/bash-completion/completions/ %{_datadir}/bash-completion/completions/%{name} %{_datadir}/icons/hicolor/*/apps/%{name}*.* -%{_datadir}/zsh/site-functions/_mpv +%dir %{_datadir}/zsh/ +%dir %{_datadir}/zsh/site-functions/ +%{_datadir}/zsh/site-functions/_%{name} %{_mandir}/man1/%{name}.* %dir %{_sysconfdir}/%{name}/ %config(noreplace) %{_sysconfdir}/%{name}/encoding-profiles.conf %files libs %license LICENSE.GPL LICENSE.LGPL Copyright -%{_libdir}/libmpv.so.* +%{_libdir}/lib%{name}.so.* %files libs-devel %{_includedir}/%{name}/ -%{_libdir}/libmpv.so -%{_libdir}/pkgconfig/mpv.pc +%{_libdir}/lib%{name}.so +%{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Nov 01 2021 Vitaly Zaitsev - 0.34.0-1 +- Updated to version 0.34.0. + * Mon Sep 20 2021 Leigh Scott - 0.33.1-4 - rebuilt diff --git a/sources b/sources index 05d4cc6..6eb4f41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mpv-0.33.1.tar.gz) = 99d6c40d18c5cf83814b44ec6d8eade229800c5b51a734c9bbe831c3aeb95f8931124c94f6ae2360ffff62053c163bc3c55b254df021e005b350ebc3df7e952b +SHA512 (mpv-0.34.0.tar.gz) = 9935a20730dbb8fbf4cd11fe2fc38b1981882fc85c93046837a9b99cae089b3f710e6af7d7ea977c177de5479aa24e413f76cab9b995e8b7e66d6b77c524fdf0 From 862b577287806fd58d9da70d10c9f26e508cda0b Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Mon, 1 Nov 2021 19:35:26 +0100 Subject: [PATCH 22/25] Fixed build on F35+. --- mpv.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mpv.spec b/mpv.spec index af648dc..b42ce44 100644 --- a/mpv.spec +++ b/mpv.spec @@ -136,10 +136,10 @@ sed -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc.sta --enable-cdda \ --enable-html-build \ %{?_with_rpi:--enable-rpi --disable-vaapi} \ - --enable-gl-x11 \ %if 0%{?fedora} < 35 - --enable-dvbin + --enable-dvbin \ %endif + --enable-gl-x11 %{_bindir}/waf -v build %{?_smp_mflags} %install From f0171c2a527d54466dfbdb92abbefea85ef78c2e Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Mon, 1 Nov 2021 19:47:17 +0100 Subject: [PATCH 23/25] Enabled dvbin on all Fedora releases. --- mpv.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/mpv.spec b/mpv.spec index b42ce44..64adf9f 100644 --- a/mpv.spec +++ b/mpv.spec @@ -136,9 +136,7 @@ sed -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc.sta --enable-cdda \ --enable-html-build \ %{?_with_rpi:--enable-rpi --disable-vaapi} \ -%if 0%{?fedora} < 35 --enable-dvbin \ -%endif --enable-gl-x11 %{_bindir}/waf -v build %{?_smp_mflags} From 3ef2b49502ecb9fea6d032a6de754a8d54ef21cf Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 9 Nov 2021 13:03:51 +0000 Subject: [PATCH 24/25] Rebuilt for new ffmpeg snapshot --- mpv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index 64adf9f..b0fb8b7 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,6 +1,6 @@ Name: mpv Version: 0.34.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Summary: Movie player playing most video formats and DVDs @@ -174,6 +174,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Nov 09 2021 Leigh Scott - 0.34.0-2 +- Rebuilt for new ffmpeg snapshot + * Mon Nov 01 2021 Vitaly Zaitsev - 0.34.0-1 - Updated to version 0.34.0. From 6c0e16ad1972d96c83db1c290fa7cf6e6ac436ab Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 16 Nov 2021 10:02:35 +0100 Subject: [PATCH 25/25] Added a weak rich dependency on yt-dlp or youtube-dl. --- mpv.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mpv.spec b/mpv.spec index b0fb8b7..24e4c2c 100644 --- a/mpv.spec +++ b/mpv.spec @@ -91,6 +91,7 @@ Provides: %{name}-master = %{version}-100 Requires: hicolor-icon-theme Provides: mplayer-backend +Recommends: (yt-dlp or youtube-dl) %description Mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety