up to 0.37.0

- upstream switched to meson
- libplacebo is mandatory now

diff --git a/mpv.spec b/mpv.spec
index 20d158bbcc28e80d9dac7a14f1f74c46023f4cf9..0fcce9b1ca59f693e1527ba4c1d9f3230600750f 100644 (file)
--- a/mpv.spec
+++ b/mpv.spec
@@ -3,7 +3,6 @@
 %bcond_without caca            # CACA
 %bcond_without dvdnav          # dvdnav support
 %bcond_without js              # JavaScript scripting support
-%bcond_without libplacebo      # libplacebo support
 %bcond_without rubberband      # librubberband support
 %bcond_without shaderc         # libshaderc SPIR-V compiler
 %bcond_without vapoursynth     # VapourSynth filter bridge
@@ -12,13 +11,13 @@
 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.36.0
-Release:       2
+Version:       0.37.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: 3ac8bb1fec1c09293a574e615446bb3b
+# Source0-md5: 54bd6864cc831f1fee6dee693a0421eb
 Source1:       %{name}.conf
 URL:           http://mpv.io/
 BuildRequires: EGL-devel
@@ -39,6 +38,7 @@ BuildRequires:        libatomic-devel
 %endif
 BuildRequires: libbluray-devel >= 0.3.0
 %{?with_caca:BuildRequires:    libcaca-devel >= 0.99-0.beta18.1}
+BuildRequires: libcdio-devel >= 0.90
 BuildRequires: libcdio-paranoia-devel
 BuildRequires: libdrm-devel >= 2.4.105
 %if %{with dvdnav}
@@ -46,12 +46,14 @@ BuildRequires:      libdvdnav-devel >= 4.2.0
 BuildRequires: libdvdread-devel >= 4.1.0
 %endif
 BuildRequires: libjpeg-devel
-%{?with_libplacebo:BuildRequires:      libplacebo-devel >= 4.157.0}
+BuildRequires: libplacebo-devel >= 6.338.0
 BuildRequires: libva-devel >= 1.4.0
 BuildRequires: libva-glx-devel >= 1.4.0
 BuildRequires: libvdpau-devel >= 0.2
 BuildRequires: lua52-devel
+BuildRequires: meson >= 0.62.0
 %{?with_js:BuildRequires:      mujs-devel >= 1.0.0}
+BuildRequires: ninja
 BuildRequires: nv-codec-headers >= 11.1.5.1
 BuildRequires: pipewire-devel >= 0.3.48
 BuildRequires: pkgconfig
@@ -61,8 +63,7 @@ BuildRequires:        rpmbuild(macros) >= 2.007
 %{?with_rubberband:BuildRequires:      rubberband-devel >= 1.8.0}
 %{?with_shaderc:BuildRequires: shaderc-devel >= 2019.0}
 BuildRequires: uchardet-devel
-%{?with_vapoursynth:BuildRequires:     vapoursynth-devel >= 24}
-BuildRequires: waf >= 2.0.21
+%{?with_vapoursynth:BuildRequires:     vapoursynth-devel >= 26}
 BuildRequires: wayland-devel >= 1.20.0
 BuildRequires: wayland-egl-devel
 BuildRequires: wayland-protocols >= 1.32
@@ -70,9 +71,8 @@ BuildRequires:        xorg-lib-libX11-devel >= 1.0.0
 BuildRequires: xorg-lib-libXScrnSaver-devel >= 1.0.0
 BuildRequires: xorg-lib-libXdamage-devel
 BuildRequires: xorg-lib-libXext-devel >= 1.0.0
-BuildRequires: xorg-lib-libXinerama-devel >= 1.0.0
 BuildRequires: xorg-lib-libXpresent-devel >= 1.0.0
-BuildRequires: xorg-lib-libXrandr-devel >= 1.2.0
+BuildRequires: xorg-lib-libXrandr-devel >= 1.4.0
 BuildRequires: xorg-lib-libXv-devel
 BuildRequires: xorg-lib-libxkbcommon-devel >= 0.3.0
 BuildRequires: xorg-proto-xproto-devel
@@ -96,7 +96,7 @@ Requires:     libdvdnav >= 4.2.0
 Requires:      libdvdread >= 4.1.0
 %endif
 Requires:      pipewire-libs >= 0.3.48
