[packages/mpv] - up to 0.5.0 - patch for building with system waf

atler atler at pld-linux.org
Tue Aug 12 19:35:20 CEST 2014


commit 40853644d67938dd2be576ea32d9b7ba30b282c5
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Aug 12 19:34:56 2014 +0200

    - up to 0.5.0
    - patch for building with system waf

 mpv-wafsyms.patch | 13 +++++++++++++
 mpv.spec          |  6 ++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/mpv.spec b/mpv.spec
index c32dc2d..f7041fb 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,14 +1,15 @@
 Summary:	Movie player based on MPlayer and mplayer2
 Name:		mpv
-Version:	0.4.2
+Version:	0.5.0
 Release:	1
 License:	GPL v2+
 Group:		Applications/Multimedia
 Source0:	http://github.com/mpv-player/mpv/archive/v%{version}.tar.gz?/%{name}-%{version}.tar.gz
-# Source0-md5:	b10a95e579962d8f514cd78fb9e37a2b
+# Source0-md5:	85e4895dfdce888fb436e7c217958b8b
 Source1:	%{name}.conf
 Patch0:		%{name}-zshcompdir.patch
 Patch1:		%{name}-lua.patch
+Patch2:		%{name}-wafsyms.patch
 URL:		http://mpv.io/
 BuildRequires:	Mesa-libwayland-egl-devel >= 9.0.0
 BuildRequires:	OpenAL-devel >= 1.13
@@ -95,6 +96,7 @@ zsh-completion for mpv.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %waf configure \
diff --git a/mpv-wafsyms.patch b/mpv-wafsyms.patch
new file mode 100644
index 0000000..34e31a8
--- /dev/null
+++ b/mpv-wafsyms.patch
@@ -0,0 +1,13 @@
+--- mpv-0.5.0.orig/wscript_build.py	2014-08-12 18:58:12.336633168 +0200
++++ mpv-0.5.0/wscript_build.py	2014-08-12 19:05:20.233234905 +0200
+@@ -451,7 +451,9 @@
+     build_static = ctx.dependency_satisfied('libmpv-static')
+     if build_shared or build_static:
+         if build_shared:
+-            ctx.load("syms")
++            import os
++            waftoolsdir = os.path.dirname(__file__) + os.sep + "waftools"
++            ctx.load("syms", tooldir=waftoolsdir)
+         vre = '^#define MPV_CLIENT_API_VERSION MPV_MAKE_VERSION\((.*), (.*)\)$'
+         libmpv_header = ctx.path.find_node("libmpv/client.h").read()
+         major, minor = re.search(vre, libmpv_header, re.M).groups()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mpv.git/commitdiff/40853644d67938dd2be576ea32d9b7ba30b282c5



More information about the pld-cvs-commit mailing list