History

Merge commit 'ace87c19ed4c4882d7b9b3ce512c4c195e39a203'

* commit 'ace87c19ed4c4882d7b9b3ce512c4c195e39a203': configure: whitespace cosmetics Conflicts: configure

Michael Niedermayer committed 13 years ago

Commit 14a61bc2 parents 1152863 ace87c11 file · +113 −104Browse files

Unified · Split

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

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t