From d2281935b36b8fe80824b92e6238dc5e4b4e315a Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 25 Sep 2015 16:02:15 +0200 Subject: vo_rpi, wayland: fix build Broken by commit d47dff3f. If something is going to include EGL.h, header_fixes.h has to know. This definitely affected vo_rpi, and probably affects wayland builds (with x11egl didabled) as well. --- video/out/opengl/rpi.h | 4 ++-- wscript | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/video/out/opengl/rpi.h b/video/out/opengl/rpi.h index e00762b632..5ce893e9e3 100644 --- a/video/out/opengl/rpi.h +++ b/video/out/opengl/rpi.h @@ -1,6 +1,6 @@ #include -#include -#include + +#include "common.h" struct mp_egl_rpi { struct mp_log *log; diff --git a/wscript b/wscript index 2cc1965d92..8093ea396c 100644 --- a/wscript +++ b/wscript @@ -612,11 +612,6 @@ video_output_features = [ 'deps': [ 'x11', 'c11-tls' ], 'groups': [ 'gl' ], 'func': check_pkg_config('egl', 'gl'), - } , { - 'name': 'egl', - 'desc': 'EGL', - 'deps': [ 'egl-x11' ], - 'func': check_true, } , { 'name': '--gl-wayland', 'desc': 'OpenGL Wayland Backend', @@ -708,6 +703,11 @@ video_output_features = [ 'desc': 'OpenGL video outputs', 'deps_any': [ 'gl-cocoa', 'gl-x11', 'gl-win32', 'gl-wayland', 'rpi' ], 'func': check_true + } , { + 'name': 'egl', + 'desc': 'EGL', + 'deps_any': [ 'egl-x11', 'rpi' , 'gl-wayland' ], + 'func': check_true, } ] -- cgit v1.2.3