$ git diff --patch-with-stat --summary 1c66e425c36b17adf929e7fe3405c3bbe7c47d62..1e793284c3f0688b123b3237e83bca71b171af90
.abf.yml | 2 +-
mpv.spec | 36 ++++++++++++++++++++++++++++++++----
2 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index 386283c..5e19aa5 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
sources:
- mpv-0.30.0.tar.gz: 94da9cc423339a8d4f583542a4e7c5f794b82e7b
+ mpv-0.32.0.tar.gz: 5b69ea34dd5f8d209acd5266415c7bc00ab83341
waf-2.0.18: edfc0da1e1246544b22e0910e48b41d2538535c3
diff --git a/mpv.spec b/mpv.spec
index c88ab43..d2d305e 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,18 +1,28 @@
+%ifarch %{ix86} %{arm}
+%define _disable_ld_no_undefined 1
+%define _disable_lto 1
+%endif
%define debug_package %{nil}
%define major 1
%define libname %mklibname %{name} %{major}
%define devname %mklibname %{name} -d
-%define date 20190813
+%define date 20200126
+
+# Is this actually useful, given most people who use samba mount
+# the shares anyway?
+# Let's enable this (and the slew of dependencies it pulls) only
+# if and when we find a real use case...
+%bcond_with samba
Name: mpv
-Version: 0.30.0
-Release: 1
+Version: 0.32.0
+Release: 2
Summary: Movie player playing most video formats and DVDs
Group: Video
License: GPLv2+
URL: http://mpv.io/
-Source0: https://github.com/mpv-player/mpv/archive/v0.30.0/mpv-0.30.0.tar.gz
+Source0: https://github.com/mpv-player/mpv/archive/v%{version}/%{name}-%{version}.tar.gz
# latest stable waf
Source1: https://waf.io/pub/release/waf-2.0.18
Source2: mpv.conf
@@ -35,6 +45,10 @@ BuildRequires: pkgconfig(liblircclient0)
BuildRequires: pkgconfig(lua)
BuildRequires: pkgconfig(ncurses)
BuildRequires: perl
+# Mujs is broken in i686: libmujs.a: error adding symbols: file format not recognized
+%ifnarch %{ix86}
+BuildRequires: pkgconfig(mujs)
+%endif
BuildRequires: pkgconfig(gbm)
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(egl)
@@ -63,7 +77,10 @@ BuildRequires: pkgconfig(libva-x11)
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(portaudio-2.0)
BuildRequires: pkgconfig(sdl2)
+%if %{with samba}
BuildRequires: pkgconfig(smbclient)
+Requires: samba-libs
+%endif
BuildRequires: pkgconfig(vdpau)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xinerama)
@@ -115,6 +132,7 @@ output methods are supported.
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/icons/hicolor/symbolic/apps/mpv-symbolic.svg
%{_datadir}/zsh/site-functions/_mpv
+%{_datadir}/bash-completion/completions/mpv
%{_mandir}/man1/%{name}.*
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/encoding-profiles.conf
@@ -172,6 +190,10 @@ cp %{SOURCE1} waf
chmod 0755 waf
%build
+%ifarch %{ix86}
+export CC=gcc
+export CXX=g++
+%endif
%setup_compile_flags
CCFLAGS="%{optflags}" \
python ./waf configure \
@@ -193,6 +215,11 @@ python ./waf configure \
--enable-gl-wayland \
--enable-egl-x11 \
--enable-vaapi \
+%if %{with samba}
+ --enable-libsmbclient \
+%else
+ --disable-libsmbclient \
+%endif
--enable-libmpv-shared
python ./waf build --verbose
@@ -205,3 +232,4 @@ cp etc/encoding-profiles.conf %{buildroot}%{_sysconfdir}/%{name}/
cp %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/mpv.conf
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+echo 'NoDisplay=true' >>%{buildroot}%{_datadir}/applications/%{name}.desktop