diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-08 20:33:56 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-28 11:04:11 +0200 |
| commit | 66cce63d507ee71a405a8b0c3b87b63c034bb5dc (patch) | |
| tree | 42d34a7c81b5a119f40fbdcf533c5d69338e96b6 /meta-oe/recipes-multimedia | |
| parent | ac2a6d2b5d69937577effcb8bb2149651bac0176 (diff) | |
| download | meta-openembedded-contrib-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/recipes-multimedia')
| -rw-r--r-- | meta-oe/recipes-multimedia/mplayer/mpv/0001-Fix-build-with-HAVE_GL-0.patch | 39 | ||||
| -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 ab2b5347f5..0000000000 --- a/meta-oe/recipes-multimedia/mplayer/mpv/0001-Fix-build-with-HAVE_GL-0.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 - 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 b1da2175d5..a154e50d61 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" 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] = "5c85d1163911e49315a5bf1ca1fae13d" -SRC_URI[mpv.sha256sum] = "a41854fa0ac35b9c309ad692aaee67c8d4495c3546f11cb4cdd0a124195d3f15" +SRC_URI[mpv.md5sum] = "038d0b660de07ff645ad6a741704ecab" +SRC_URI[mpv.sha256sum] = "daf3ef358d5f260f2269f7caabce27f446c291457ec330077152127133b71b46" SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71" SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b" |