| Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame] | 1 | Upstream-status: Pending |
| 2 | |
| 3 | --- a/configure |
| 4 | +++ b/configure |
| 5 | @@ -6467,11 +6467,9 @@ enabled mbedtls && { check_pkg |
| 6 | die "ERROR: mbedTLS not found"; } |
| 7 | enabled mediacodec && { enabled jni || die "ERROR: mediacodec requires --enable-jni"; } |
| 8 | ( enabled rpi || |
| 9 | - enabled mmal ) && { check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host || |
| 10 | - { ! enabled cross_compile && |
| 11 | - add_cflags -isystem/opt/vc/include/ -isystem/opt/vc/include/interface/vmcs_host/linux -isystem/opt/vc/include/interface/vcos/pthreads -fgnu89-inline && |
| 12 | - add_ldflags -L/opt/vc/lib/ && |
| 13 | - check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host -lvcos -lvcsm -lvchostif -lvchiq_arm; } || |
| 14 | + 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 && |
| 15 | + add_ldflags -L/opt/vc/lib/ && |
| 16 | + check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host -lvcsm -lvchostif -lvchiq_arm -lvcos; } || |
| 17 | die "ERROR: mmal not found" && |
| 18 | check_func_headers interface/mmal/mmal.h "MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"; } |
| 19 | enabled openal && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal" "-lOpenAL32"; do |