[packages/mpv] - up to 0.6.0 - wafsyms patch applied upstream - xf86vm/xf86xk configure options dropped
atler
atler at pld-linux.org
Wed Oct 1 18:28:37 CEST 2014
commit 050ddb0b62b194a50813652fa771656150ef723e
Author: Jan Palus <atler at pld-linux.org>
Date: Wed Oct 1 18:27:54 2014 +0200
- up to 0.6.0
- wafsyms patch applied upstream
- xf86vm/xf86xk configure options dropped
mpv-wafsyms.patch | 13 -------------
mpv.spec | 8 ++------
2 files changed, 2 insertions(+), 19 deletions(-)
---
diff --git a/mpv.spec b/mpv.spec
index ae7690c..4522b0c 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,15 +1,14 @@
Summary: Movie player based on MPlayer and mplayer2
Name: mpv
-Version: 0.5.4
+Version: 0.6.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: ab784201b48bc38aace349974da2b501
+# Source0-md5: ac06561522ac1767cd05987ea85e827c
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
@@ -96,7 +95,6 @@ zsh-completion for mpv.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
%waf configure \
@@ -160,8 +158,6 @@ zsh-completion for mpv.
--enable-wayland \
--enable-x11 \
--enable-xext \
- --enable-xf86vm \
- --enable-xf86xk \
--enable-xinerama \
--enable-xss \
--enable-xv \
diff --git a/mpv-wafsyms.patch b/mpv-wafsyms.patch
deleted file mode 100644
index 34e31a8..0000000
--- a/mpv-wafsyms.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/050ddb0b62b194a50813652fa771656150ef723e
More information about the pld-cvs-commit
mailing list