gentoo auto-resync : 24:06:2023 - 01:25:35

7 files changed, 6 insertions, 67 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 606ebb34a3c9..62df206b3e2e 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index da30a06016df..c20afaf66aa2 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,13 +1,11 @@
 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.3-clang-14-ff_seek_frame_binary-crash.patch 1813 BLAKE2B 3fdb56fade5c723fcf387dfe5e31aefbd88e8256fb2ae24a3a90b91902ff18f9ffa9b1e464c0b0b40fad04c7230be7bec78f043b7ce52d70ee94f2a2313dc2b2 SHA512 fb11cb1047d8f44ab9f9f66e52af136b7fea27589929e45afb770e53837954fb03854ea9d839ecee80d3c3d5a493f32bbdbc74e8efc9600d5b53a7d91136abca
 AUX ffmpeg-4.4.3-get_cabac_inline_x86-32-bit.patch 1068 BLAKE2B b547cd925bfd506e08d44395c67916fe20b30f397a36adf53fcf277660c45aef9d3d8c014b2bbfcf038539618affb9dd8ff5d93f2fe622e4282c61c4d1b26861 SHA512 779e921e783b800e6bf9bc95af73d44a170287676d17bc22f2b7cd91e393f410ec3f6c7bfa173497443a65496047f39f37cac1d56507271411893c5bdcb37d8b
 AUX ffmpeg-4.4.4-fix-build-svt-av1-1.5.0.patch 1882 BLAKE2B e60bb09566cf61018a0e910f32ccc9e9d94695877dccdbeedc0c27996c356c397b59889f5d3997b6cea85acf4228f41bdb8086dfa2dc4b0852f4a8031a6d2c14 SHA512 d29410a1119853c7a7c1762fb557be26b7c38e1787a9ebea744a71438cd701d658d55e4c27350bf2d4ff31a8cdc88e0844fa37b5ade3ef706b3ba1cd1462916e
 AUX ffmpeg-4.4.4-wint-conversion-vulkan.patch 1066 BLAKE2B 1409c97a31ae59500df944ced7efc064486e325e1658ac8f30d74ac926c63de51b610eebb5be9951adcd8ad02c8c143429c6eff57ce789a1c187e0b24221aa6d SHA512 58e33b2f0e94e75ef7acebb221332dc4d618846f8a968011da370743ce80a4ab688112411d3f2a5320d144c25db567780c870a0eb4045152b73957e2d7fe747e
 AUX ffmpeg-5.0-backport-ranlib-build-fix.patch 2224 BLAKE2B 1af6c5eee3f2c69c0630a73ec3885b9302cb045a03623ff138939348d6ba7e7deef1bb07c33c5bef5834040c4f6abcd7d22af8b0b849b28efde3d5753b776108 SHA512 e82cd400488ba86e5d039f088e3798b5a66245a8753d275d608284081f4b260fb7a4d8d1310f43acdf81258cc507943c8f07e431c497411744a62ba98c88c5bb
 AUX ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch 999 BLAKE2B 736a85e60d3ee9b48346e1d7795bd8e075e8bcc2556695ec9db0a48a8d7356d20795ed31e1d6dcda7615e5ad3ff9faf7edf7563ba6e1f822a99d3cd442bd8a72 SHA512 f16c7185a3265710b6638e35322895590b58dffaffcb8fb436b08f945e19c44a1b66a17902b73e89fd53cf5e4cd9e7f2256bef4df4c82be16a807eb6bf663f5a
-AUX ffmpeg-5.1.2-vulkan.patch 1725 BLAKE2B e8be249e7aa6f87eb1653dc6aec19e32e98efde6903cff6d1a32736dc343d7c12da249490853214c87cb95019d677e214dd0a065cf0dc9bbd44f2754c8d9cded SHA512 9fec574848c9ac90f51f6bca18120f40a22f6f737677a57d21bd07867f9e6619c146d8aa1cdac8d11ec53de87e7119316369874d3492b256f295b98b1b5df762
 AUX ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch 3500 BLAKE2B 1098c0ebc5d4db6198edf1928f6821a7e4c891145905fee16c945eba80a6c3647c9ad9402790465c3487d9926e394c592e1e7b87d06b7f6e558579d93a1ff92e SHA512 b4dfde5a84f96de80988f4fce25d947865568f6a2dd0b14219c38b9239aaa14636839a218e46e6d38ea33bf0f1bfb91d603f8317eb2fa71833ebe5852f557e77
 AUX ffmpeg-5.1.3-svt-av1.patch 3092 BLAKE2B 3c41b361fd19f87fa252e7385e917fdbc5821bd365851544a190aa711db96b89cee58b21de00354a69f12a40815cb7811e7558548c841ec183ed5695ee3aa86b SHA512 18889a141d8cba1781447ccc965d408706698af2b4b6c0f91cac70bfd0c27be346461e6545043988825a3b5ec9c196af3b4b408ce575f37135d2cc19ab95163c
 AUX ffmpeg-6.0-DECLARE_ALIGNED.patch 1006 BLAKE2B 10bf1b3f618e0fad2dfb33b42fcec611329181d5481f79c42cbfda7054e2ce5f53e5b2ce439965a1beadc346492ac06c6a91a56d979a73bd72ce8952a15b2dd8 SHA512 e2d3e915a6d9ebae11e000b908bd5346de0d7731407dc783088a6d10a8e36de045a90225d16a01366ed1ad3af16fdb3b87803c03833883e7f31b93e7cdea44f7
