From b47b34d200a50b77431e818f2abcc21c9dfa98f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 26 Jul 2016 23:45:54 +0200
Subject: [PATCH] Update to 0.18.1, remove old patch

---
 .gitignore        |  1 +
 mpv-old-waf.patch | 70 -----------------------------------------------
 mpv.spec          | 16 ++++-------
 sources           |  2 +-
 4 files changed, 8 insertions(+), 81 deletions(-)
 delete mode 100644 mpv-old-waf.patch

diff --git a/.gitignore b/.gitignore
index a7d4f1e..0348db5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 v0.14.0.tar.gz
 /v0.18.0.tar.gz
+/v0.18.1.tar.gz
diff --git a/mpv-old-waf.patch b/mpv-old-waf.patch
deleted file mode 100644
index b59e7a1..0000000
--- a/mpv-old-waf.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/bootstrap.py b/bootstrap.py
-index e526ff2..c887015 100755
---- a/bootstrap.py
-+++ b/bootstrap.py
-@@ -5,10 +5,10 @@
- from __future__ import print_function
- import os, sys, stat, hashlib, subprocess
- 
--WAFRELEASE = "waf-1.8.12"
-+WAFRELEASE = "waf-1.7.16"
- WAFURLS    = ["https://waf.io/" + WAFRELEASE,
-               "http://www.freehackers.org/~tnagy/release/" + WAFRELEASE]
--SHA256HASH = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b"
-+SHA256HASH = "b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61"
- 
- if os.path.exists("waf"):
-     wafver = subprocess.check_output([sys.executable, './waf', '--version']).decode()
-@@ -44,8 +44,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 3c83292..7401f01 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 fb5f130..5a9bf27 100644
---- a/waftools/waf_customizations.py
-+++ b/waftools/waf_customizations.py
-@@ -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)
-+
-+    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['macplist']
-     class macplist(cls):
-diff --git a/wscript b/wscript
-index d96f74b..9d0391a 100644
---- a/wscript
-+++ b/wscript
-@@ -897,7 +897,7 @@ def is_debug_build(ctx):
- 
- def configure(ctx):
-     ctx.resetenv(ctx.options.variant)
--    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')
- 
diff --git a/mpv.spec b/mpv.spec
index 118a053..3919cce 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,6 +1,6 @@
 Name:           mpv
-Version:        0.18.0
-Release:        3%{?dist}
+Version:        0.18.1
+Release:        1%{?dist}
 Summary:        Movie player playing most video formats and DVDs
 License:        GPLv2+
 URL:            http://%{name}.io/
@@ -9,10 +9,6 @@ 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:  pkgconfig(alsa)
 BuildRequires:  desktop-file-utils
 BuildRequires:  pkgconfig(dvdnav)
@@ -92,10 +88,6 @@ Libmpv development header files and libraries.
 %setup -q
 %patch0 -p1
 
-%if 0%{?fedora} < 22
-%patch1 -p1
-%endif
-
 
 %build
 CCFLAGS="%{optflags}" \
@@ -158,6 +150,10 @@ fi
 %{_libdir}/pkgconfig/mpv.pc
 
 %changelog
+* Tue Jul 26 2016 Miro Hrončok <mhroncok@redhat.com> - 0.18.1-1
+- Update to 0.18.1
+- Remove patch for Fedora < 22
+
 * Sun Jul 03 2016 Sérgio Basto <sergio@serjux.com> - 0.18.0-3
 - BRs in alphabetical order, rename of sub-packages libs and other improvements
 
diff --git a/sources b/sources
index d8d047a..5f2d4e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5bdc0751c4d1b5f8eaa9cb4762d5514  v0.18.0.tar.gz
+708ef2f30825128b3eb9dd35a47ee7e4  v0.18.1.tar.gz