* commit 'ace87c19ed4c4882d7b9b3ce512c4c195e39a203': configure: whitespace cosmetics Conflicts: configure
Unified · Split
| @@ -2685,7 +2685,7 @@ msvc_flags(){ · 2684 unmodified lines | ||
| 2685 | 2685 | msvc_common_flags "$@" |
| 2686 | 2686 | for flag; do |
| 2687 | 2687 | case $flag in |
| 2688 | − -Wall) echo -W4 -wd4244 -wd4127 -wd4018 -wd4389 \ | |
| 2688 | + -Wall) echo -W4 -wd4244 -wd4127 -wd4018 -wd4389 \ | |
| 2689 | 2689 | -wd4146 -wd4057 -wd4204 -wd4706 -wd4305 \ |
| 2690 | 2690 | -wd4152 -wd4324 -we4013 -wd4100 -wd4214 \ |
| 2691 | 2691 | -wd4554 \ |
| @@ -2736,12 +2736,12 @@ suncc_flags(){ · 44 unmodified lines | ||
| 2736 | 2736 | core2) echo -xarch=ssse3 -xchip=core2 ;; |
| 2737 | 2737 | corei7) echo -xarch=sse4_2 -xchip=nehalem ;; |
| 2738 | 2738 | corei7-avx) echo -xarch=avx -xchip=sandybridge ;; |
| 2739 | − amdfam10|barcelona) echo -xtarget=barcelona ;; | |
| 2740 | − bdver*) echo -xarch=avx ;; | |
| 2741 | − athlon-4|athlon-[mx]p) echo -xarch=ssea ;; | |
| 2739 | + amdfam10|barcelona) echo -xtarget=barcelona ;; | |
| 2740 | + bdver*) echo -xarch=avx ;; | |
| 2741 | + athlon-4|athlon-[mx]p) echo -xarch=ssea ;; | |
| 2742 | 2742 | k8|opteron|athlon64|athlon-fx) |
| 2743 | − echo -xarch=sse2a ;; | |
| 2744 | − athlon*) echo -xarch=pentium_proa ;; | |
| 2743 | + echo -xarch=sse2a ;; | |
| 2744 | + athlon*) echo -xarch=pentium_proa ;; | |
| 2745 | 2745 | esac |
| 2746 | 2746 | ;; |
| 2747 | 2747 | -std=c99) echo -xc99 ;; |
| @@ -2901,7 +2901,8 @@ probe_cc(){ · 153 unmodified lines | ||
| 2901 | 2901 | _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs' |
| 2902 | 2902 | _cflags_speed="-O2" |
| 2903 | 2903 | _cflags_size="-O1" |
| 2904 | − # Nonstandard output options, to avoid msys path conversion issues, relies on wrapper to remap it | |
| 2904 | + # Nonstandard output options, to avoid msys path conversion issues. | |
| 2905 | + # Relies on wrapper to remap it. | |
| 2905 | 2906 | if $_cc 2>&1 | grep -q Linker; then |
| 2906 | 2907 | _ld_o='-out $@' |
| 2907 | 2908 | else |
| @@ -2922,10 +2923,12 @@ probe_cc(){ · 14 unmodified lines | ||
| 2922 | 2923 | _type=icl |
| 2923 | 2924 | _ident=$($cc 2>&1 | head -n1) |
| 2924 | 2925 | _depflags='-QMMD -QMF$(@:.o=.d) -QMT$@' |
| 2925 | − # Not only is O3 broken on 13.x+ but it's slower on all previous versions (tested) as well | |
| 2926 | + # Not only is O3 broken on 13.x+ but it is slower on all previous | |
| 2927 | + # versions (tested) as well. | |
| 2926 | 2928 | _cflags_speed="-O2" |
| 2927 | 2929 | _cflags_size="-O1 -Oi" # -O1 without -Oi miscompiles stuff |
| 2928 | − # Nonstandard output options, to avoid msys path conversion issues, relies on wrapper to remap it | |
| 2930 | + # Nonstandard output options, to avoid msys path conversion issues. | |
| 2931 | + # Relies on wrapper to remap it. | |
| 2929 | 2932 | if $_cc 2>&1 | grep -q Linker; then |
| 2930 | 2933 | _ld_o='-out $@' |
| 2931 | 2934 | else |
| @@ -2936,9 +2939,10 @@ probe_cc(){ · 4 unmodified lines | ||
| 2936 | 2939 | _flags_filter=icl_flags |
| 2937 | 2940 | _ld_lib='lib%.a' |
| 2938 | 2941 | _ld_path='-libpath:' |
| 2939 | − # -Qdiag-error to make icl error when presented with certain unknown arguments | |
| 2942 | + # -Qdiag-error to make icl error when seeing certain unknown arguments | |
| 2940 | 2943 | _flags='-nologo -Qdiag-error:4044,10157' |
| 2941 | − # -Qvec- -Qsimd- to prevent miscompilation, -GS for consistency with msvc which enables it by default | |
| 2944 | + # -Qvec- -Qsimd- to prevent miscompilation, -GS for consistency | |
| 2945 | + # with MSVC which enables it by default. | |
| 2942 | 2946 | _cflags='-D_USE_MATH_DEFINES -FIstdlib.h -Dstrtoll=_strtoi64 -Qms0 -Qvec- -Qsimd- -GS' |
| 2943 | 2947 | if [ $pfx = hostcc ]; then |
| 2944 | 2948 | append _cflags -Dsnprintf=_snprintf |
| @@ -3040,7 +3044,8 @@ if test -n "$sysroot"; then · 95 unmodified lines | ||
| 3040 | 3044 | fi |
| 3041 | 3045 | |
| 3042 | 3046 | if test "$cpu" = host; then |
| 3043 | − enabled cross_compile && die "--cpu=host makes no sense when cross-compiling." | |
| 3047 | + enabled cross_compile && | |
| 3048 | + die "--cpu=host makes no sense when cross-compiling." | |
| 3044 | 3049 | |
| 3045 | 3050 | case "$cc_type" in |
| 3046 | 3051 | gcc|llvm_gcc) |
| @@ -3056,7 +3061,8 @@ if test "$cpu" = host; then · 9 unmodified lines | ||
| 3056 | 3061 | ;; |
| 3057 | 3062 | esac |
| 3058 | 3063 | |
| 3059 | − test "${cpu:-host}" = host && die "--cpu=host not supported with compiler $cc" | |
| 3064 | + test "${cpu:-host}" = host && | |
| 3065 | + die "--cpu=host not supported with compiler $cc" | |
| 3060 | 3066 | fi |
| 3061 | 3067 | |
| 3062 | 3068 | # Deal with common $arch aliases |
| @@ -3402,7 +3408,9 @@ case $target_os in · 339 unmodified lines | ||
| 3402 | 3408 | # the Solaris assembler. As our libraries contain their own |
| 3403 | 3409 | # guards for processor-specific code, instead suppress |
| 3404 | 3410 | # generation of the HWCAPS ELF section on Solaris x86 only. |
| 3405 | − enabled_all suncc x86 && echo "hwcap_1 = OVERRIDE;" > mapfile && add_ldflags -Wl,-M,mapfile | |
| 3411 | + enabled_all suncc x86 && | |
| 3412 | + echo "hwcap_1 = OVERRIDE;" > mapfile && | |
| 3413 | + add_ldflags -Wl,-M,mapfile | |
| 3406 | 3414 | nm_default='nm -P -g' |
| 3407 | 3415 | ;; |
| 3408 | 3416 | netbsd) |
| @@ -3486,8 +3494,7 @@ case $target_os in · 77 unmodified lines | ||
| 3486 | 3494 | # Link to the import library instead of the normal static library |
| 3487 | 3495 | # for shared libs. |
| 3488 | 3496 | LD_LIB='%.lib' |
| 3489 | − # Cannot build shared and static libraries at the same time with | |
| 3490 | − # MSVC. | |
| 3497 | + # Cannot build shared and static libs at the same time with MSVC. | |
| 3491 | 3498 | disable static |
| 3492 | 3499 | fi |
| 3493 | 3500 | shlibdir_default="$bindir_default" |
| @@ -4103,88 +4110,88 @@ for func in $MATH_FUNCS; do · 609 unmodified lines | ||
| 4103 | 4110 | done |
| 4104 | 4111 | |
| 4105 | 4112 | # these are off by default, so fail if requested and not available |
| 4106 | −enabled avisynth && { { check_lib2 "windows.h" LoadLibrary; } || | |
| 4107 | − { check_lib2 "dlfcn.h" dlopen -ldl; } || | |
| 4108 | − die "ERROR: LoadLibrary/dlopen not found for avisynth"; } | |
| 4109 | −enabled fontconfig && require_pkg_config fontconfig "fontconfig/fontconfig.h" FcInit | |
| 4110 | −enabled frei0r && { check_header frei0r.h || die "ERROR: frei0r.h header not found"; } | |
| 4111 | −enabled gnutls && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init | |
| 4112 | −enabled libiec61883 && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883 | |
| 4113 | −enabled libaacplus && require "libaacplus >= 2.0.0" aacplus.h aacplusEncOpen -laacplus | |
| 4114 | −enabled libass && require_pkg_config libass ass/ass.h ass_library_init | |
| 4115 | −enabled libbluray && require libbluray libbluray/bluray.h bd_open -lbluray | |
| 4116 | −enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && | |
| 4117 | − { check_lib celt/celt.h celt_decoder_create_custom -lcelt0 || | |
| 4118 | − die "ERROR: libcelt must be installed and version must be >= 0.11.0."; } | |
| 4119 | −enabled libcaca && require_pkg_config caca caca.h caca_create_canvas | |
| 4120 | −enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac | |
| 4121 | −enabled libfdk_aac && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac | |
| 4113 | +enabled avisynth && { { check_lib2 "windows.h" LoadLibrary; } || | |
| 4114 | + { check_lib2 "dlfcn.h" dlopen -ldl; } || | |
| 4115 | + die "ERROR: LoadLibrary/dlopen not found for avisynth"; } | |
| 4116 | +enabled fontconfig && require_pkg_config fontconfig "fontconfig/fontconfig.h" FcInit | |
| 4117 | +enabled frei0r && { check_header frei0r.h || die "ERROR: frei0r.h header not found"; } | |
| 4118 | +enabled gnutls && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init | |
| 4119 | +enabled libiec61883 && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883 | |
| 4120 | +enabled libaacplus && require "libaacplus >= 2.0.0" aacplus.h aacplusEncOpen -laacplus | |
| 4121 | +enabled libass && require_pkg_config libass ass/ass.h ass_library_init | |
| 4122 | +enabled libbluray && require libbluray libbluray/bluray.h bd_open -lbluray | |
| 4123 | +enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && | |
| 4124 | + { check_lib celt/celt.h celt_decoder_create_custom -lcelt0 || | |
| 4125 | + die "ERROR: libcelt must be installed and version must be >= 0.11.0."; } | |
| 4126 | +enabled libcaca && require_pkg_config caca caca.h caca_create_canvas | |
| 4127 | +enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac | |
| 4128 | +enabled libfdk_aac && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac | |
| 4122 | 4129 | flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite" |
| 4123 | −enabled libflite && require2 libflite "flite/flite.h" flite_init $flite_libs | |
| 4124 | −enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType | |
| 4125 | −enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do | |
| 4126 | − check_lib "${gsm_hdr}" gsm_create -lgsm && break; | |
| 4127 | − done || die "ERROR: libgsm not found"; } | |
| 4128 | −enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc | |
| 4129 | −enabled libmodplug && require libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug | |
| 4130 | −enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame | |
| 4131 | −enabled libnut && require libnut libnut.h nut_demuxer_init -lnut | |
| 4132 | −enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb | |
| 4133 | −enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb | |
| 4134 | −enabled libopencv && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader | |
| 4135 | −enabled libopenjpeg && { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg || | |
| 4136 | − check_lib openjpeg.h opj_version -lopenjpeg || | |
| 4137 | − die "ERROR: libopenjpeg not found"; } | |
| 4138 | −enabled libopus && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create | |
| 4139 | −enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new | |
| 4140 | −enabled libquvi && require_pkg_config libquvi quvi/quvi.h quvi_init | |
| 4141 | −enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket | |
| 4142 | −enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init | |
| 4143 | −enabled libshine && require_pkg_config shine shine/layer3.h shine_encode_frame | |
| 4144 | −enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr | |
| 4145 | −enabled libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex | |
| 4146 | −enabled libstagefright_h264 && require_cpp libstagefright_h264 "binder/ProcessState.h media/stagefright/MetaData.h | |
| 4130 | +enabled libflite && require2 libflite "flite/flite.h" flite_init $flite_libs | |
| 4131 | +enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType | |
| 4132 | +enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do | |
| 4133 | + check_lib "${gsm_hdr}" gsm_create -lgsm && break; | |
| 4134 | + done || die "ERROR: libgsm not found"; } | |
| 4135 | +enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc | |
| 4136 | +enabled libmodplug && require libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug | |
| 4137 | +enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame | |
| 4138 | +enabled libnut && require libnut libnut.h nut_demuxer_init -lnut | |
| 4139 | +enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb | |
| 4140 | +enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb | |
| 4141 | +enabled libopencv && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader | |
| 4142 | +enabled libopenjpeg && { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg || | |
| 4143 | + check_lib openjpeg.h opj_version -lopenjpeg || | |
| 4144 | + die "ERROR: libopenjpeg not found"; } | |
| 4145 | +enabled libopus && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create | |
| 4146 | +enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new | |
| 4147 | +enabled libquvi && require_pkg_config libquvi quvi/quvi.h quvi_init | |
| 4148 | +enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket | |
| 4149 | +enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init | |
| 4150 | +enabled libshine && require_pkg_config shine shine/layer3.h shine_encode_frame | |
| 4151 | +enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr | |
| 4152 | +enabled libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex | |
| 4153 | +enabled libstagefright_h264 && require_cpp libstagefright_h264 "binder/ProcessState.h media/stagefright/MetaData.h | |
| 4147 | 4154 | media/stagefright/MediaBufferGroup.h media/stagefright/MediaDebug.h media/stagefright/MediaDefs.h |
| 4148 | 4155 | media/stagefright/OMXClient.h media/stagefright/OMXCodec.h" android::OMXClient -lstagefright -lmedia -lutils -lbinder -lgnustl_static |
| 4149 | −enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg | |
| 4150 | −enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame && | |
| 4151 | − { check_lib twolame.h twolame_encode_buffer_float32_interleaved -ltwolame || | |
| 4152 | − die "ERROR: libtwolame must be installed and version must be >= 0.3.10"; } | |
| 4153 | −enabled libutvideo && require_cpp utvideo "stdint.h stdlib.h utvideo/utvideo.h utvideo/Codec.h" 'CCodec*' -lutvideo -lstdc++ | |
| 4154 | −enabled libv4l2 && require_pkg_config libv4l2 libv4l2.h v4l2_ioctl | |
| 4155 | −enabled libvidstab && require_pkg_config vidstab vid.stab/libvidstab.h vsMotionDetectInit | |
| 4156 | −enabled libvo_aacenc && require libvo_aacenc vo-aacenc/voAAC.h voGetAACEncAPI -lvo-aacenc | |
| 4157 | −enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc | |
| 4158 | −enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg | |
| 4159 | −enabled libvpx && { | |
| 4156 | +enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg | |
| 4157 | +enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame && | |
| 4158 | + { check_lib twolame.h twolame_encode_buffer_float32_interleaved -ltwolame || | |
| 4159 | + die "ERROR: libtwolame must be installed and version must be >= 0.3.10"; } | |
| 4160 | +enabled libutvideo && require_cpp utvideo "stdint.h stdlib.h utvideo/utvideo.h utvideo/Codec.h" 'CCodec*' -lutvideo -lstdc++ | |
| 4161 | +enabled libv4l2 && require_pkg_config libv4l2 libv4l2.h v4l2_ioctl | |
| 4162 | +enabled libvidstab && require_pkg_config vidstab vid.stab/libvidstab.h vsMotionDetectInit | |
| 4163 | +enabled libvo_aacenc && require libvo_aacenc vo-aacenc/voAAC.h voGetAACEncAPI -lvo-aacenc | |
| 4164 | +enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc | |
| 4165 | +enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg | |
| 4166 | +enabled libvpx && { | |
| 4160 | 4167 | enabled libvpx_vp8_decoder && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_dec_init_ver -lvpx || |
| 4161 | − die "ERROR: libvpx decoder version must be >=0.9.1"; } | |
| 4168 | + die "ERROR: libvpx decoder version must be >=0.9.1"; } | |
| 4162 | 4169 | enabled libvpx_vp8_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VP8E_SET_MAX_INTRA_BITRATE_PCT" -lvpx || |
| 4163 | − die "ERROR: libvpx encoder version must be >=0.9.7"; } | |
| 4164 | − enabled libvpx_vp9_decoder && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx" -lvpx || disable libvpx_vp9_decoder; } | |
| 4170 | + die "ERROR: libvpx encoder version must be >=0.9.7"; } | |
| 4171 | + enabled libvpx_vp9_decoder && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx" -lvpx || disable libvpx_vp9_decoder; } | |
| 4165 | 4172 | enabled libvpx_vp9_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx" -lvpx || disable libvpx_vp9_encoder; } } |
| 4166 | −enabled libwavpack && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput -lwavpack | |
| 4167 | −enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 && | |
| 4168 | − { check_cpp_condition x264.h "X264_BUILD >= 118" || | |
| 4169 | − die "ERROR: libx264 must be installed and version must be >= 0.118."; } | |
| 4170 | −enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs | |
| 4171 | −enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore | |
| 4172 | −enabled libzmq && require_pkg_config libzmq zmq.h zmq_ctx_new | |
| 4173 | −enabled openal && { { for al_libs in "${OPENAL_LIBS}" "-lopenal" "-lOpenAL32"; do | |
| 4174 | − check_lib 'AL/al.h' alGetError "${al_libs}" && break; done } || | |
| 4175 | − die "ERROR: openal not found"; } && | |
| 4176 | − { check_cpp_condition "AL/al.h" "defined(AL_VERSION_1_1)" || | |
| 4177 | − die "ERROR: openal must be installed and version must be 1.1 or compatible"; } | |
| 4178 | −enabled opencl && { check_lib2 OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL || | |
| 4179 | − check_lib2 CL/cl.h clEnqueueNDRangeKernel -lOpenCL || | |
| 4180 | − die "ERROR: opencl not found"; } && | |
| 4181 | − { check_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" || | |
| 4182 | − check_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" || | |
| 4183 | − die "ERROR: opencl must be installed and version must be 1.2 or compatible"; } | |
| 4184 | −enabled openssl && { check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto || | |
| 4185 | − check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 || | |
| 4186 | − check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 || | |
| 4187 | − die "ERROR: openssl not found"; } | |
| 4173 | +enabled libwavpack && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput -lwavpack | |
| 4174 | +enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 && | |
| 4175 | + { check_cpp_condition x264.h "X264_BUILD >= 118" || | |
| 4176 | + die "ERROR: libx264 must be installed and version must be >= 0.118."; } | |
| 4177 | +enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs | |
| 4178 | +enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore | |
| 4179 | +enabled libzmq && require_pkg_config libzmq zmq.h zmq_ctx_new | |
| 4180 | +enabled openal && { { for al_libs in "${OPENAL_LIBS}" "-lopenal" "-lOpenAL32"; do | |
| 4181 | + check_lib 'AL/al.h' alGetError "${al_libs}" && break; done } || | |
| 4182 | + die "ERROR: openal not found"; } && | |
| 4183 | + { check_cpp_condition "AL/al.h" "defined(AL_VERSION_1_1)" || | |
| 4184 | + die "ERROR: openal must be installed and version must be 1.1 or compatible"; } | |
| 4185 | +enabled opencl && { check_lib2 OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL || | |
| 4186 | + check_lib2 CL/cl.h clEnqueueNDRangeKernel -lOpenCL || | |
| 4187 | + die "ERROR: opencl not found"; } && | |
| 4188 | + { check_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" || | |
| 4189 | + check_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" || | |
| 4190 | + die "ERROR: opencl must be installed and version must be 1.2 or compatible"; } | |
| 4191 | +enabled openssl && { check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto || | |
| 4192 | + check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 || | |
| 4193 | + check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 || | |
| 4194 | + die "ERROR: openssl not found"; } | |
| 4188 | 4195 | |
| 4189 | 4196 | if enabled gnutls; then |
| 4190 | 4197 | { check_lib nettle/bignum.h nettle_mpz_get_str_256 -lnettle -lhogweed -lgmp && enable nettle; } || |
| @@ -4257,7 +4264,8 @@ EOF · 66 unmodified lines | ||
| 4257 | 4264 | fi |
| 4258 | 4265 | check_header soundcard.h |
| 4259 | 4266 | |
| 4260 | −enabled_any alsa_indev alsa_outdev && check_lib2 alsa/asoundlib.h snd_pcm_htimestamp -lasound | |
| 4267 | +enabled_any alsa_indev alsa_outdev && | |
| 4268 | + check_lib2 alsa/asoundlib.h snd_pcm_htimestamp -lasound | |
| 4261 | 4269 | |
| 4262 | 4270 | enabled jack_indev && check_lib2 jack/jack.h jack_client_open -ljack && check_func sem_timedwait && |
| 4263 | 4271 | check_func jack_port_get_latency_range -ljack |
| @@ -4426,9 +4434,10 @@ elif enabled pathscale; then · 162 unmodified lines | ||
| 4426 | 4434 | elif enabled_any msvc icl; then |
| 4427 | 4435 | enabled x86_32 && disable aligned_stack |
| 4428 | 4436 | if enabled icl; then |
| 4429 | − # basically -fstrict-aliasing for icl that doesn't work (correctly) on 13.x+ | |
| 4437 | + # basically -fstrict-aliasing that does not work (correctly) on icl 13.x | |
| 4430 | 4438 | check_cpp_condition "windows.h" "__ICL < 1300" && add_cflags -Qansi-alias |
| 4431 | − # icl will pass the inline asm tests but inline asm is currently not supported (build will fail) | |
| 4439 | + # icl will pass the inline asm tests but inline asm is currently | |
| 4440 | + # not supported (build will fail) | |
| 4432 | 4441 | disable inline_asm |
| 4433 | 4442 | fi |
| 4434 | 4443 | fi |
| @@ -4843,15 +4852,15 @@ lavfi_libs=${lavfi_libs%, } · 408 unmodified lines | ||
| 4843 | 4852 | lavd_libs="libavformat${build_suffix} = $LIBAVFORMAT_VERSION" |
| 4844 | 4853 | enabled lavfi_indev && prepend lavd_libs "libavfilter${build_suffix} = $LIBAVFILTER_VERSION," |
| 4845 | 4854 | |
| 4846 | −pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBM" | |
| 4847 | −pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" | |
| 4848 | −pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec${build_suffix} = $LIBAVCODEC_VERSION" | |
| 4849 | −pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$lavd_libs" | |
| 4850 | −pkgconfig_generate libavfilter "FFmpeg audio/video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$lavfi_libs" | |
| 4851 | −pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" | |
| 4852 | −pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" | |
| 4853 | −pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" | |
| 4854 | −pkgconfig_generate libswresample "FFmpeg audio resampling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" | |
| 4855 | +pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBM" | |
| 4856 | +pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" | |
| 4857 | +pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec${build_suffix} = $LIBAVCODEC_VERSION" | |
| 4858 | +pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$lavd_libs" | |
| 4859 | +pkgconfig_generate libavfilter "FFmpeg audio/video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$lavfi_libs" | |
| 4860 | +pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" | |
| 4861 | +pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" | |
| 4862 | +pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" | |
| 4863 | +pkgconfig_generate libswresample "FFmpeg audio resampling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" | |
| 4855 | 4864 | |
| 4856 | 4865 | fix_ffmpeg_remote(){ |
| 4857 | 4866 | git_remote_from=$1 |