diff options
| author |   Sam James <sam@gentoo.org> | 2022-09-03 06:24:50 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-09-03 06:25:22 +0100 |
| commit | 31baf58256ca04e305510ce86df9f6d83948f853 (patch) | |
| tree | dff0a4c0534639149f2c55b48f1ebfc24fed2e68 /media-video/ffmpeg/files | |
| parent | dev-libs/libtasn1: Stabilize 4.19.0 x86, #868138 (diff) | |
| download | gentoo-31baf58256ca04e305510ce86df9f6d83948f853.tar.gz gentoo-31baf58256ca04e305510ce86df9f6d83948f853.tar.bz2 gentoo-31baf58256ca04e305510ce86df9f6d83948f853.zip | |
media-video/ffmpeg: add 4.2.7
Fixes a bunch of CVEs that we've had fixed in newer versions
for a while, but until we can clean up 4.2.x, we may as well
bump to the latest in that series...
Bug: https://bugs.gentoo.org/842267
Bug: https://bugs.gentoo.org/795696
Bug: https://bugs.gentoo.org/781146
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-video/ffmpeg/files')
| -rw-r--r-- | media-video/ffmpeg/files/ffmpeg-4.2.7-libsdl2-new-version-scheme.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/media-video/ffmpeg/files/ffmpeg-4.2.7-libsdl2-new-version-scheme.patch b/media-video/ffmpeg/files/ffmpeg-4.2.7-libsdl2-new-version-scheme.patch new file mode 100644 index 000000000000..ce552893d19b --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-4.2.7-libsdl2-new-version-scheme.patch @@ -0,0 +1,26 @@ +https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/839f98ff6719cf2db0cbd88cd787a1b19b9cbf47 + +From 839f98ff6719cf2db0cbd88cd787a1b19b9cbf47 Mon Sep 17 00:00:00 2001 +From: Christopher Degawa <ccom@randomderp.com> +Date: Wed, 11 May 2022 15:11:04 -0500 +Subject: [PATCH] configure: extend SDL check to accept all 2.x versions + +sdl2 recently changed their versioning, moving the patch level to minor level +https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff +and have said that they will instead ship sdl3.pc for 3.0.0 + +Fixes ticket 9768 + +Signed-off-by: Christopher Degawa <ccom@randomderp.com> +Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro> +--- a/configure ++++ b/configure +@@ -6383,7 +6383,7 @@ fi + + if enabled sdl2; then + SDL2_CONFIG="${cross_prefix}sdl2-config" +- test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent ++ test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent + if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then + sdl2_cflags=$("${SDL2_CONFIG}" --cflags) + sdl2_extralibs=$("${SDL2_CONFIG}" --libs) |