From e21815ef5700f8769bd8fae0c98a723f5e9db454 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 22 Sep 2019 22:59:58 +0100 Subject: [PATCH 1/5] Update to 20190922 snapshot --- mpv.spec | 12 ++++++++---- sources | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mpv.spec b/mpv.spec index ce1b6ea..0d5bbd1 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,11 +1,11 @@ -%global commit cd7bcb9d0c12ee4e252024235cc8bbb395960118 -%global gitdate 20190814 +%global commit b6def652a4b0db0f3514a44fec08f4be66187f3b +%global gitdate 20190922 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global gitrelease .%{gitdate}.git%{shortcommit} Name: mpv Version: 0.29.1 -Release: 12%{?gitrelease}%{?dist} +Release: 13%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -64,7 +64,7 @@ BuildRequires: pkgconfig(luajit) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(smbclient) BuildRequires: pkgconfig(vdpau) -BuildRequires: waf +BuildRequires: waf-python3 BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-egl) @@ -173,6 +173,10 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Sun Sep 22 2019 Leigh Scott - 0.29.1-13.20190922.gitb6def65 +- Update to 20190922 snapshot +- Switch to waf-python3 + * Tue Sep 10 2019 Leigh Scott - 0.29.1-12.20190814.gitcd7bcb9 - Adjust epel8 build requires diff --git a/sources b/sources index 097337f..342c631 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9204ae97d1a9de40f12399fcdb26be2f mpv-cd7bcb9.tar.gz +2a4e960c66270d470b80bd519a352474 mpv-b6def65.tar.gz From 5d8d5dc2871a0403c69174c6e57a82479cc6bbb3 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 22 Sep 2019 23:08:52 +0100 Subject: [PATCH 2/5] remove dead dvdread option --- mpv.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index 0d5bbd1..471a15a 100644 --- a/mpv.spec +++ b/mpv.spec @@ -136,7 +136,6 @@ sed -i -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc. --enable-sdl2 \ --enable-libarchive \ --enable-libsmbclient \ - --enable-dvdread \ --enable-dvdnav \ --enable-cdda \ %{?_with_rpi:--enable-rpi --disable-vaapi} \ From b97e0b2e06107d9d9e5cd03a47d906c8f7672384 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 23 Sep 2019 00:18:33 +0100 Subject: [PATCH 3/5] remove dead tv option --- mpv.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index 471a15a..4336fc6 100644 --- a/mpv.spec +++ b/mpv.spec @@ -139,7 +139,6 @@ sed -i -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc. --enable-dvdnav \ --enable-cdda \ %{?_with_rpi:--enable-rpi --disable-vaapi} \ - --enable-tv \ --enable-dvbin From d96986600dc0f2d7f0c13ee2e421ff8fcd0cb463 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 23 Sep 2019 00:55:43 +0100 Subject: [PATCH 4/5] tweak buildrequires --- mpv.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mpv.spec b/mpv.spec index 4336fc6..ebc2600 100644 --- a/mpv.spec +++ b/mpv.spec @@ -5,7 +5,7 @@ Name: mpv Version: 0.29.1 -Release: 13%{?gitrelease}%{?dist} +Release: 14%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -21,8 +21,8 @@ Patch1: ppc_fix.patch BuildRequires: pkgconfig(alsa) BuildRequires: desktop-file-utils BuildRequires: gcc +BuildRequires: pkgconfig(caca) BuildRequires: pkgconfig(dvdnav) -BuildRequires: pkgconfig(dvdread) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(enca) BuildRequires: pkgconfig(libavutil) >= 56.27.100 @@ -57,7 +57,6 @@ BuildRequires: pkgconfig(libcdio_paranoia) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libpulse) -BuildRequires: pkgconfig(libv4l2) BuildRequires: pkgconfig(libquvi-0.9) BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(luajit) @@ -77,6 +76,7 @@ BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(xv) +BuildRequires: pkgconfig(zimg) BuildRequires: pkgconfig(zlib) BuildRequires: /usr/bin/rst2man BuildRequires: perl(Math::BigInt) @@ -171,6 +171,10 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Sun Sep 22 2019 Leigh Scott - 0.29.1-14.20190922.gitb6def65 +- Remove BuildRequires dvdread and libv4l2 +- Add BuildRequires zimg and caca + * Sun Sep 22 2019 Leigh Scott - 0.29.1-13.20190922.gitb6def65 - Update to 20190922 snapshot - Switch to waf-python3 From 805d8f8a5a83179af4c0576b1aa344ed1f1f9a85 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 23 Sep 2019 01:27:14 +0100 Subject: [PATCH 5/5] Rebuild with newer zimg --- mpv.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index ebc2600..bb5ca03 100644 --- a/mpv.spec +++ b/mpv.spec @@ -5,7 +5,7 @@ Name: mpv Version: 0.29.1 -Release: 14%{?gitrelease}%{?dist} +Release: 15%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -77,6 +77,7 @@ BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(xv) BuildRequires: pkgconfig(zimg) +# Requires zimg version >= 2.9 BuildRequires: pkgconfig(zlib) BuildRequires: /usr/bin/rst2man BuildRequires: perl(Math::BigInt) @@ -171,6 +172,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Mon Sep 23 2019 Leigh Scott - 0.29.1-15.20190922.gitb6def65 +- Rebuild with newer zimg + * Sun Sep 22 2019 Leigh Scott - 0.29.1-14.20190922.gitb6def65 - Remove BuildRequires dvdread and libv4l2 - Add BuildRequires zimg and caca