ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Thu Oct 12 17:44:06 2017 -0300| [583003670f2425a0f102aff3493f77693c44f5f6] | committer: James Almer
Merge commit '003124ebf4a05f1347c74104216887ddd2e5aad4' * commit '003124ebf4a05f1347c74104216887ddd2e5aad4': build: Fix logic of clock_gettime() check Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=583003670f2425a0f102aff3493f77693c44f5f6 --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index a44519e178..ade67a31bb 100755 --- a/configure +++ b/configure @@ -3341,7 +3341,7 @@ avformat_deps="avcodec avutil" avformat_suggest="libm network" avresample_deps="avutil" avresample_suggest="libm" -avutil_suggest="libm libdrm libmfx opencl user32 vaapi videotoolbox wincrypt" +avutil_suggest="clock_gettime libm libdrm libmfx opencl user32 vaapi videotoolbox wincrypt" postproc_deps="avutil gpl" postproc_suggest="libm" swresample_deps="avutil" @@ -3351,7 +3351,7 @@ swscale_suggest="libm" avcodec_extralibs="pthreads_extralibs iconv_extralibs" avfilter_extralibs="pthreads_extralibs" -avutil_extralibs="clock_gettime_extralibs nanosleep_extralibs pthreads_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs" +avutil_extralibs="nanosleep_extralibs pthreads_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs" # programs ffmpeg_deps="avcodec avfilter avformat swresample" @@ -5773,7 +5773,7 @@ check_func ${malloc_prefix}posix_memalign && enable posix_memalign check_func access check_func_headers stdlib.h arc4random -check_func_headers time.h clock_gettime || check_lib clock_gettime time.h clock_gettime -lrt +check_lib clock_gettime time.h clock_gettime || check_lib clock_gettime time.h clock_gettime -lrt check_func fcntl check_func fork check_func gethrtime ====================================================================== diff --cc configure index a44519e178,a8e3926b70..ade67a31bb --- a/configure +++ b/configure @@@ -3331,49 -2511,37 +3331,49 @@@ cws2fws_extralibs="zlib_extralibs # libraries, in linking order avcodec_deps="avutil" +avcodec_suggest="libm" avcodec_select="null_bsf" avdevice_deps="avformat avcodec avutil" +avdevice_suggest="libm" avfilter_deps="avutil" +avfilter_suggest="libm" avformat_deps="avcodec avutil" -avformat_suggest="network" +avformat_suggest="libm network" avresample_deps="avutil" +avresample_suggest="libm" - avutil_suggest="libm libdrm libmfx opencl user32 vaapi videotoolbox wincrypt" ++avutil_suggest="clock_gettime libm libdrm libmfx opencl user32 vaapi videotoolbox wincrypt" +postproc_deps="avutil gpl" +postproc_suggest="libm" +swresample_deps="avutil" +swresample_suggest="libm libsoxr" swscale_deps="avutil" +swscale_suggest="libm" -avcodec_extralibs="pthreads_extralibs libm_extralibs" -avdevice_extralibs="libm_extralibs" -avformat_extralibs="libm_extralibs" -avfilter_extralibs="pthreads_extralibs libm_extralibs" -avresample_extralibs="libm_extralibs" -avutil_extralibs="clock_gettime_extralibs cuda_extralibs libm_extralibs libmfx_extralibs nanosleep_extralibs pthreads_extralibs user32_extralibs vaapi_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs wincrypt_extralibs" -swscale_extralibs="libm_extralibs" +avcodec_extralibs="pthreads_extralibs iconv_extralibs" +avfilter_extralibs="pthreads_extralibs" - avutil_extralibs="clock_gettime_extralibs nanosleep_extralibs pthreads_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs" ++avutil_extralibs="nanosleep_extralibs pthreads_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs" # programs -avconv_deps="avcodec avfilter avformat avresample swscale" -avconv_select="aformat_filter anull_filter asyncts_filter atrim_filter format_filter - fps_filter null_filter resample_filter scale_filter +ffmpeg_deps="avcodec avfilter avformat swresample" +ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter + null_filter trim_filter" -avconv_suggest="dxva2_lib ole32 psapi shell32" -avplay_deps="avcodec avfilter avformat avresample sdl" -avplay_select="rdft format_filter transpose_filter hflip_filter vflip_filter" -avplay_suggest="shell32" -avprobe_deps="avcodec avformat" -avprobe_suggest="shell32" +ffmpeg_suggest="ole32 psapi shell32" +ffplay_deps="avcodec avformat swscale swresample sdl2" +ffplay_select="rdft crop_filter transpose_filter hflip_filter vflip_filter rotate_filter" +ffplay_suggest="shell32" +ffprobe_deps="avcodec avformat" +ffprobe_suggest="shell32" +ffserver_deps="avformat fork sarestart" +ffserver_select="ffm_muxer rtp_protocol rtsp_demuxer" # documentation -pod2man_deps="doc" -texi2html_deps="doc" +podpages_deps="perl" +manpages_deps="perl pod2man" +htmlpages_deps="perl" +htmlpages_deps_any="makeinfo_html texi2html" +txtpages_deps="perl makeinfo" +doc_deps_any="manpages htmlpages podpages txtpages" # default parameters @@@ -5771,9 -4571,10 +5771,9 @@@ check_func_headers malloc.h _aligned_ma check_func ${malloc_prefix}memalign && enable memalign check_func ${malloc_prefix}posix_memalign && enable posix_memalign -check_cpp_condition unistd.h "defined(_POSIX_MONOTONIC_CLOCK)" && - { check_lib clock_gettime time.h clock_gettime || - check_lib clock_gettime time.h clock_gettime -lrt; } - +check_func access +check_func_headers stdlib.h arc4random - check_func_headers time.h clock_gettime || check_lib clock_gettime time.h clock_gettime -lrt ++check_lib clock_gettime time.h clock_gettime || check_lib clock_gettime time.h clock_gettime -lrt check_func fcntl check_func fork check_func gethrtime _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
