summaryrefslogtreecommitdiff
path: root/media-video/ffmpeg
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-12-26 14:07:48 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-12-26 14:07:48 +0000
commitadb727afeb568404873e8cbc91ba93d3d49eff13 (patch)
treed86cdceda93a48d792f162c7b5f054f09c41ee73 /media-video/ffmpeg
parented94061721073b4f7b546c30ae337f5737939985 (diff)
gentoo auto-resync : 26:12:2022 - 14:07:48
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/Manifest1
-rw-r--r--media-video/ffmpeg/files/ffmpeg-4.4.2-libsdl2-new-version-scheme.patch25
2 files changed, 0 insertions, 26 deletions
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 0768ed26dd7c..6fa94802acf8 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,7 +1,6 @@
AUX amf-env-vulkan-override 60 BLAKE2B 409985e6b5ef0e148076c16d8132db2b79ea53e0a922719a37d66fca9920c5fb94d23c22baef39f91e5d5157a7f58bba3e036355b1dbfb5a70153e0cb9764680 SHA512 7711a02b674638f71383a00b867f22fbd2e4d71ed397376fdfe2cb15655ec0a97eb0d613a339a04268726aae3c34efd29d51a3e8f7f90bf3d8634825c0ef3cc7
AUX chromium-r1.patch 1582 BLAKE2B 48547a7d53fd1f0f44b682c7e2306e79f007f8e96b36253f76775c4a3ced54ffaaf403dfaae94e81aa26c60887677b2dabdd2c5cef9fc4553e203f8259453910 SHA512 808daad5afed13a6d3926c9f9ab5cb58f80e16969533022c7ee959147908bb2c12d066d2125a6b6975ef9304d9b8d49c39aeb0a047009adabb4529e3cf54498f
AUX ffmpeg-4.2.7-libsdl2-new-version-scheme.patch 1132 BLAKE2B 59d40a3edcb19909a34000fc5e5fe2cb0565031fcb653d4ba3099b310e66ab1f3cf6ce11906d61657e472025bb9135342c7207b7c0536f850156e78e6a0e9cb7 SHA512 bc46370ffb830b32bc5c92ce31b2a2d51f2db1cb8a53bf6f03cc73f184a70448a0e744b5eb3d19990b58bb018e52d16a419ca030f42be4175c577a1d0ddf9f5e
-AUX ffmpeg-4.4.2-libsdl2-new-version-scheme.patch 1061 BLAKE2B bd2efcc869ad19acbf312568bda705c83999e31ac365a7fbdedc281186d2ec567afb1f0af021e750e5cd76e6715de7006b642a24a936115760da10371a3db982 SHA512 9a005a86b817fdccd0f05704348a8446c3a9b269bdd8ad0243f07a8d0bf9dc0f388a134065e0695073b1df2867a3c8e5e725917ce331bf1ee03c20d8187d1dbe
AUX ffmpeg-4.4.3-clang-14-ff_seek_frame_binary-crash.patch 1813 BLAKE2B 3fdb56fade5c723fcf387dfe5e31aefbd88e8256fb2ae24a3a90b91902ff18f9ffa9b1e464c0b0b40fad04c7230be7bec78f043b7ce52d70ee94f2a2313dc2b2 SHA512 fb11cb1047d8f44ab9f9f66e52af136b7fea27589929e45afb770e53837954fb03854ea9d839ecee80d3c3d5a493f32bbdbc74e8efc9600d5b53a7d91136abca
AUX ffmpeg-5.0-backport-ranlib-build-fix.patch 2224 BLAKE2B 1af6c5eee3f2c69c0630a73ec3885b9302cb045a03623ff138939348d6ba7e7deef1bb07c33c5bef5834040c4f6abcd7d22af8b0b849b28efde3d5753b776108 SHA512 e82cd400488ba86e5d039f088e3798b5a66245a8753d275d608284081f4b260fb7a4d8d1310f43acdf81258cc507943c8f07e431c497411744a62ba98c88c5bb
AUX vmaf-models-default-path.patch 1126 BLAKE2B 71f83765dc89b85e929af393f9d1415d119e71a91aaf45e8a32fd4fff270a129ca797c3b383a6074bea32fb582816660022a59d33bb6f557514df038baaf0271 SHA512 4d21f4b1622d8e47d2821ecac6b893847ada74d75db7d8aaac70efc7e6e7a6607c011b6fb2d015cb0c5e05f6a56e4feed43eca7d35b0f686a68261e6d9981b6a
diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.2-libsdl2-new-version-scheme.patch b/media-video/ffmpeg/files/ffmpeg-4.4.2-libsdl2-new-version-scheme.patch
deleted file mode 100644
index b592c2f9b72d..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-4.4.2-libsdl2-new-version-scheme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/839f98ff6719cf2db0cbd88cd787a1b19b9cbf47
-
-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)