mpv: update 0.15.0 -> 0.24.0

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller 2017-04-10 22:51:00 +02:00 committed by Martin Jansa
parent 9d2916933a
commit 6fbc2c7c6e
2 changed files with 45 additions and 6 deletions

View File

@ -0,0 +1,39 @@
From 212f6c8206bd4dcc7d8970c5f1632823ae4e783a Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 12 Feb 2017 23:01:21 -0800
Subject: [PATCH] Fix build with HAVE_GL==0
video/out/opengl/hwdec.h includes video/out/opengl/common.h, which tries
to include opengl headers.
Upstream-Status: Backport
---
options/options.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/options/options.c b/options/options.c
index b711156..0bb36ad 100644
--- a/options/options.c
+++ b/options/options.c
@@ -40,7 +40,6 @@
#include "stream/stream.h"
#include "video/csputils.h"
#include "video/hwdec.h"
-#include "video/out/opengl/hwdec.h"
#include "video/image_writer.h"
#include "sub/osd.h"
#include "audio/filter/af.h"
@@ -53,6 +52,10 @@
#include "video/out/drm_common.h"
#endif
+#if HAVE_GL
+#include "video/out/opengl/hwdec.h"
+#endif
+
extern const char mp_help_text[];
static void print_version(struct mp_log *log)
--
2.9.3

View File

@ -11,11 +11,13 @@ REQUIRED_DISTRO_FEATURES = "x11"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb"
SRC_URI = "https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz;name=mpv \
http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf;subdir=${BPN}-${PV} \
SRC_URI = " \
https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz;name=mpv \
http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf;subdir=${BPN}-${PV} \
file://0001-Fix-build-with-HAVE_GL-0.patch \
"
SRC_URI[mpv.md5sum] = "9042bd3fbff2bc8ba0b7fadaa4a22101"
SRC_URI[mpv.sha256sum] = "7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc"
SRC_URI[mpv.md5sum] = "5c85d1163911e49315a5bf1ca1fae13d"
SRC_URI[mpv.sha256sum] = "a41854fa0ac35b9c309ad692aaee67c8d4495c3546f11cb4cdd0a124195d3f15"
SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71"
SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b"
@ -43,8 +45,6 @@ EXTRA_OECONF = " \
--disable-dvdread \
--disable-dvdnav \
--disable-cdda \
--disable-enca \
--disable-libguess \
--disable-uchardet \
--disable-rubberband \
--disable-lcms2 \