Hello community, here is the log from the commit of package mpv for openSUSE:Factory checked in at 2017-01-27 11:13:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mpv (Old) and /work/SRC/openSUSE:Factory/.mpv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mpv" Changes: -------- --- /work/SRC/openSUSE:Factory/mpv/mpv.changes 2016-12-29 22:52:26.563736628 +0100 +++ /work/SRC/openSUSE:Factory/.mpv.new/mpv.changes 2017-02-03 17:50:48.925451467 +0100 @@ -1,0 +2,47 @@ +Thu Jan 19 19:57:35 UTC 2017 - [email protected] + +- Fixup wrong description + +------------------------------------------------------------------- +Thu Jan 19 18:25:26 UTC 2017 - [email protected] + +- Updated embedded mpv-bash-completion to 3.3.8 + * FIXED: --{ and --} got treated as flags, completing to + --{=yes|no and --}=yes|no, respectively, due to a change in + upstream option typing, which is a command line syntax error. + +------------------------------------------------------------------- +Tue Jan 3 19:49:41 UTC 2017 - [email protected] + +- Further version requirement fixes + +------------------------------------------------------------------- +Tue Jan 3 17:33:17 UTC 2017 - [email protected] + +- Fixed version requirement in the bash-completion + subpackage + +------------------------------------------------------------------- +Tue Jan 3 11:30:54 UTC 2017 - [email protected] + +- Use system waf, seems not to break for now anymore +- Use correct licenses in all subpkgs + +------------------------------------------------------------------- +Tue Jan 3 08:38:56 UTC 2017 - [email protected] + +- Fixed minor details for the mpv-bash-completion subpackage + +------------------------------------------------------------------- +Mon Jan 2 23:59:18 UTC 2017 - [email protected] + +- Split the completion to separate subpackage and build it in obs not + during post + +------------------------------------------------------------------- +Mon Jan 2 21:19:27 UTC 2017 - [email protected] + +- Added mpv-bash-completion-3.3.7.tar.gz to generate + a bash-completion script + +------------------------------------------------------------------- Old: ---- waf-1.9.5 New: ---- mpv-bash-completion-3.3.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mpv.spec ++++++ --- /var/tmp/diff_new_pack.S2Tzmt/_old 2017-02-03 17:50:49.501370268 +0100 +++ /var/tmp/diff_new_pack.S2Tzmt/_new 2017-02-03 17:50:49.505369704 +0100 @@ -1,7 +1,7 @@ # # spec file for package mpv # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2015 Packman Team <[email protected]> # Copyright (c) 2012 Jiri Slaby <[email protected]> # Copyright (c) 2011-2012 Pascal Bleser <[email protected]> @@ -19,38 +19,36 @@ # -%define _waf_ver 1.9.5 +%define _mbc_ver 3.3.8 +%define _mpv_ver 0.23.0 %define lname libmpv1 Name: mpv -Version: 0.23.0 +Version: %{_mpv_ver} Release: 0 Summary: Advanced general-purpose multimedia player -# waf is licensed with BSD-3-Clause -License: GPL-2.0+ and BSD-3-Clause +License: GPL-2.0+ Group: Productivity/Multimedia/Video/Players Url: http://mpv.io/ Source: http://github.com/mpv-player/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# Can't use system one as it breaks quite often with updates -Source1: http://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 BuildRequires: hicolor-icon-theme -Requires: hicolor-icon-theme -Requires(post): hicolor-icon-theme -Requires(post): update-desktop-files -Requires(postun): hicolor-icon-theme -Requires(postun): update-desktop-files BuildRequires: ladspa-devel BuildRequires: libjpeg-devel BuildRequires: libmng-devel BuildRequires: linux-kernel-headers BuildRequires: lirc-devel +BuildRequires: lua BuildRequires: ncurses-devel BuildRequires: perl -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: python-docutils BuildRequires: update-desktop-files +BuildRequires: waf BuildRequires: yasm BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(caca) @@ -94,7 +92,11 @@ BuildRequires: pkgconfig(xv) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) -Recommends: mpv-bash-completion +Requires: hicolor-icon-theme +Requires(post): hicolor-icon-theme +Requires(post): update-desktop-files +Requires(postun): hicolor-icon-theme +Requires(postun): update-desktop-files # Used via LUA scripts Recommends: youtube-dl # Obsoletion of mplayer2 that is dead for 2 years now @@ -105,7 +107,7 @@ # JIT for lua. %if 0%{?suse_version} > 1320 BuildRequires: python-rst2pdf -%ifarch %ix86 x86_64 +%ifarch %{ix86} x86_64 BuildRequires: pkgconfig(luajit) %endif %endif @@ -115,7 +117,6 @@ # Wayland and libguess. BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(libguess) -%if 0%{?suse_version} > 1310 BuildRequires: pkgconfig(wayland-client) >= 1.6.0 BuildRequires: pkgconfig(wayland-cursor) >= 1.6.0 BuildRequires: pkgconfig(wayland-egl) @@ -123,16 +124,52 @@ BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(xkbcommon) >= 0.3.0 %endif -%endif %description 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+ +Group: Productivity/Multimedia/Video/Players +Requires: %{name} = %{_mpv_ver} +Requires: bash-completion +Recommends: xrandr +Supplements: packageand(mpv: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. + +%package zsh-completion +Summary: ZSH Completion for %{name} +License: GPL-2.0+ +Group: Productivity/Multimedia/Video/Players +Requires: %{name} = %{_mpv_ver} +Supplements: packageand(mpv:zsh) +BuildArch: noarch + +%description zsh-completion +ZSH command line completion support for %{name}. + %package devel Summary: A library to link together with mpv player +License: GPL-2.0+ Group: Development/Libraries/C and C++ -Requires: %{lname} = %{version} +Requires: %{lname} = %{_mpv_ver} %description devel mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety @@ -142,6 +179,7 @@ %package -n %{lname} Summary: A library to link together with mpv player +License: GPL-2.0+ Group: System/Libraries %description -n %{lname} @@ -152,13 +190,9 @@ features. %prep -%setup -q +%setup -q -a 3 %patch0 -p1 -# As we downloaded specific waf version we need to put and prepare it in place. -cp -f %{SOURCE1} waf -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")" @@ -172,7 +206,7 @@ # Debug just adds -g and we do that over optflags anyway. myopts+=" --disable-debug" export CCFLAGS="%{optflags}" -./waf configure \ +waf configure \ --prefix="%{_prefix}" \ --bindir="%{_bindir}" \ --mandir="%{_mandir}" \ @@ -190,10 +224,19 @@ %endif ${myopts} -./waf build --verbose %{?_smp_mflags} +waf build --verbose %{?_smp_mflags} + +pushd mpv-bash-completion-%{_mbc_ver} +export MPV_BASHCOMPGEN_MPV_CMD=../build/mpv +make %{?_smp_mflags} +popd %install -./waf --destdir=%{buildroot} install +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 @@ -207,7 +250,6 @@ %icon_theme_cache_postun %post -n %{lname} -p /sbin/ldconfig - %postun -n %{lname} -p /sbin/ldconfig %files @@ -223,10 +265,17 @@ %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor -#zsh completion -%{_datadir}/zsh/site-functions/_mpv %{_mandir}/man?/%{name}.?%{?ext_man} +%files zsh-completion +%defattr(-,root,root) +%{_datadir}/zsh/site-functions/_mpv + +%files bash-completion +%defattr(-,root,root) +%doc mpv-bash-completion-%{_mbc_ver}/LICENSE mpv-bash-completion-%{_mbc_ver}/README.mkd +%{_datadir}/bash-completion/completions/mpv + %files -n %{lname} %defattr(-,root,root) %{_libdir}/*.so.*
