Author: churchyard Update of /cvs/free/rpms/mpv/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16313 Modified Files: .cvsignore mpv-old-waf.patch mpv.spec sources Log Message: * Mon Apr 13 2015 Miro Hrončok <mhroncok(a)redhat.com&gt; - 0.8.3-1 - Updated Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mpv/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 28 Jan 2015 18:31:47 -0000 1.15 +++ .cvsignore 13 Apr 2015 11:34:45 -0000 1.16 @@ -1 +1 @@ -v0.7.3.tar.gz +v0.8.3.tar.gz mpv-old-waf.patch: bootstrap.py | 6 ++---- waftools/generators/headers.py | 2 +- waftools/waf_customizations.py | 9 +++++++++ wscript | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) Index: mpv-old-waf.patch =================================================================== RCS file: /cvs/free/rpms/mpv/devel/mpv-old-waf.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mpv-old-waf.patch 22 Dec 2014 16:01:41 -0000 1.2 +++ mpv-old-waf.patch 13 Apr 2015 11:34:45 -0000 1.3 @@ -1,20 +1,21 @@ diff --git a/bootstrap.py b/bootstrap.py -index f354d5f..ce388ff 100755 +index 7ffd39a..aba9dd3 100755 --- a/bootstrap.py +++ b/bootstrap.py -@@ -5,9 +5,9 @@ +@@ -5,10 +5,10 @@ from __future__ import print_function import os, sys, stat, hashlib, subprocess --WAFRELEASE = "waf-1.8.1" +-WAFRELEASE = "waf-1.8.4" +WAFRELEASE = "waf-1.7.16" - WAFURL = "http://ftp.waf.io/pub/release/" + WAFRELEASE --SHA256HASH = "ec658116ba0b96629d91fde0b32321849e866e0819f1e835c4c2c7f7ffe1a21d" + WAFURLS = ["http://ftp.waf.io/pub/release/" + WAFRELEASE, + "http://www.freehackers.org/~tnagy/release/" + WAFRELEASE] +-SHA256HASH = "f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8" +SHA256HASH = "b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61" if os.path.exists("waf"): wafver = subprocess.check_output(['./waf', '--version']).decode() -@@ -31,8 +31,6 @@ if SHA256HASH == hashlib.sha256(waf).hexdigest(): +@@ -44,8 +44,6 @@ if SHA256HASH == hashlib.sha256(waf).hexdigest(): print("Checksum verified.") else: print("The checksum of the downloaded file does not match!") @@ -24,7 +25,7 @@ sys.exit(1) diff --git a/waftools/generators/headers.py b/waftools/generators/headers.py -index 79bd71d..bd28bef 100644 +index 0046cbf..eae705e 100644 --- a/waftools/generators/headers.py +++ b/waftools/generators/headers.py @@ -1,5 +1,5 @@ @@ -35,13 +36,13 @@ node.parent.mkdir() node.write(src) diff --git a/waftools/waf_customizations.py b/waftools/waf_customizations.py -index 8163c9f..029ad8d 100644 +index fb5f130..5a9bf27 100644 --- a/waftools/waf_customizations.py +++ b/waftools/waf_customizations.py -@@ -34,6 +34,15 @@ def build(ctx): - cls = Task.classes['cprogram'] - class cprogram(cls): - run_str = cls.hcode + '${LAST_LINKFLAGS}' +@@ -40,6 +40,15 @@ def build(ctx): + run_str = cls.hcode + '${LAST_LINKFLAGS}' + except TypeError: + run_str = cls.hcode.decode('iso8859-1') + '${LAST_LINKFLAGS}' + def __str__(self): + tgt_str = ' '.join([a.nice_path() for a in self.outputs]) + return 'linking -> {0}\n'.format(tgt_str) @@ -55,14 +56,14 @@ cls = Task.classes['macplist'] class macplist(cls): diff --git a/wscript b/wscript -index 7e82038..aa041c4 100644 +index d3cc354..903fe31 100644 --- a/wscript +++ b/wscript -@@ -848,7 +848,7 @@ def is_debug_build(ctx): +@@ -839,7 +839,7 @@ def is_debug_build(ctx): def configure(ctx): ctx.resetenv(ctx.options.variant) -- ctx.check_waf_version(mini='1.8.1') +- ctx.check_waf_version(mini='1.8.4') + ctx.check_waf_version(mini='1.7.15') target = os.environ.get('TARGET') (cc, pkg_config, ar, windres) = ('cc', 'pkg-config', 'ar', 'windres') Index: mpv.spec =================================================================== RCS file: /cvs/free/rpms/mpv/devel/mpv.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- mpv.spec 28 Jan 2015 18:31:47 -0000 1.37 +++ mpv.spec 13 Apr 2015 11:34:45 -0000 1.38 @@ -1,5 +1,5 @@ Name: mpv -Version: 0.7.3 +Version: 0.8.3 Release: 1%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ @@ -117,8 +117,11 @@ %config(noreplace) %{_sysconfdir}/%{name}/input.conf %changelog +* Mon Apr 13 2015 Miro Hrončok <mhroncok(a)redhat.com&gt; - 0.8.3-1 +- Updated + * Wed Jan 28 2015 Miro Hrončok <mhroncok(a)redhat.com&gt; - 0.7.3-1 -- rebuilt +- Updated * Mon Dec 22 2014 Miro Hrončok <mhroncok(a)redhat.com&gt; - 0.7.1-3 - Slightly change the waf patch Index: sources =================================================================== RCS file: /cvs/free/rpms/mpv/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 28 Jan 2015 18:31:47 -0000 1.15 +++ sources 13 Apr 2015 11:34:45 -0000 1.16 @@ -1 +1 @@ -894e712235574fb78077e388f10c1cdd v0.7.3.tar.gz +a34ff41da1d5393ac8d6f9fbb743d3bd v0.8.3.tar.gz