@@ -23,7 +21,7 @@ DIST ffmpeg-6.0.tar.xz 10234012 BLAKE2B c70884911f3a3e40fe87473f241a2a56b303f5ab
 DIST ffmpeg-6.0.tar.xz.asc 520 BLAKE2B be294d375108b57bca3c687620ce2517c54c99012d82dc7aa1a83d5fe6d5453bd3c8620fdfb743df780cf588983a06a66a458c4e3e454dbe535cbba9da30c48c SHA512 a64cd0f8578fcea4537f5a38634c930d66c8ba4abd3e8e9dcffaeb95c3ad2e754d7bc4fbb5272409d4d32abf8180ef83f7204c6a570b52a37e635efd96cb94ed
 EBUILD ffmpeg-4.2.9.ebuild 17808 BLAKE2B 58a2ceac72c72af74a3916fe3677d3af5ad2fbb8bea9213fe3e9b1091b4b21f6b9d3e625f94cb7cf81b0d999710a081d736e88b0c04e85726ac84fdcffd1f053 SHA512 fd5658902587fe737875f16a6dd25b62e027efd91e922d972203fbf11e98a4ed9aa7de7b54d178b02bcdfdc904a357ccf9279f0d3aad0ccd9d9fa0b5c1127946
 EBUILD ffmpeg-4.4.4-r2.ebuild 19697 BLAKE2B 23d0237e451c2455ec760c53c6a467b8cd2f74741fd1080d014cd2abd25378e64f5f93e4ff0d0b7e35460ec2464376e7742b90370f2a23618d9221d0417413d1 SHA512 bbf7a2faac4430d2d532044e63bd929acd1989d071e1f5629741262d6cbd6dc082bcb83aa28401ca27d988e87576ab0d6119f885c0ba20ed23a52d07116abda6
-EBUILD ffmpeg-5.1.3-r1.ebuild 19746 BLAKE2B 62cc1eec95b20ffa6658e816a35b7edbdddd5f1216e3d94b8706a1cc8e88ad5cf5332b9662a4580e1f870cbe5696d27b65b6c112e77940bca640ef197ae8192d SHA512 161d0a8711b65c58f1cc13b83230796e16d170e0eb8768c154a2ecda64d9cc1f1d807585b457a92172e6f4e2be08e4d67a69c6d60ba1686e3463d5fe947d93a6
-EBUILD ffmpeg-6.0-r1.ebuild 19696 BLAKE2B e74b954b75ce97a5281af4a4368ca037441b5c7da3ae473c5276d1e064dd796961f98b9fe16e55553c455e19c27794d93ad3d6822bbc7b92a9e91933a7c73e57 SHA512 66c03dd1ac895a7c5237974054f69e0405a58f87d11cd4707e532cbfaf053e9c5e792bf0dd7ee051d6fd0bb437ff357fa926d1493d860d914f27797e0ea15ed4
-EBUILD ffmpeg-9999.ebuild 19581 BLAKE2B 4bf5917c10121c8410dca186a521b9589bf972f968c155f1d5ed628aabdaba2d06c3d5b66c9cb506349926098f0c36c0dfa60207be087477c149bbb1cf47e74b SHA512 5f3550388e65d985ebb2a1e84e221cbbbb922a86bd0a6177b63d19a87f82411f930cf384fe267487d06ad962f4e1c4655ace6e66a76da9f3d8dda017932d09e3
+EBUILD ffmpeg-5.1.3-r1.ebuild 19759 BLAKE2B 40953b3ce640f28bece0c00b3c80631608de5d3e721150ebb40298de2708abc85a35f1639e61dfef1a601322a167deaad195ff4a19f2d1d394b2ed3f8c923b20 SHA512 de6dbf1dd255272aae213f0b9d5afe1180e551511d844acfdb55c196a7464277e181a01b3a7c7bcc7a0c9bd5e2aec71183c39a3597bc828e4b0b925ee95525cb
+EBUILD ffmpeg-6.0-r1.ebuild 19709 BLAKE2B a9321e3cb27f5681bd7b762f6cbed3abdd0ca1736646927bf28ce1551c3b0a5293c07d25eca4677750f3c761ef2ef373e3d2f2e917bf9d6e744eecdc61ee660a SHA512 13edf99bebd9fd4f2287cc05136bda71ab9f82926c240640cc3cd52d605349d332dad430d50f3a589857d8e739bfb61b74cda90012e2aa12b49bee53c8e79006
+EBUILD ffmpeg-9999.ebuild 19594 BLAKE2B 74c7d6a11ee83b8fb9321f2f8a807b8f37dca0e96e1eeb7087a4e594cec87959bc5d9b00d414f91d452b62f7e3072cc51a9ec14e3720d312678b01302cb3babb SHA512 01e0006868c6a0f1202f6c052be6fbfaa912091835e4712123cb0a046849703b0cf01313f331f6b641c3a728ac0616355642e782a70c7b21c988f313f7cb68cb
 MISC metadata.xml 7426 BLAKE2B 68fd0b4c5ff7cd08635421bab3b3257f06ad139212d44055f60e7f9e69c36d4e24e8d29ebf1662235269caefd388576d05c798ee67cf4b2871fab54362c405ba SHA512 c4bc329ce8903649a4eaeae01b7c0083a192e09701194c5867b651cc0650260bb12df740b68ffa85e49aadea133458a279070d320aa28195a9f71a99de4eaca8
