You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
47 lines
2.0 KiB
47 lines
2.0 KiB
--- a/configure
|
|
+++ b/configure
|
|
@@ -3791,20 +3791,20 @@ cws2fws_extralibs="zlib_extralibs"
|
|
|
|
# libraries, in any order
|
|
avcodec_deps="avutil"
|
|
-avcodec_suggest="libm"
|
|
+avcodec_suggest="libm stdatomic"
|
|
avdevice_deps="avformat avcodec avutil"
|
|
-avdevice_suggest="libm"
|
|
+avdevice_suggest="libm stdatomic"
|
|
avfilter_deps="avutil"
|
|
-avfilter_suggest="libm"
|
|
+avfilter_suggest="libm stdatomic"
|
|
avformat_deps="avcodec avutil"
|
|
-avformat_suggest="libm network zlib"
|
|
-avutil_suggest="clock_gettime ffnvcodec libm libdrm libmfx opencl user32 vaapi vulkan videotoolbox corefoundation corevideo coremedia bcrypt"
|
|
+avformat_suggest="libm network zlib stdatomic"
|
|
+avutil_suggest="clock_gettime ffnvcodec libm libdrm libmfx opencl user32 vaapi vulkan videotoolbox corefoundation corevideo coremedia bcrypt stdatomic"
|
|
postproc_deps="avutil gpl"
|
|
-postproc_suggest="libm"
|
|
+postproc_suggest="libm stdatomic"
|
|
swresample_deps="avutil"
|
|
-swresample_suggest="libm libsoxr"
|
|
+swresample_suggest="libm libsoxr stdatomic"
|
|
swscale_deps="avutil"
|
|
-swscale_suggest="libm"
|
|
+swscale_suggest="libm stdatomic"
|
|
|
|
avcodec_extralibs="pthreads_extralibs iconv_extralibs dxva2_extralibs"
|
|
avfilter_extralibs="pthreads_extralibs"
|
|
@@ -6321,7 +6321,14 @@ check_headers asm/types.h
|
|
# it seems there are versions of clang in some distros that try to use the
|
|
# gcc headers, which explodes for stdatomic
|
|
# so we also check that atomics actually work here
|
|
-check_builtin stdatomic stdatomic.h "atomic_int foo, bar = ATOMIC_VAR_INIT(-1); atomic_store(&foo, 0); foo += bar"
|
|
+#
|
|
+# some configurations also require linking to libatomic, so try
|
|
+# both with -latomic and without
|
|
+for LATOMIC in "-latomic" ""; do
|
|
+ check_builtin stdatomic stdatomic.h \
|
|
+ "atomic_int foo, bar = ATOMIC_VAR_INIT(-1); atomic_store(&foo, 0); foo += bar" \
|
|
+ $LATOMIC && eval stdatomic_extralibs="\$LATOMIC" && break
|
|
+done
|
|
|
|
check_lib advapi32 "windows.h" RegCloseKey -ladvapi32
|
|
check_lib bcrypt "windows.h bcrypt.h" BCryptGenRandom -lbcrypt &&
|