diff options
| author | John Audia <graysky@archlinux.us> | 2022-05-01 08:21:50 -0400 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2022-05-02 12:47:55 -0700 |
| commit | 5b85e7466c808dc88ba02f1b3fef066daf923ef6 (patch) | |
| tree | a6c66b24fdf6b30dbf6c4136fec6545b288e2afe /multimedia/ffmpeg/patches | |
| parent | d6960886bdddbc7fe6235bf82a2f28db61efa964 (diff) | |
ffmpeg: update to 5.0.1
Bump to latest upstream version, patches automatically rebased.
Removed upstreamed:
060-configure-link-to-libatomic-when-its-present.patch
Tested using:
ffmpeg -f lavfi -i testsrc=duration=10:size=1280x720:rate=30 testsrc.mpg
Resulting mpg was good.
Build system: x86_64
Build-tested: bcm2711/RPi4B
Run-tested: bcm2711/RPi4B
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'multimedia/ffmpeg/patches')
| -rw-r--r-- | multimedia/ffmpeg/patches/060-configure-link-to-libatomic-when-its-present.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/multimedia/ffmpeg/patches/060-configure-link-to-libatomic-when-its-present.patch b/multimedia/ffmpeg/patches/060-configure-link-to-libatomic-when-its-present.patch deleted file mode 100644 index a2cbbbbfa..000000000 --- a/multimedia/ffmpeg/patches/060-configure-link-to-libatomic-when-its-present.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- 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 && |