* commit '54e39b102e29adcc2f59f1eca85be5f86c89454b': configure: Explicitly spell out first require_pkg_config() parameter
Unified · Split
| @@ -1395,7 +1395,6 @@ use_pkg_config(){ · 1394 unmodified lines | |||
| 1395 | shift | 1395 | shift |
| 1396 | pkg_version="$1" | 1396 | pkg_version="$1" |
| 1397 | pkg="${1%% *}" | 1397 | pkg="${1%% *}" |
| 1398 | test "$name" = "" && name=$pkg | ||
| 1399 | check_pkg_config "$@" || return 1 | 1398 | check_pkg_config "$@" || return 1 |
| 1400 | add_cflags $(get_safe "${pkg}_cflags") | 1399 | add_cflags $(get_safe "${pkg}_cflags") |
| 1401 | add_extralibs $(get_safe "${pkg}_extralibs") | 1400 | add_extralibs $(get_safe "${pkg}_extralibs") |
| @@ -5709,7 +5708,7 @@ case "$custom_allocator" in · 4307 unmodified lines | |||
| 5709 | require libjemalloc jemalloc/jemalloc.h malloc -ljemalloc | 5708 | require libjemalloc jemalloc/jemalloc.h malloc -ljemalloc |
| 5710 | ;; | 5709 | ;; |
| 5711 | tcmalloc) | 5710 | tcmalloc) |
| 5712 | require_pkg_config "" libtcmalloc gperftools/tcmalloc.h tc_malloc | 5711 | require_pkg_config libtcmalloc libtcmalloc gperftools/tcmalloc.h tc_malloc |
| 5713 | malloc_prefix=tc_ | 5712 | malloc_prefix=tc_ |
| 5714 | ;; | 5713 | ;; |
| 5715 | esac | 5714 | esac |
| @@ -5909,19 +5908,19 @@ enabled decklink && { require_header DeckLinkAPI.h && · 193 unmodified lines | |||
| 5909 | enabled libndi_newtek && require_header Processing.NDI.Lib.h | 5908 | enabled libndi_newtek && require_header Processing.NDI.Lib.h |
| 5910 | enabled frei0r && require_header frei0r.h | 5909 | enabled frei0r && require_header frei0r.h |
| 5911 | enabled gmp && require gmp gmp.h mpz_export -lgmp | 5910 | enabled gmp && require gmp gmp.h mpz_export -lgmp |
| 5912 | enabled gnutls && require_pkg_config "" gnutls gnutls/gnutls.h gnutls_global_init | 5911 | enabled gnutls && require_pkg_config gnutls gnutls gnutls/gnutls.h gnutls_global_init |
| 5913 | enabled jni && { [ $target_os = "android" ] && check_header jni.h && enabled pthreads || die "ERROR: jni not found"; } | 5912 | enabled jni && { [ $target_os = "android" ] && check_header jni.h && enabled pthreads || die "ERROR: jni not found"; } |
| 5914 | enabled ladspa && require_header ladspa.h | 5913 | enabled ladspa && require_header ladspa.h |
| 5915 | enabled libiec61883 && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883 | 5914 | enabled libiec61883 && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883 |
| 5916 | enabled libass && require_pkg_config "" libass ass/ass.h ass_library_init | 5915 | enabled libass && require_pkg_config libass libass ass/ass.h ass_library_init |
| 5917 | enabled libbluray && require_pkg_config "" libbluray libbluray/bluray.h bd_open | 5916 | enabled libbluray && require_pkg_config libbluray libbluray libbluray/bluray.h bd_open |
| 5918 | enabled libbs2b && require_pkg_config "" libbs2b bs2b.h bs2b_open | 5917 | enabled libbs2b && require_pkg_config libbs2b libbs2b bs2b.h bs2b_open |
| 5919 | enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && | 5918 | enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && |
| 5920 | { check_lib libcelt celt/celt.h celt_decoder_create_custom -lcelt0 || | 5919 | { check_lib libcelt celt/celt.h celt_decoder_create_custom -lcelt0 || |
| 5921 | die "ERROR: libcelt must be installed and version must be >= 0.11.0."; } | 5920 | die "ERROR: libcelt must be installed and version must be >= 0.11.0."; } |
| 5922 | enabled libcaca && require_pkg_config libcaca caca caca.h caca_create_canvas | 5921 | enabled libcaca && require_pkg_config libcaca caca caca.h caca_create_canvas |
| 5923 | enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new | 5922 | enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new |
| 5924 | enabled libdrm && require_pkg_config "" libdrm xf86drm.h drmGetVersion | 5923 | enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion |
| 5925 | enabled libfdk_aac && { use_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || | 5924 | enabled libfdk_aac && { use_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || |
| 5926 | { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac && | 5925 | { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac && |
| 5927 | warn "using libfdk without pkg-config"; } } | 5926 | warn "using libfdk without pkg-config"; } } |
| @@ -5931,7 +5930,7 @@ enabled fontconfig && enable libfontconfig · 3 unmodified lines | |||
| 5931 | enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit | 5930 | enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit |
| 5932 | enabled libfreetype && require_pkg_config libfreetype2 freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType | 5931 | enabled libfreetype && require_pkg_config libfreetype2 freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType |
| 5933 | enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info | 5932 | enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info |
| 5934 | enabled libgme && { use_pkg_config "" libgme gme/gme.h gme_new_emu || | 5933 | enabled libgme && { use_pkg_config libgme libgme gme/gme.h gme_new_emu || |
| 5935 | require libgme gme/gme.h gme_new_emu -lgme -lstdc++; } | 5934 | require libgme gme/gme.h gme_new_emu -lgme -lstdc++; } |
| 5936 | enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do | 5935 | enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do |
| 5937 | check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break; | 5936 | check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break; |
| @@ -5944,9 +5943,9 @@ enabled libkvazaar && require_pkg_config libkvazaar "kvazaar >= 0.8.1" kv · 6 unmodified lines | |||
| 5944 | # Media SDK or Intel Media Server Studio, these don't come with | 5943 | # Media SDK or Intel Media Server Studio, these don't come with |
| 5945 | # pkg-config support. Instead, users should make sure that the build | 5944 | # pkg-config support. Instead, users should make sure that the build |
| 5946 | # can find the libraries and headers through other means. | 5945 | # can find the libraries and headers through other means. |
| 5947 | enabled libmfx && { use_pkg_config "" libmfx "mfx/mfxvideo.h" MFXInit || | 5946 | enabled libmfx && { use_pkg_config libmfx libmfx "mfx/mfxvideo.h" MFXInit || |
| 5948 | { require libmfx "mfx/mfxvideo.h" MFXInit -llibmfx && warn "using libmfx without pkg-config"; } } | 5947 | { require libmfx "mfx/mfxvideo.h" MFXInit -llibmfx && warn "using libmfx without pkg-config"; } } |
| 5949 | enabled libmodplug && require_pkg_config "" libmodplug libmodplug/modplug.h ModPlug_Load | 5948 | enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load |
| 5950 | enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame | 5949 | enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame |
| 5951 | enabled libmysofa && require libmysofa "mysofa.h" mysofa_load -lmysofa | 5950 | enabled libmysofa && require libmysofa "mysofa.h" mysofa_load -lmysofa |
| 5952 | enabled libnpp && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc || | 5951 | enabled libnpp && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc || |
| @@ -5976,25 +5975,25 @@ enabled libopus && { · 23 unmodified lines | |||
| 5976 | require_pkg_config libopus opus opus_multistream.h opus_multistream_surround_encoder_create | 5975 | require_pkg_config libopus opus opus_multistream.h opus_multistream_surround_encoder_create |
| 5977 | } | 5976 | } |
| 5978 | } | 5977 | } |
| 5979 | enabled libpulse && require_pkg_config "" libpulse pulse/pulseaudio.h pa_context_new | 5978 | enabled libpulse && require_pkg_config libpulse libpulse pulse/pulseaudio.h pa_context_new |
| 5980 | enabled librsvg && require_pkg_config librsvg librsvg-2.0 librsvg-2.0/librsvg/rsvg.h rsvg_handle_render_cairo | 5979 | enabled librsvg && require_pkg_config librsvg librsvg-2.0 librsvg-2.0/librsvg/rsvg.h rsvg_handle_render_cairo |
| 5981 | enabled librtmp && require_pkg_config "" librtmp librtmp/rtmp.h RTMP_Socket | 5980 | enabled librtmp && require_pkg_config librtmp librtmp librtmp/rtmp.h RTMP_Socket |
| 5982 | enabled librubberband && require_pkg_config librubberband "rubberband >= 1.8.1" rubberband/rubberband-c.h rubberband_new | 5981 | enabled librubberband && require_pkg_config librubberband "rubberband >= 1.8.1" rubberband/rubberband-c.h rubberband_new |
| 5983 | enabled libshine && require_pkg_config libshine shine shine/layer3.h shine_encode_buffer | 5982 | enabled libshine && require_pkg_config libshine shine shine/layer3.h shine_encode_buffer |
| 5984 | enabled libsmbclient && { use_pkg_config libsmbclient smbclient libsmbclient.h smbc_init || | 5983 | enabled libsmbclient && { use_pkg_config libsmbclient smbclient libsmbclient.h smbc_init || |
| 5985 | require smbclient libsmbclient.h smbc_init -lsmbclient; } | 5984 | require smbclient libsmbclient.h smbc_init -lsmbclient; } |
| 5986 | enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy | 5985 | enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy |
| 5987 | enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr && LIBSOXR="-lsoxr" | 5986 | enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr && LIBSOXR="-lsoxr" |
| 5988 | enabled libssh && require_pkg_config "" libssh libssh/sftp.h sftp_init | 5987 | enabled libssh && require_pkg_config libssh libssh libssh/sftp.h sftp_init |
| 5989 | enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init -lspeex | 5988 | enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init -lspeex |
| 5990 | enabled libtesseract && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate | 5989 | enabled libtesseract && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate |
| 5991 | enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg | 5990 | enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg |
| 5992 | enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame && | 5991 | enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame && |
| 5993 | { check_lib libtwolame twolame.h twolame_encode_buffer_float32_interleaved -ltwolame || | 5992 | { check_lib libtwolame twolame.h twolame_encode_buffer_float32_interleaved -ltwolame || |
| 5994 | die "ERROR: libtwolame must be installed and version must be >= 0.3.10"; } | 5993 | die "ERROR: libtwolame must be installed and version must be >= 0.3.10"; } |
| 5995 | enabled libv4l2 && require_pkg_config "" libv4l2 libv4l2.h v4l2_ioctl | 5994 | enabled libv4l2 && require_pkg_config libv4l2 libv4l2 libv4l2.h v4l2_ioctl |
| 5996 | enabled libvidstab && require_pkg_config libvidstab "vidstab >= 0.98" vid.stab/libvidstab.h vsMotionDetectInit | 5995 | enabled libvidstab && require_pkg_config libvidstab "vidstab >= 0.98" vid.stab/libvidstab.h vsMotionDetectInit |
| 5997 | enabled libvmaf && require_pkg_config "" libvmaf libvmaf.h compute_vmaf | 5996 | enabled libvmaf && require_pkg_config libvmaf libvmaf libvmaf.h compute_vmaf |
| 5998 | enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc | 5997 | enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc |
| 5999 | enabled libvorbis && require_pkg_config libvorbis vorbis vorbis/codec.h vorbis_info_init && | 5998 | enabled libvorbis && require_pkg_config libvorbis vorbis vorbis/codec.h vorbis_info_init && |
| 6000 | require_pkg_config libvorbisenc vorbisenc vorbis/vorbisenc.h vorbis_encode_init | 5999 | require_pkg_config libvorbisenc vorbisenc vorbis/vorbisenc.h vorbis_encode_init |
| @@ -6038,7 +6037,7 @@ enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get · 37 unmodified lines | |||
| 6038 | enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode -lxavs | 6037 | enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode -lxavs |
| 6039 | enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore | 6038 | enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore |
| 6040 | enabled libzimg && require_pkg_config libzimg "zimg >= 2.3.0" zimg.h zimg_get_api_version | 6039 | enabled libzimg && require_pkg_config libzimg "zimg >= 2.3.0" zimg.h zimg_get_api_version |
| 6041 | enabled libzmq && require_pkg_config "" libzmq zmq.h zmq_ctx_new | 6040 | enabled libzmq && require_pkg_config libzmq libzmq zmq.h zmq_ctx_new |
| 6042 | enabled libzvbi && require libzvbi libzvbi.h vbi_decoder_new -lzvbi && | 6041 | enabled libzvbi && require libzvbi libzvbi.h vbi_decoder_new -lzvbi && |
| 6043 | { check_cpp_condition libzvbi.h "VBI_VERSION_MAJOR > 0 || VBI_VERSION_MINOR > 2 || VBI_VERSION_MINOR == 2 && VBI_VERSION_MICRO >= 28" || | 6042 | { check_cpp_condition libzvbi.h "VBI_VERSION_MAJOR > 0 || VBI_VERSION_MINOR > 2 || VBI_VERSION_MINOR == 2 && VBI_VERSION_MICRO >= 28" || |
| 6044 | enabled gpl || die "ERROR: libzvbi requires version 0.2.28 or --enable-gpl."; } | 6043 | enabled gpl || die "ERROR: libzvbi requires version 0.2.28 or --enable-gpl."; } |
| @@ -6072,8 +6071,8 @@ enabled omx_rpi && { check_header OMX_Core.h || · 27 unmodified lines | |||
| 6072 | { ! enabled cross_compile && add_cflags -isystem/opt/vc/include/IL && check_header OMX_Core.h ; } || | 6071 | { ! enabled cross_compile && add_cflags -isystem/opt/vc/include/IL && check_header OMX_Core.h ; } || |
| 6073 | die "ERROR: OpenMAX IL headers not found"; } | 6072 | die "ERROR: OpenMAX IL headers not found"; } |
| 6074 | enabled omx && require_header OMX_Core.h | 6073 | enabled omx && require_header OMX_Core.h |
| 6075 | enabled openssl && { use_pkg_config "" openssl openssl/ssl.h OPENSSL_init_ssl || | 6074 | enabled openssl && { use_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl || |
| 6076 | use_pkg_config "" openssl openssl/ssl.h SSL_library_init || | 6075 | use_pkg_config openssl openssl openssl/ssl.h SSL_library_init || |
| 6077 | check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto || | 6076 | check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto || |
| 6078 | check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 || | 6077 | check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 || |
| 6079 | check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 || | 6078 | check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 || |