- Use localy present waf to adhere upstream requirements

OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=92
This commit is contained in:
Tomáš Chvátal 2017-04-19 11:54:17 +00:00 committed by Git OBS Bridge
parent c931bb57a4
commit cb94f2b793
4 changed files with 19 additions and 4 deletions

2
.gitattributes vendored
View File

@ -21,3 +21,5 @@
*.xz filter=lfs diff=lfs merge=lfs -text *.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text
*.zst 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

View File

@ -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 Sat Apr 15 19:11:46 UTC 2017 - tchvatal@suse.com

View File

@ -19,6 +19,7 @@
# #
%define _waf_ver 1.9.9
%define _mbc_ver 3.3.13 %define _mbc_ver 3.3.13
%define _mpv_ver 0.24.0 %define _mpv_ver 0.24.0
%define lname libmpv1 %define lname libmpv1
@ -30,6 +31,7 @@ License: GPL-2.0+
Group: Productivity/Multimedia/Video/Players Group: Productivity/Multimedia/Video/Players
Url: http://mpv.io/ Url: http://mpv.io/
Source: http://github.com/mpv-player/%{name}/archive/v%{_mpv_ver}.tar.gz#/%{name}-%{_mpv_ver}.tar.gz 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 Source2: %{name}.changes
# mpv-bash-completion is licensed with GPL-3.0+ # 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 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: pkgconfig
BuildRequires: python-docutils BuildRequires: python-docutils
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: waf
BuildRequires: yasm BuildRequires: yasm
BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(caca) BuildRequires: pkgconfig(caca)
@ -193,6 +194,10 @@ features.
%setup -q -a 3 -n %{name}-%{_mpv_ver} %setup -q -a 3 -n %{name}-%{_mpv_ver}
%patch0 -p1 %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. # I hate UNKNOWN so lets put decent info there.
MODIFIED="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE2}")" MODIFIED="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE2}")"
DATE="$(date -d "$MODIFIED" "+%%b %%e %%Y")" 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. # Debug just adds -g and we do that over optflags anyway.
myopts+=" --disable-debug" myopts+=" --disable-debug"
export CCFLAGS="%{optflags}" export CCFLAGS="%{optflags}"
waf configure \ ./waf configure \
--prefix="%{_prefix}" \ --prefix="%{_prefix}" \
--bindir="%{_bindir}" \ --bindir="%{_bindir}" \
--mandir="%{_mandir}" \ --mandir="%{_mandir}" \
@ -224,7 +229,7 @@ waf configure \
%endif %endif
${myopts} ${myopts}
waf build --verbose %{?_smp_mflags} ./waf build --verbose %{?_smp_mflags}
pushd mpv-bash-completion-%{_mbc_ver} pushd mpv-bash-completion-%{_mbc_ver}
export MPV_BASHCOMPGEN_MPV_CMD=../build/mpv export MPV_BASHCOMPGEN_MPV_CMD=../build/mpv
@ -232,7 +237,7 @@ make %{?_smp_mflags}
popd popd
%install %install
waf --destdir=%{buildroot} install ./waf --destdir=%{buildroot} install
pushd mpv-bash-completion-%{_mbc_ver} pushd mpv-bash-completion-%{_mbc_ver}
%make_install %make_install

3
waf-1.9.9 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:32fa8b9468c87ee900def85fb41da8bdf50e68001e266d8edafae747fd15d459
size 100910