diff --git a/media-video/ffmpeg/ffmpeg-5.1.3-r1.ebuild b/media-video/ffmpeg/ffmpeg-5.1.3-r1.ebuild
index 3afc9ae6a869..d4d7bba328f8 100644
--- a/media-video/ffmpeg/ffmpeg-5.1.3-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-5.1.3-r1.ebuild
@@ -64,7 +64,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-6.0-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r1.ebuild
index 56454db9dc3f..c6d51f468d77 100644
--- a/media-video/ffmpeg/ffmpeg-6.0-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.0-r1.ebuild
@@ -64,7 +64,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 1c98bd51bdb8..282423730359 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -64,7 +64,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
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
deleted file mode 100644
index ce552893d19b..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-4.2.7-libsdl2-new-version-scheme.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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)
diff --git a/media-video/ffmpeg/files/ffmpeg-5.1.2-vulkan.patch b/media-video/ffmpeg/files/ffmpeg-5.1.2-vulkan.patch
deleted file mode 100644
index d7ce57350e4e..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-5.1.2-vulkan.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From eb0455d64690eed0068e5cb202f72ecdf899837c Mon Sep 17 00:00:00 2001
-From: Lynne <dev@lynne.ee>
-Date: Sun, 25 Dec 2022 01:03:30 +0100
-Subject: [PATCH] hwcontext_vulkan: remove optional encode/decode extensions
- from the list
-
-They're not currently used, so they don't need to be there.
-Vulkan stabilized the decode extensions less than a week ago, and their
-name prefixes were changed from EXT to KHR. It's a bit too soon to be
-depending on it, so rather than bumping, just remove these for now.
----
- libavutil/hwcontext_vulkan.c | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
-index f1db1c7291f1..2a9b5f4aac62 100644
---- a/libavutil/hwcontext_vulkan.c
-+++ b/libavutil/hwcontext_vulkan.c
-@@ -358,14 +358,6 @@ static const VulkanOptExtension optional_device_exts[] = {
-     { VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME,            FF_VK_EXT_EXTERNAL_WIN32_MEMORY  },
-     { VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME,         FF_VK_EXT_EXTERNAL_WIN32_SEM     },
- #endif
--
--    /* Video encoding/decoding */
--    { VK_KHR_VIDEO_QUEUE_EXTENSION_NAME,                      FF_VK_EXT_NO_FLAG                },
--    { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME,               FF_VK_EXT_NO_FLAG                },
--    { VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME,               FF_VK_EXT_NO_FLAG                },
--    { VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME,                FF_VK_EXT_NO_FLAG                },
--    { VK_EXT_VIDEO_DECODE_H264_EXTENSION_NAME,                FF_VK_EXT_NO_FLAG                },
--    { VK_EXT_VIDEO_DECODE_H265_EXTENSION_NAME,                FF_VK_EXT_NO_FLAG                },
- };
- 
- /* Converts return values to strings */