| Upstream-status: Pending |
| |
| --- a/configure |
| +++ b/configure |
| @@ -6467,11 +6467,9 @@ enabled mbedtls && { check_pkg |
| die "ERROR: mbedTLS not found"; } |
| enabled mediacodec && { enabled jni || die "ERROR: mediacodec requires --enable-jni"; } |
| ( enabled rpi || |
| - enabled mmal ) && { check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host || |
| - { ! enabled cross_compile && |
| - add_cflags -isystem/opt/vc/include/ -isystem/opt/vc/include/interface/vmcs_host/linux -isystem/opt/vc/include/interface/vcos/pthreads -fgnu89-inline && |
| - add_ldflags -L/opt/vc/lib/ && |
| - check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host -lvcos -lvcsm -lvchostif -lvchiq_arm; } || |
| + enabled mmal ) && { { add_cflags -isystem/opt/vc/include/ -isystem/opt/vc/include/interface/vmcs_host/linux -isystem/opt/vc/include/interface/vcos/pthreads -fgnu89-inline && |
| + add_ldflags -L/opt/vc/lib/ && |
| + check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host -lvcsm -lvchostif -lvchiq_arm -lvcos; } || |
| die "ERROR: mmal not found" && |
| check_func_headers interface/mmal/mmal.h "MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"; } |
| enabled openal && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal" "-lOpenAL32"; do |