diff options
| author |  wm4 <wm4@nowhere> | 2015-09-25 16:02:15 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-09-25 16:02:15 +0200 |
| commit | d2281935b36b8fe80824b92e6238dc5e4b4e315a (patch) | |
| tree | 0feb8c401d266406771df7d430ad7feb67f86a8c | |
| parent | 0a6c334b592d4fd5e61addb9ba28b1182aecb6d9 (diff) | |
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.
| -rw-r--r-- | video/out/opengl/rpi.h | 4 | ||||
| -rw-r--r-- | 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 <bcm_host.h> -#include <EGL/egl.h> -#include <EGL/eglext.h> + +#include "common.h" struct mp_egl_rpi { struct mp_log *log; @@ -613,11 +613,6 @@ video_output_features = [ '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', 'deps': [ 'wayland' ], @@ -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, } ] |