From 59e651c0524450e2acb0cfb2838cd989e806899b Mon Sep 17 00:00:00 2001 From: Aman Gupta Date: Thu, 29 Aug 2019 08:44:45 -0700 Subject: configure: fix --enable-omx compile on raspberry pi Many ffmpeg + rpi compilation guides on the internet recommend using `./configure --enable-omx --enable-omx-rpi`. This fails to find the IL OMX headers on device because the omx require_headers check happens first before the add_cflags in omx_rpi. A workaround is to use `./configure --enable-omx-rpi` only, since omx_rpi already implies omx. But because many users expect to use existing scripts and commands, we swap the order here so omx_rpi special cases are applied first. In the past this wasn't an issue because users noticed the OMX_Core.h missing error and installed libomxil-bellagio-dev. But since 76c82843ccad1, the rpi specific headers from /opt/vc/include/IL are required. Signed-off-by: Aman Gupta --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 51dc77c..691ae9b 100755 --- a/configure +++ b/configure @@ -6358,10 +6358,10 @@ 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 && require_headers OMX_Core.h 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 && 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 || check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto || -- cgit v1.1