From 164e03e8610ed30a51259813f88dcb2761ef59d9 Mon Sep 17 00:00:00 2001
From: churchyard <churchyard>
Date: Mon, 22 Dec 2014 15:32:56 +0000
Subject: [PATCH] =?UTF-8?q?*=20Mon=20Dec=2022=202014=20Miro=20Hron=C4=8Dok?=
 =?UTF-8?q?=20<mhroncok@redhat.com>=20-=200.7.1-2=20-=20Add=20patch=20to?=
 =?UTF-8?q?=20allow=20waf=201.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mpv-old-waf.patch | 75 +++++++++++++++++++++++++++++++++++++++++++++++
 mpv.spec          | 10 ++++++-
 2 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 mpv-old-waf.patch

diff --git a/mpv-old-waf.patch b/mpv-old-waf.patch
new file mode 100644
index 0000000..e9c6485
--- /dev/null
+++ b/mpv-old-waf.patch
@@ -0,0 +1,75 @@
+diff --git a/bootstrap.py b/bootstrap.py
+index f354d5f..ce388ff 100755
+--- a/bootstrap.py
++++ b/bootstrap.py
+@@ -5,9 +5,9 @@
+ from __future__ import print_function
+ import os, sys, stat, hashlib, subprocess
+ 
+-WAFRELEASE = "waf-1.8.1"
++WAFRELEASE = "waf-1.7.16"
+ WAFURL     = "http://ftp.waf.io/pub/release/" + WAFRELEASE
+-SHA256HASH = "ec658116ba0b96629d91fde0b32321849e866e0819f1e835c4c2c7f7ffe1a21d"
++SHA256HASH = "b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61"
+ 
+ if os.path.exists("waf"):
+     wafver = subprocess.check_output(['./waf', '--version']).decode()
+@@ -31,8 +31,6 @@ if SHA256HASH == hashlib.sha256(waf).hexdigest():
+     print("Checksum verified.")
+ else:
+     print("The checksum of the downloaded file does not match!")
+-    print(" - got:      {}".format(hashlib.sha256(waf).hexdigest()))
+-    print(" - expected: {}".format(SHA256HASH))
+     print("Please download and verify the file manually.")
+ 
+     sys.exit(1)
+diff --git a/waftools/generators/headers.py b/waftools/generators/headers.py
+index 79bd71d..bd28bef 100644
+--- a/waftools/generators/headers.py
++++ b/waftools/generators/headers.py
+@@ -1,5 +1,5 @@
+ def __cp_to_variant__(ctx, variant, basename):
+-    src = ctx.bldnode.search_node(basename).read()
++    src = ctx.bldnode.search(basename).read()
+     node = ctx.bldnode.make_node("{0}/{1}".format(variant, basename))
+     node.parent.mkdir()
+     node.write(src)
+diff --git a/waftools/waf_customizations.py b/waftools/waf_customizations.py
+index 8163c9f..a02bc95 100644
+--- a/waftools/waf_customizations.py
++++ b/waftools/waf_customizations.py
+@@ -34,6 +34,21 @@ def build(ctx):
+     cls = Task.classes['cprogram']
+     class cprogram(cls):
+         run_str = cls.hcode + '${LAST_LINKFLAGS}'
++        def __str__(self):
++            tgt_str = ' '.join([a.nice_path() for a in self.outputs])
++            return 'linking -> {0}\n'.format(tgt_str)
++
++    cls = Task.classes['cshlib']
++    class cshlib(cls):
++        def __str__(self):
++            tgt_str = ' '.join([a.nice_path() for a in self.outputs])
++            return 'linking -> {0}\n'.format(tgt_str)
++
++    cls = Task.classes['compile_sym']
++    class compile_sym(cls):
++        def __str__(self):
++            tgt_str = ' '.join([a.nice_path() for a in self.outputs])
++            return 'compile_sym -> {0}\n'.format(tgt_str)
+ 
+     cls = Task.classes['macplist']
+     class macplist(cls):
+diff --git a/wscript b/wscript
+index 7e82038..aa041c4 100644
+--- a/wscript
++++ b/wscript
+@@ -848,7 +848,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.7.15')
+     target = os.environ.get('TARGET')
+     (cc, pkg_config, ar, windres) = ('cc', 'pkg-config', 'ar', 'windres')
+ 
diff --git a/mpv.spec b/mpv.spec
index 1f5c4e7..266b3d9 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,6 +1,6 @@
 Name:           mpv
 Version:        0.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Movie player playing most video formats and DVDs
 License:        GPLv2+
 URL:            http://%{name}.io/
@@ -9,6 +9,10 @@ Source0:        https://github.com/%{name}-player/%{name}/archive/v%{version}.ta
 # set defaults for Fedora
 Patch0:         %{name}-config.patch
 
+# Upstream commit to use waf >= 1.8 (reverted, rebased)
+# See https://github.com/mpv-player/mpv/issues/1363
+Patch1:         %{name}-old-waf.patch
+
 BuildRequires:  aalib-devel
 BuildRequires:  alsa-lib-devel
 BuildRequires:  bzip2-devel
@@ -53,6 +57,7 @@ output methods are supported.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 CCFLAGS="%{optflags}" \
@@ -112,6 +117,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %config(noreplace) %{_sysconfdir}/%{name}/input.conf
 
 %changelog
+* Mon Dec 22 2014 Miro Hrončok <mhroncok@redhat.com> - 0.7.1-2
+- Add patch to allow waf 1.7
+
 * Sat Dec 13 2014 Miro Hrončok <mhroncok@redhat.com> - 0.7.1-1
 - New version 0.7.1
 - Rebuilt new lirc (#3450)