-%{?with_libplacebo:%requires_ge_to     libplacebo libplacebo-devel}
+%requires_ge_to        libplacebo libplacebo-devel
 Requires:      libva >= 1.4.0
 Requires:      libva-glx >= 1.4.0
 Requires:      libvdpau >= 0.2
@@ -104,13 +104,12 @@ Requires: libvdpau >= 0.2
 Requires:      pulseaudio-libs >= 1.0
 %{?with_rubberband:Requires:   rubberband-libs >= 1.8.0}
 %{?with_shaderc:Requires:      shaderc >= 2019.0}
-%{?with_vapoursynth:Requires:  vapoursynth >= 24}
+%{?with_vapoursynth:Requires:  vapoursynth >= 26}
 Requires:      wayland >= 1.15.0
 Requires:      xorg-lib-libX11 >= 1.0.0
 Requires:      xorg-lib-libXScrnSaver >= 1.0.0
 Requires:      xorg-lib-libXext >= 1.0.0
-Requires:      xorg-lib-libXinerama >= 1.0.0
-Requires:      xorg-lib-libXrandr >= 1.2.0
+Requires:      xorg-lib-libXrandr >= 1.4.0
 Requires:      xorg-lib-libxkbcommon >= 0.3.0
 %{?with_zimg:Requires: zimg >= 3.0.5}
 Suggests:      yt-dlp
@@ -176,56 +175,46 @@ Dopełnianie parametrów mpv dla powłoki ZSH.
 %setup -q
 
 %build
-%waf configure \
-       --prefix=%{_prefix} \
-       --bindir=%{_bindir} \
-       --confdir=%{_sysconfdir}/mpv \
-       --libdir=%{_libdir} \
-       --datadir=%{_datadir} \
-       --mandir=%{_mandir} \
-       --disable-debug-build \
-       --enable-alsa \
-       %{__enable_disable caca} \
-       --enable-cdda \
-       --enable-cplugins \
-       --enable-dvb \
-       --enable-dvbin \
-       %{__enable_disable dvdnav} \
-       --enable-gl-wayland \
-       --enable-gl-x11 \
-       --enable-iconv \
-       --enable-jack \
-       %{__enable_disable js javascript} \
-       --enable-jpeg \
-       --enable-lcms2 \
-       --enable-libavdevice \
-       --enable-libbluray \
-       --enable-libmpv-shared \
-       %{__enable_disable libplacebo} \
-       %{__enable_disable rubberband} \
-       --enable-openal \
-       --enable-pulse \
-       --enable-sdl2 \
-       %{__enable_disable shaderc} \
-       --enable-uchardet \
-       --enable-vaapi \
-       %{__enable_disable vapoursynth} \
-       --enable-vdpau \
-       --enable-vdpau-gl-x11 \
-       --enable-wayland \
-       --enable-x11 \
-       --enable-xv \
-       %{__enable_disable zimg} \
-       --lua=52deb \
-       --bashdir=%{bash_compdir} \
-       --zshdir=%{zsh_compdir}
+%meson build \
+       -Dalsa=enabled \
+       -Dcaca=%{__enabled_disabled caca} \
+       -Dcdda=enabled \
+       -Dcplugins=enabled \
+       -Ddvbin=enabled \
+       -Ddvdnav=%{__enabled_disabled dvdnav} \
+       -Degl-wayland=enabled \
+       -Degl-x11=enabled \
+       -Dgl-x11=enabled \
+       -Diconv=enabled \
+       -Djack=enabled \
+       -Djavascript=%{__enabled_disabled js} \
+       -Djpeg=enabled \
+       -Dlcms2=enabled \
+       -Dlibavdevice=enabled \
+       -Dlibbluray=enabled \
+       -Dlibmpv=true \
+       -Drubberband=%{__enabled_disabled rubberband} \
+       -Dopenal=enabled \
+       -Dpulse=enabled \
+       -Dsdl2=enabled \
+       -Dshaderc=%{__enabled_disabled shaderc} \
+       -Duchardet=enabled \
+       -Dvaapi=enabled \
+       -Dvapoursynth=%{__enabled_disabled vapoursynth} \
+       -Dvdpau=enabled \
+       -Dvdpau-gl-x11=enabled \
+       -Dwayland=enabled \
+       -Dx11=enabled \
+       -Dxv=enabled \
+       -Dzimg=%{__enabled_disabled zimg} \
+       -Dlua=lua5.2
 
-%waf build -v
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%waf install --destdir=$RPM_BUILD_ROOT
+%ninja_install -C build
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/mpv
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mpv