From 72a8120daac8136b8db7c720621bbe09e43cfe6c Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 15 Aug 2017 18:41:16 +0200 Subject: Revert "build: rpi: rely on pkgconfig for compiler flags" This reverts commit ea40fa36eef15384b4c0218fb102f92f5cd1cdff. This caused strange runtime failure on Raspbian (when running mpv, vc_dispmanx_display_open() returned 0, while other dispmanx using programs were fine). The problem must have been something about the compiler flags, maybe linking order or set of include paths. --- wscript | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index feb20851a3..2fb995041f 100644 --- a/wscript +++ b/wscript @@ -721,9 +721,29 @@ video_output_features = [ 'deps': [ 'win32-desktop' ], 'func': check_cc(header_name='d3d9.h'), }, { + 'name': '--android', + 'desc': 'Android support', + 'func': check_statement('android/api-level.h', '(void)__ANDROID__'), # arbitrary android-specific header + }, { + # We need MMAL/bcm_host/dispmanx APIs. Also, most RPI distros require + # every project to hardcode the paths to the include directories. Also, + # these headers are so broken that they spam tons of warnings by merely + # including them (compensate with -isystem and -fgnu89-inline). 'name': '--rpi', 'desc': 'Raspberry Pi support', - 'func': check_rpi, + 'func': compose_checks( + check_cc(cflags="-isystem/opt/vc/include/ "+ + "-isystem/opt/vc/include/interface/vcos/pthreads " + + "-isystem/opt/vc/include/interface/vmcs_host/linux " + + "-fgnu89-inline", + linkflags="-L/opt/vc/lib", + header_name="bcm_host.h", + lib=['mmal_core', 'mmal_util', 'mmal_vc_client', 'bcm_host']), + # We still need all OpenGL symbols, because the vo_opengl code is + # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core. + check_cc(lib="EGL"), + check_cc(lib="GLESv2"), + ), } , { 'name': '--ios-gl', 'desc': 'iOS OpenGL ES hardware decoding interop support', -- cgit v1.2.3