From cb94f2b7937913c2c81b6695f76babc2be5810071c2e9c1c0d58c0f3fe8e724e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 19 Apr 2017 11:54:17 +0000 Subject: [PATCH] - Use localy present waf to adhere upstream requirements OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=92 --- .gitattributes | 2 ++ mpv.changes | 5 +++++ mpv.spec | 13 +++++++++---- waf-1.9.9 | 3 +++ 4 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 waf-1.9.9 diff --git a/.gitattributes b/.gitattributes index 9b03811..744859e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,3 +21,5 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text +## Specific LFS patterns +waf-1.9.9 filter=lfs diff=lfs merge=lfs -text diff --git a/mpv.changes b/mpv.changes index 4d44773..d557c53 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 19 11:48:00 UTC 2017 - tchvatal@suse.com + +- Use localy present waf to adhere upstream requirements + ------------------------------------------------------------------- Sat Apr 15 19:11:46 UTC 2017 - tchvatal@suse.com diff --git a/mpv.spec b/mpv.spec index 858c745..bf23ec1 100644 --- a/mpv.spec +++ b/mpv.spec @@ -19,6 +19,7 @@ # +%define _waf_ver 1.9.9 %define _mbc_ver 3.3.13 %define _mpv_ver 0.24.0 %define lname libmpv1 @@ -30,6 +31,7 @@ License: GPL-2.0+ Group: Productivity/Multimedia/Video/Players Url: http://mpv.io/ Source: http://github.com/mpv-player/%{name}/archive/v%{_mpv_ver}.tar.gz#/%{name}-%{_mpv_ver}.tar.gz +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 @@ -48,7 +50,6 @@ BuildRequires: perl BuildRequires: pkgconfig BuildRequires: python-docutils BuildRequires: update-desktop-files -BuildRequires: waf BuildRequires: yasm BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(caca) @@ -193,6 +194,10 @@ features. %setup -q -a 3 -n %{name}-%{_mpv_ver} %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")" @@ -206,7 +211,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}" \ @@ -224,7 +229,7 @@ waf configure \ %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 @@ -232,7 +237,7 @@ make %{?_smp_mflags} popd %install -waf --destdir=%{buildroot} install +./waf --destdir=%{buildroot} install pushd mpv-bash-completion-%{_mbc_ver} %make_install diff --git a/waf-1.9.9 b/waf-1.9.9 new file mode 100644 index 0000000..2f16636 --- /dev/null +++ b/waf-1.9.9 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32fa8b9468c87ee900def85fb41da8bdf50e68001e266d8edafae747fd15d459 +size 100910