diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2017-04-10 22:51:00 +0200 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-04-18 14:21:51 +0200 |
| commit | 6fbc2c7c6ed8977c0cdac35c6da3ba1ead90733c (patch) | |
| tree | 7c2e66cf7b80c0d81b05a687ac0355f763f5ad11 /meta-oe/recipes-multimedia | |
| parent | 9d2916933a1674c7b6e5b8200421bab148e63166 (diff) | |
| download | meta-openembedded-contrib-6fbc2c7c6ed8977c0cdac35c6da3ba1ead90733c.tar.gz | |
mpv: update 0.15.0 -> 0.24.0
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.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.24.0.bb (renamed from meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb) | 12 |
2 files changed, 45 insertions, 6 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 new file mode 100644 index 0000000000..ab2b5347f5 --- /dev/null +++ b/meta-oe/recipes-multimedia/mplayer/mpv/0001-Fix-build-with-HAVE_GL-0.patch @@ -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 + diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.24.0.bb index f51df778a1..3f46dc187d 100644 --- a/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.24.0.bb @@ -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 \ |