[mpv/el8] Revert "Bundle waf and comment out the missing BuildRequires"

commit 6f1690b1e850663b7677ed09980717cfc57dd4f9 Author: Leigh Scott <leigh123linux(a)googlemail.com&gt; Date: Tue Aug 27 09:44:09 2019 +0100 Revert "Bundle waf and comment out the missing BuildRequires" This reverts commit 8bd44a077830a0407ba474d1ca5c9c703f625599. mpv.spec | 32 +++++------- waf | 170 --------------------------------------------------------------- 2 files changed, 13 insertions(+), 189 deletions(-) --- diff --git a/mpv.spec b/mpv.spec index cb58064..285a4c7 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,11 +1,10 @@ Name: mpv Version: 0.29.1 -Release: 6%{?dist} +Release: 5%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://%{name}.io/ Source0: https://github.com/%{name}-player/%{name}/archive/v%{version}.tar.gz#/%{n... -Source1: waf # set defaults for Fedora Patch0: %{name}-config.patch @@ -30,8 +29,8 @@ BuildRequires: pkgconfig(libswresample) >= 3.0.100 BuildRequires: pkgconfig(ffnvcodec) BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(gl) -#BuildRequires: pkgconfig(jack) -#BuildRequires: pkgconfig(mujs) +BuildRequires: pkgconfig(jack) +BuildRequires: pkgconfig(mujs) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libarchive) BuildRequires: pkgconfig(libass) @@ -39,23 +38,21 @@ BuildRequires: pkgconfig(libbluray) BuildRequires: pkgconfig(libcdio) BuildRequires: pkgconfig(libcdio_paranoia) BuildRequires: pkgconfig(libdrm) -#BuildRequires: pkgconfig(libguess) +BuildRequires: pkgconfig(libguess) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libv4l2) BuildRequires: pkgconfig(libquvi-0.9) BuildRequires: pkgconfig(libva) -#BuildRequires: pkgconfig(lua-5.1) +BuildRequires: pkgconfig(lua-5.1) BuildRequires: pkgconfig(sdl2) -#BuildRequires: pkgconfig(rubberband) -#BuildRequires: libshaderc-devel +BuildRequires: pkgconfig(rubberband) +BuildRequires: libshaderc-devel BuildRequires: pkgconfig(smbclient) -#BuildRequires: pkgconfig(uchardet) >= 0.0.5 +BuildRequires: pkgconfig(uchardet) >= 0.0.5 BuildRequires: pkgconfig(vdpau) -%ifarch x86_64 BuildRequires: pkgconfig(vulkan) -%endif -#BuildRequires: waf +BuildRequires: waf BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-egl) @@ -105,12 +102,12 @@ Libmpv development header files and libraries. %prep %autosetup -p1 -cp %{SOURCE1} . + %build CFLAGS="%{optflags}" \ LDFLAGS="%{?__global_ldflags}" \ -./waf configure \ +waf configure \ --prefix=%{_prefix} \ --bindir=%{_bindir} \ --libdir=%{_libdir} \ @@ -130,10 +127,10 @@ LDFLAGS="%{?__global_ldflags}" \ --enable-dvbin -./waf -v build %{?_smp_mflags} +waf -v build %{?_smp_mflags} %install -./waf install --destdir=%{buildroot} +waf install --destdir=%{buildroot} desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}/%{name}/ @@ -159,9 +156,6 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog -* Mon Aug 26 2019 Leigh Scott <leigh123linux(a)gmail.com&gt; - 0.29.1-6 -- Bundle waf and comment out the missing BuildRequires - * Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 0.29.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild