Merge branch 'master' into el8

mpv.spec

@@ -1,6 +1,6 @@
 Name:           mpv
 Version:        0.32.0
-Release:        2%{?gitrelease}%{?dist}
+Release:        6%{?gitrelease}%{?dist}
 Summary:        Movie player playing most video formats and DVDs
 License:        GPLv2+ and LGPLv2+
 URL:            http://mpv.io/
@@ -44,7 +44,7 @@ BuildRequires:  pkgconfig(vulkan)
 %endif
 %endif
 BuildRequires:  pkgconfig(lcms2)
-%if 0%{?fedora}  > 30|| 0%{?rhel} > 8
+%if 0%{?fedora} > 30 || 0%{?rhel} > 8
 BuildRequires:  pkgconfig(libarchive) >= 3.4.0
 %endif
 BuildRequires:  pkgconfig(libass)
@@ -64,6 +64,9 @@ BuildRequires:  pkgconfig(luajit)
 BuildRequires:  pkgconfig(sdl2)
 BuildRequires:  pkgconfig(smbclient)
 BuildRequires:  pkgconfig(vdpau)
+%if 0%{?fedora} || 0%{?rhel} > 7
+BuildRequires:  pkgconfig(vapoursynth)
+%endif
 BuildRequires:  waf-python3
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-cursor)
@@ -136,7 +139,7 @@ sed -i -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc.
     --disable-build-date \
     --enable-libmpv-shared \
     --enable-sdl2 \
-%if 0%{?fedora}  > 30|| 0%{?rhel} > 8
+%if 0%{?fedora} > 30 || 0%{?rhel} > 8
     --enable-libarchive \
 %endif
     --enable-libsmbclient \
@@ -180,6 +183,18 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}
 %{_libdir}/pkgconfig/mpv.pc
 
 %changelog
+* Wed Jun 24 2020 Leigh Scott <leigh123linux@gmail.com> - 0.32.0-6
+- Enable vapoursynth (rfbz#5681)
+
+* Fri Apr 10 2020 Leigh Scott <leigh123linux@gmail.com> - 0.32.0-5
+- Rebuild for new libcdio version
+
+* Sat Feb 22 2020 RPM Fusion Release Engineering <leigh123linux@googlemail.com> - 0.32.0-4
+- Rebuild for ffmpeg-4.3 git
+
+* Sat Feb 08 2020 Leigh Scott <leigh123linux@gmail.com> - 0.32.0-3
+- Rebuild for new libplacebo version
+
 * Sun Jan 26 2020 Leigh Scott <leigh123linux@gmail.com> - 0.32.0-2
 - Drop libarchive support for f30 and el8, supporting 0.31.0 for the
   next decade isn't an option