diff --git a/_service b/_service
index 02ff54d..c5b8d41 100644
--- a/_service
+++ b/_service
@@ -3,11 +3,12 @@
https://github.com/mpv-player/mpv.git
git
mpv
- 0.31.0+git
+ 0.32.0+git
%ct.%h
enable
-
+
+
*.tar
diff --git a/_servicedata b/_servicedata
index aff5dd7..65c63c9 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/mpv-player/mpv.git
- 01de2a9bd5c4689b70c7cf237b718135c5c73d7b
\ No newline at end of file
+ cbfcd3e703a35e9f0ad1f5829711ce3655092869
\ No newline at end of file
diff --git a/mpv-0.31.0+git.1577540072.01de2a9bd5.obscpio b/mpv-0.31.0+git.1577540072.01de2a9bd5.obscpio
deleted file mode 100644
index 9f3b8f1..0000000
--- a/mpv-0.31.0+git.1577540072.01de2a9bd5.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:37150fbfe564f9957b8e5b39b2303b774343b6045fbc93347b98415d89a11214
-size 8857101
diff --git a/mpv-0.32.0+git.1580083289.cbfcd3e703.obscpio b/mpv-0.32.0+git.1580083289.cbfcd3e703.obscpio
new file mode 100644
index 0000000..bc6353b
--- /dev/null
+++ b/mpv-0.32.0+git.1580083289.cbfcd3e703.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0e80c32264ef6d8724e8f44c6f6a7535296a261daa6da45d87e0cc3a3a91e22
+size 8881677
diff --git a/mpv-bash-completion-3.3.18.tar.gz b/mpv-bash-completion-3.3.18.tar.gz
deleted file mode 100644
index 0a2935e..0000000
--- a/mpv-bash-completion-3.3.18.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:23eaaa131eda36e17562efa6c67d9b64eff93d6d80a88f4effe8786e91cc97df
-size 21111
diff --git a/mpv.changes b/mpv.changes
index a5aaea8..0e78585 100644
--- a/mpv.changes
+++ b/mpv.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jan 27 08:04:54 UTC 2020 - idonmez@suse.com
+
+- Update to version 0.32.0+git.1580083289.cbfcd3e703:
+ * See https://github.com/mpv-player/mpv/compare/01de2a9bd5..cbfcd3e703
+ for the complete changelog.
+ * mpv now generates its own bash-completion file
+
-------------------------------------------------------------------
Sat Jan 18 11:33:05 UTC 2020 - Martin Herkt <9+suse@cirno.systems>
diff --git a/mpv.obsinfo b/mpv.obsinfo
index 29e3b83..30e3ead 100644
--- a/mpv.obsinfo
+++ b/mpv.obsinfo
@@ -1,5 +1,5 @@
name: mpv
-version: 0.31.0+git.1577540072.01de2a9bd5
-mtime: 1577540072
-commit: 01de2a9bd5c4689b70c7cf237b718135c5c73d7b
+version: 0.32.0+git.1580083289.cbfcd3e703
+mtime: 1580083289
+commit: cbfcd3e703a35e9f0ad1f5829711ce3655092869
diff --git a/mpv.spec b/mpv.spec
index f695875..a51e39a 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -20,21 +20,17 @@
%define _waf_ver 2.0.9
-%define _mbc_ver 3.3.18
-%define _mpv_ver 0.31.0+git.1577540072.01de2a9bd5
%define lname libmpv1
Name: mpv
-Version: %{_mpv_ver}
+Version: 0.32.0+git.1580083289.cbfcd3e703
Release: 0
Summary: Advanced general-purpose multimedia player
License: GPL-2.0-or-later
Group: Productivity/Multimedia/Video/Players
URL: http://mpv.io/
-Source: %{name}-%{_mpv_ver}.tar.xz
+Source: %{name}-%{version}.tar.xz
Source1: https://waf.io/waf-%{_waf_ver}
Source2: %{name}.changes
-# mpv-bash-completion is licensed with GPL-3.0+
-Source3: https://github.com/2ion/mpv-bash-completion/archive/%{_mbc_ver}.tar.gz#/mpv-bash-completion-%{_mbc_ver}.tar.gz
# PATCH-FIX-OPENSUSE do not require equal libav versions, obs rebuilds as needed
Patch0: mpv-make-ffmpeg-version-check-non-fatal.patch
BuildRequires: bash
@@ -138,35 +134,21 @@ mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety
of video file formats, audio and video codecs, and subtitle types.
%package bash-completion
-Version: %{_mbc_ver}
-Release: 0
Summary: Bash Completion for %{name}
-License: GPL-3.0-or-later
Group: Productivity/Multimedia/Video/Players
-Requires: %{name} = %{_mpv_ver}
+Requires: %{name} = %{version}
Requires: bash-completion
Recommends: xrandr
Supplements: (mpv and bash)
BuildArch: noarch
%description bash-completion
-A Bash completion script for the mpv video player. It features
- * Completion for all --options,
- * Type-based completion for --option arguments for choices, flags,
- integers and floats,
- * Completion for upper/lower bounds for integer- and float-type
- argument ranges where applicable,
- * Completion of filter lists as arguments to --vf and --af style
- options as well as completion of filter parameters while composing
- filter lists,
- * Similarly, parameter completion for video and audio outputs (--vo, --ao),
- * Regular file name completion.
+Bash command line completion support for %{name}.
%package zsh-completion
Summary: ZSH Completion for %{name}
-License: GPL-2.0-or-later
Group: Productivity/Multimedia/Video/Players
-Requires: %{name} = %{_mpv_ver}
+Requires: %{name} = %{version}
Supplements: (mpv and zsh)
BuildArch: noarch
@@ -175,9 +157,8 @@ ZSH command line completion support for %{name}.
%package devel
Summary: A library to link together with mpv player
-License: GPL-2.0-or-later
Group: Development/Libraries/C and C++
-Requires: %{lname} = %{_mpv_ver}
+Requires: %{lname} = %{version}
%description devel
mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety
@@ -187,7 +168,6 @@ This package contains all the development files.
%package -n %{lname}
Summary: A library to link together with mpv player
-License: GPL-2.0-or-later
Group: System/Libraries
%description -n %{lname}
@@ -198,7 +178,7 @@ This package contains a library that can other apps use to utilize the mpv
features.
%prep
-%setup -q -a 3
+%setup -q
%patch0 -p1
# As we downloaded specific waf version we need to put and prepare it in place.
@@ -208,7 +188,7 @@ chmod a+x waf
# I hate UNKNOWN so lets put decent info there.
MODIFIED="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE2}")"
DATE="$(date -d "$MODIFIED" "+%%b %%e %%Y")"
-sed -i "s|UNKNOWN|$DATE|g;s|VERSION|\"%{_mpv_ver}\"|g" common/version.c
+sed -i "s|UNKNOWN|$DATE|g;s|VERSION|\"%{version}\"|g" common/version.c
%build
# SDL: disable as it is pointless to have on Linux, it is Windows/OS X fallback.
@@ -247,18 +227,9 @@ python3 ./waf configure \
python3 ./waf build --verbose %{?_smp_mflags}
-pushd mpv-bash-completion-%{_mbc_ver}
-export MPV_BASHCOMPGEN_MPV_CMD=../build/mpv
-make %{?_smp_mflags}
-popd
-
%install
python3 ./waf --destdir=%{buildroot} install
-pushd mpv-bash-completion-%{_mbc_ver}
-%make_install
-popd
-
install -D -m 0644 etc/input.conf %{buildroot}%{_sysconfdir}/%{name}/input.conf
install -D -m 0644 etc/mpv.conf %{buildroot}%{_sysconfdir}/%{name}/mpv.conf
# remove shebang
@@ -298,8 +269,6 @@ sed -i -e '1d' %{buildroot}%{_datadir}/bash-completion/completions/mpv
%{_datadir}/zsh/site-functions/_mpv
%files bash-completion
-%license mpv-bash-completion-%{_mbc_ver}/LICENSE
-%doc mpv-bash-completion-%{_mbc_ver}/README.mkd
%{_datadir}/bash-completion/completions/mpv
%files -n %{lname}