summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorAman Gupta <aman@tmm1.net>2019-09-02 21:04:42 +0100
committerAman Gupta <aman@tmm1.net>2019-09-03 10:58:24 -0700
commit7eb465e185a7939730e896625f99b6a616b36d61 (patch)
treecb845bc009afc7278291d11475c9a41bbe0812ae /configure
parente9cc873636abe4beeae957f2052f5445a33936bf (diff)
downloadffmpeg-streaming-7eb465e185a7939730e896625f99b6a616b36d61.zip
ffmpeg-streaming-7eb465e185a7939730e896625f99b6a616b36d61.tar.gz
configure: ensure --enable-omx-rpi uses rpi-specific IL headers
When compiling natively on an RPI where libomxil-bellagio-dev was also installed, `check_headers OMX_Core.h` succeeded and the -isystem compiler flag was never added to the build. For non-native builds, the error message now mentions the raspberrypi/firmware repository where the RPI specific headers are available. Signed-off-by: Aman Gupta <aman@tmm1.net>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure9
1 files changed, 6 insertions, 3 deletions
diff --git a/configure b/configure
index 4c77e1c..b5bff39 100755
--- a/configure
+++ b/configure
@@ -6362,9 +6362,12 @@ enabled opengl && { check_lib opengl GL/glx.h glXGetProcAddress "-lGL
check_lib opengl ES2/gl.h glGetError "-isysroot=${sysroot} -Wl,-framework,OpenGLES" ||
die "ERROR: opengl not found."
}
-enabled omx_rpi && { check_headers OMX_Core.h ||
- { ! enabled cross_compile && add_cflags -isystem/opt/vc/include/IL && check_headers OMX_Core.h ; } ||
- die "ERROR: OpenMAX IL headers not found"; } && enable omx
+enabled omx_rpi && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoRequestIFrame ||
+ { ! enabled cross_compile &&
+ add_cflags -isystem/opt/vc/include/IL &&
+ test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoRequestIFrame; } ||
+ die "ERROR: OpenMAX IL headers from raspberrypi/firmware not found"; } &&
+ enable omx
enabled omx && require_headers OMX_Core.h
enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
check_pkg_config openssl openssl openssl/ssl.h SSL_library_init ||
OpenPOWER on IntegriCloud