- Use system waf, seems not to break for now anymore

- Use correct licenses in all subpkgs

OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=75
This commit is contained in:
Tomáš Chvátal 2017-01-03 11:31:22 +00:00 committed by Git OBS Bridge
parent 6090e2df94
commit 3c263f9b45
2 changed files with 15 additions and 15 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jan 3 11:30:54 UTC 2017 - tchvatal@suse.com
- Use system waf, seems not to break for now anymore
- Use correct licenses in all subpkgs
-------------------------------------------------------------------
Tue Jan 3 08:38:56 UTC 2017 - aloisio@gmx.com

View File

@ -19,20 +19,16 @@
#
%define _waf_ver 1.9.5
%define _mbc_ver 3.3.7
%define lname libmpv1
Name: mpv
Version: 0.23.0
Release: 0
Summary: Advanced general-purpose multimedia player
License: GPL-2.0+ and BSD-3-Clause and GPL-3.0+
License: GPL-2.0+
Group: Productivity/Multimedia/Video/Players
# waf is licensed with BSD-3-Clause
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
@ -51,6 +47,7 @@ BuildRequires: perl
BuildRequires: pkgconfig
BuildRequires: python-docutils
BuildRequires: update-desktop-files
BuildRequires: waf
BuildRequires: yasm
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(caca)
@ -119,7 +116,6 @@ BuildRequires: pkgconfig(luajit)
# 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)
@ -127,7 +123,6 @@ BuildRequires: pkgconfig(wayland-scanner)
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
@ -137,6 +132,7 @@ of video file formats, audio and video codecs, and subtitle types.
Version: %{_mbc_ver}
Release: 0
Summary: Bash Completion for %{name}
License: GPL-3.0+
Group: Productivity/Multimedia/Video/Players
Requires: %{name} = %{version}
Requires: bash-completion
@ -147,7 +143,6 @@ BuildArch: noarch
%description bash-completion
A script for generating a Bash completion script for the popular mpv
video player. It features...
* Completion for all --options,
* Type-based completion for --option arguments for choices, flags,
integers and floats,
@ -161,6 +156,7 @@ video player. It features...
%package zsh-completion
Summary: ZSH Completion for %{name}
License: GPL-2.0+
Group: Productivity/Multimedia/Video/Players
Requires: %{name} = %{version}
Supplements: packageand(mpv:zsh)
@ -171,6 +167,7 @@ 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}
@ -182,6 +179,7 @@ This package contains all the development files.
%package -n %{lname}
Summary: A library to link together with mpv player
License: GPL-2.0+
Group: System/Libraries
%description -n %{lname}
@ -195,10 +193,6 @@ features.
%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")"
@ -212,7 +206,7 @@ myopts+=" --disable-build-date"
# 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}" \
@ -230,7 +224,7 @@ export CCFLAGS="%{optflags}"
%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
@ -238,7 +232,7 @@ make %{?_smp_mflags}
popd
%install
./waf --destdir=%{buildroot} install
waf --destdir=%{buildroot} install
pushd mpv-bash-completion-%{_mbc_ver}
%make_install