summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2017-08-08 20:33:56 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-28 11:04:11 +0200
commit66cce63d507ee71a405a8b0c3b87b63c034bb5dc (patch)
tree42d34a7c81b5a119f40fbdcf533c5d69338e96b6 /meta-oe
parentac2a6d2b5d69937577effcb8bb2149651bac0176 (diff)
downloadmeta-openembedded-66cce63d507ee71a405a8b0c3b87b63c034bb5dc.tar.gz
mpv: Update to version 0.26.0.
Updates the mpv package to version 0.26.0. The patch that was previously necessary related to OpenGL has been added upstream. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-multimedia/mplayer/mpv/0001-Fix-build-with-HAVE_GL-0.patch39
-rw-r--r--meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb (renamed from meta-oe/recipes-multimedia/mplayer/mpv_0.24.0.bb)5
2 files changed, 2 insertions, 42 deletions
diff --git a/meta-oe/recipes-multimedia/mplayer/mpv/0001-Fix-build-with-HAVE_GL-0.patch b/meta-oe/recipes-multimedia/mplayer/mpv/0001-Fix-build-with-HAVE_GL-0.patch
deleted file mode 100644
index ab2b5347f..000000000
--- a/meta-oe/recipes-multimedia/mplayer/mpv/0001-Fix-build-with-HAVE_GL-0.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 212f6c8206bd4dcc7d8970c5f1632823ae4e783a Mon Sep 17 00:00:00 2001
2From: Michael Forney <mforney@mforney.org>
3Date: Sun, 12 Feb 2017 23:01:21 -0800
4Subject: [PATCH] Fix build with HAVE_GL==0
5
6video/out/opengl/hwdec.h includes video/out/opengl/common.h, which tries
7to include opengl headers.
8
9Upstream-Status: Backport
10---
11 options/options.c | 5 ++++-
12 1 file changed, 4 insertions(+), 1 deletion(-)
13
14diff --git a/options/options.c b/options/options.c
15index b711156..0bb36ad 100644
16--- a/options/options.c
17+++ b/options/options.c
18@@ -40,7 +40,6 @@
19 #include "stream/stream.h"
20 #include "video/csputils.h"
21 #include "video/hwdec.h"
22-#include "video/out/opengl/hwdec.h"
23 #include "video/image_writer.h"
24 #include "sub/osd.h"
25 #include "audio/filter/af.h"
26@@ -53,6 +52,10 @@
27 #include "video/out/drm_common.h"
28 #endif
29
30+#if HAVE_GL
31+#include "video/out/opengl/hwdec.h"
32+#endif
33+
34 extern const char mp_help_text[];
35
36 static void print_version(struct mp_log *log)
37--
382.9.3
39
diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.24.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb
index b1da2175d..a154e50d6 100644
--- a/meta-oe/recipes-multimedia/mplayer/mpv_0.24.0.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb
@@ -14,10 +14,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb"
14SRC_URI = " \ 14SRC_URI = " \
15 https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz;name=mpv \ 15 https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz;name=mpv \
16 http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf;subdir=${BPN}-${PV} \ 16 http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf;subdir=${BPN}-${PV} \
17 file://0001-Fix-build-with-HAVE_GL-0.patch \
18" 17"
19SRC_URI[mpv.md5sum] = "5c85d1163911e49315a5bf1ca1fae13d" 18SRC_URI[mpv.md5sum] = "038d0b660de07ff645ad6a741704ecab"
20SRC_URI[mpv.sha256sum] = "a41854fa0ac35b9c309ad692aaee67c8d4495c3546f11cb4cdd0a124195d3f15" 19SRC_URI[mpv.sha256sum] = "daf3ef358d5f260f2269f7caabce27f446c291457ec330077152127133b71b46"
21SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71" 20SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71"
22SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b" 21SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b"
23 22