summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Tumaykin <itumaykin@gmail.com>2017-02-12 23:24:41 +0300
committerDavid Seifert <soap@gentoo.org>2017-02-14 22:41:06 +0100
commite535b39b9315f9b53459b5c993b0047b4c69a793 (patch)
tree29443ee2f26f3b87e47e77d2bcab6598c168a3bb /media-video/mpv/files
parentmedia-video/mpv: make message less scary in ffmpeg patch (diff)
downloadgentoo-e535b39b9315f9b53459b5c993b0047b4c69a793.tar.gz
gentoo-e535b39b9315f9b53459b5c993b0047b4c69a793.tar.bz2
gentoo-e535b39b9315f9b53459b5c993b0047b4c69a793.zip
media-video/mpv: verbump to 0.24.0
Also backport upstream commit to fix build w/o GL. Upstream-commit: https://github.com/mpv-player/mpv/commit/212f6c8206bd4dcc7d8970c5f1632823ae4e783a Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'media-video/mpv/files')
-rw-r--r--media-video/mpv/files/0.24.0/mpv-fix-build-without-gl.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/media-video/mpv/files/0.24.0/mpv-fix-build-without-gl.patch b/media-video/mpv/files/0.24.0/mpv-fix-build-without-gl.patch
new file mode 100644
index 000000000000..ed1756205391
--- /dev/null
+++ b/media-video/mpv/files/0.24.0/mpv-fix-build-without-gl.patch
@@ -0,0 +1,32 @@
+commit 212f6c8206bd4dcc7d8970c5f1632823ae4e783a
+Author: Michael Forney <mforney@mforney.org>
+Date: Sun Feb 12 23:01:21 2017 -0800
+
+Fix build with HAVE_GL==0
+
+video/out/opengl/hwdec.h includes video/out/opengl/common.h, which tries
+to include opengl headers.
+
+diff --git a/options/options.c b/options/options.c
+index b711156c1..0bb36ad3f 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)