gentoo auto-resync : 17:02:2024 - 17:37:38

7 files changed, 22 insertions, 7 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index cf8ab8b0f753..6a58c295afd3 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 8633057b5b61..1d3b653d3a03 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -15,6 +15,7 @@ AUX ffmpeg-6.0-binutils-2.41.patch 2217 BLAKE2B 2c8e96610fe1d198613405941b8f6ce3
 AUX ffmpeg-6.0-fix-lto-type-mismatch.patch 1782 BLAKE2B 4cafd0244136c645e8da072b21c906fba97579f667e57f678b450410759fddc834e5a2428b7d0f078130cfc7ab267cad82a46d369951efddcfc5853dd2118837 SHA512 170114d57af0a0b5fc5da71ae76f4725b8cf1a604b5eca10e60761ef22fb0cdb35a166d1dd5ebc4ef990c383e1d1331f8ef2ceccb8dc7bf4adcc7e9ebb2ba899
 AUX ffmpeg-6.0-libplacebo-remove-deprecated-field.patch 4733 BLAKE2B eba46b33bdbb387b90f89491aa638cb941e7fb72d522945394e540fdfadaf83efc6837a13eefedc285b6bce3ef4443ef32f2c04754209c4a47c4d2216574d597 SHA512 0673dab6043466eecf79048f1da8879d89a014b207910bfd6ec6ebf151fe77edf35460035583f803133969d90ab202ce31aaddf322501ac4e34e1270a66f09fe
 AUX ffmpeg-6.0-wint-conversion-vulkan.patch 1647 BLAKE2B 3d0f0de065a615f199cd3a3074f5038bf6652f41afa8f8754ade5f0112327f069d4cf8eddf3bc25139122d258caceb102dad7c2825b99f35c273e993caae817d SHA512 1fa7506eb393e44ba98ebaea1e98831912279d365ef8909f247913b912973f7782cb0ad869da4244b6a09b91f5cbb5a5207cbc5a4de8ec61fc313714ea663a80
+AUX ffmpeg-6.1-gcc-14.patch 523 BLAKE2B b82fc06a7eee0c7ab68ef78f3ac205f45a68a7799dc241f0a574afa48e4dbd477c0d67f7c5a7ff46971adc821ef1507f4957156200167a2c59f8c7f7867ac048 SHA512 092cd9bad652ab82c3b160a37c0c92b561577d56b33776e30b79b7abf487fffeb1ef1273b950c4d4eff62d3cd7fec2a6dc2c294285b0b32eda364e47834a4ff9
 AUX ffmpeg-6.1-opencl-parallel-gmake-fix.patch 519 BLAKE2B 837eb5bd4041edbe221a22b9104843fc3090db4fdc409ae23302376f981d4125d5437dd6f7062898f678214fb7b3d1f0ab3aa1905bbb1169231891aab7ce2461 SHA512 788da4be706d07578329ef4e12e49c32bc6aa938a0b9327c60dfe49d7c399ce1657fd343a15c4f44b20dcd3fb62a8918643120941655311cd9d473321fd06812
 AUX ffmpeg-6.1-wint-conversion.patch 3514 BLAKE2B fcb65b882af964a8f45f71ea3f885fc016e3f89c3d6f0bd6d661d489715c0f746e763a86c6ade1515e212b01559d90ea9c2a97c965e0c0f9087b8396cdd58414 SHA512 7e09fc1a811a21aee9eef0370e57a37817652229a6b0e58cd2e8723e8336124396fe40f6a7c6c5f860046410596027d27d900371ff86609b86ef94dd0633977f
 AUX vmaf-models-default-path.patch 1126 BLAKE2B 71f83765dc89b85e929af393f9d1415d119e71a91aaf45e8a32fd4fff270a129ca797c3b383a6074bea32fb582816660022a59d33bb6f557514df038baaf0271 SHA512 4d21f4b1622d8e47d2821ecac6b893847ada74d75db7d8aaac70efc7e6e7a6607c011b6fb2d015cb0c5e05f6a56e4feed43eca7d35b0f686a68261e6d9981b6a
@@ -27,11 +28,11 @@ DIST ffmpeg-6.0.tar.xz 10234012 BLAKE2B c70884911f3a3e40fe87473f241a2a56b303f5ab
 DIST ffmpeg-6.0.tar.xz.asc 520 BLAKE2B be294d375108b57bca3c687620ce2517c54c99012d82dc7aa1a83d5fe6d5453bd3c8620fdfb743df780cf588983a06a66a458c4e3e454dbe535cbba9da30c48c SHA512 a64cd0f8578fcea4537f5a38634c930d66c8ba4abd3e8e9dcffaeb95c3ad2e754d7bc4fbb5272409d4d32abf8180ef83f7204c6a570b52a37e635efd96cb94ed
 DIST ffmpeg-6.1.1.tar.xz 10458600 BLAKE2B 77827ff92b47c773ed82e7b7793dbb135c370fe23501169cb1eab08ff5ede77cfd5b397e8fb1d38756812cc82277898fd5c74b7d8495842556570c0c5570daeb SHA512 fca3f8635f29182e3ae0fe843a8a53614e4b47e22c11508df3ff7cdbafbb4b5ee0d82d9b3332871f7c1032033b1cad2f67557d7c5f7f7d85e2adadca122965d5
 DIST ffmpeg-6.1.1.tar.xz.asc 520 BLAKE2B 801cd976d10363d1f9fc302351b330cb57e609a266407627ef378172f28974f4a18435b8a77b9cc7a8ff7b75701185211739f685629bbda961c3588c15af1221 SHA512 0e10c1f560bab0812d759d286656593dea5940f02bb52d88d9ba7f10b12b9cc3d7aa2a41c5f7a45b319069e04dce22dc1286b3c1ba685b35cd6d04cd81c5a0f5
-DIST ffmpeg-rpi-6.1.patch 1356823 BLAKE2B 094404eac6d1e43ac094634fa662ce312807013b8af3f80ced03b3d85f2547f803c71181b567c4db2756b2ea54b9bbaf7516a1f72a389d0889c2531edd177275 SHA512 7bdb857146d01ac54ce23c0b2bf32f0255419af52217aed873036cdc82678c3c7ac0e9557ed316fd316faf41c011778bcec277cc4de4d3b7fd9f5eab4078da69
+DIST ffmpeg-rpi-6.1-r1.patch 797961 BLAKE2B 7da7ed15098af72e1e5e659b8ce23f5f83583798ea21f1e8c968d26de660a911dd114381948885760e8192002023d1c837296e712baac34f1422e02b599c5f5b SHA512 098f111d2c83e2642b53cd69378bbcb24d6f85d3bcf75f474f87cf45b5b97eb240b16960ab981a516b14b0ba3ff51075e527fe66d792d1677c6f78d608c982c0
 EBUILD ffmpeg-4.4.4-r8.ebuild 20269 BLAKE2B 2d42f92ce34afbd49b4764e59bd3ac4e05e2e052d88000c6b0f0cdeae09b7170998cd52b951145fede6db9a18d480d0eb6e0f87a498bc34f1b61e4aa656d00b4 SHA512 d6a81f4ce5be09ea5ec7e8480c9fd5f4ad9417020f0607de8356fa87f47fe4237d734270ea3224402720451ef123b3354ccc472e011963e2cb1528028b74c229
 EBUILD ffmpeg-6.0-r11.ebuild 20020 BLAKE2B a40a46d38cf91778bac13235c227dcb6c9b2d37a7760deb5ffcd2aea4fd0f12cec0a9a6cf9000882b6595b68f619dacc721365f8491bff7c0dda2739d53af97d SHA512 abeb9fba7ee4d2b704a9420c850b9cc8e87a74ceb08b9b6229c2a33aa806d576bb93396646235c41e18bfb4f36ad3d1260244386f1c7a981c5e1a95f1d80da93
 EBUILD ffmpeg-6.0.1-r2.ebuild 19932 BLAKE2B a061f4479a123e5718eddb266099c3026092e566b3de0f1402f5ea06bf0138d2996c15f71679e44ca28cc48c87506b98cd46c4ee1ef8b230260a4d45e8b61955 SHA512 eba2afb8851ed6ead9db8443d80b6b782139a0f02e33a64371442f7c02d1b901885c34116923e029091e4caa67f57ee2179a21908c0da98454586935fa73920b
 EBUILD ffmpeg-6.1.1-r2.ebuild 19557 BLAKE2B 37f2d46bce4dbbd0fdc1be54c718075da95fadfc6caa28fd4391960af022a2cac54374708a7e8f57455e66fdacaf69b580faaa2a532729c694c5e01faff3da4b SHA512 f04da11f41143394565733af05667e504a5d012c7b4ad669e8be46896f33f71caa3f8fc3b9fd7751667b92b40e412cb15c700423efbb1db5f7c3308fca07e288
-EBUILD ffmpeg-6.1.1-r3.ebuild 19857 BLAKE2B 257b08c1ea37d39019cbc08d392d83d8f0146bb3ba42a22f3f06bb5a7e812a64e62fc64fc554e1e444f99f288d045c89c7cd666d524d02306eac44455acf56cf SHA512 49f3eb157089ec6aa2f462ce351d3ca9d89d356ef8357e6dd48ba2f1e25f84356f86bd042f2d9fd7b8e9cd68ac10532dbd88dbca28ea6af54d7389d2e2a044dd
-EBUILD ffmpeg-9999.ebuild 19709 BLAKE2B 3d940c36823d190c3450bf1087d80df700d5ad621633c19d65da5f95c1c50686698557194436164ede74da258a6b9496c094f1da03de12596a39508a2ca8aeb1 SHA512 b9839d4c6b24ba8cfc4c719d535177f0f920d9fcb026ad6ddbdf5c779f61896a622908e63b703351a61e2df1b26e81e63c1b0fa13067288290aab8abdd572973
+EBUILD ffmpeg-6.1.1-r3.ebuild 19898 BLAKE2B 1645ea2c7ecb129a15ff51f50aee73b0766fc5eeb5e5a517b52ba28b6cdf605dcc32862feb29816d48a2f9098e756b5177898f055e28357ca33e4def413ec57b SHA512 85be5f888b9fa57b2bf8ae780c1d121fe0a7dbb4a9c40566139517a14bce4c930beb8f2be7356667f5fe4fa99565a4804fb58c8fa800d4f3d09e61116ddb871f
+EBUILD ffmpeg-9999.ebuild 19712 BLAKE2B 1650a8a1606983d61ce911a88a4e2fb84e33e035a1f54e00c6fa8ed1a3aa391867b0e391b86b2293267f0731462ba5eac801cf33c8f301f5e73611f4d2a1e43a SHA512 d3c49f6ebdae78fae8ccb4486375bc01fd334fb8252bf935c0437ca0a557a3befb58eedb0d8e9f5cfa95ec8b9e8e86c1419585575a053f5e0683e75645b4be7f
 MISC metadata.xml 7897 BLAKE2B 911f673353c480db243c202046f876840849cb27155fb109ee365e009d20af086fe188d91c7d33d509a7362330cea853a808c8e0a463aca8de3c304a3ed52ed0 SHA512 bdf26ee26d65a5ce58bc958eaad682cf4b5101100566cd4a4adf0b671418a2a7958a54baa2abff480f17bfcfe2d33aae20ba7d37f0d7b116f210d40796483da1
diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild
index f512e9d9ac81..62ce17b2fbd3 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild
@@ -15,7 +15,7 @@ EAPI=8
 FFMPEG_SUBSLOT=58.60.60
 
 SOC_PATCHES=(
-	ffmpeg-rpi-6.1.patch
+	ffmpeg-rpi-6.1-r1.patch
 )
 
 SCM=""
@@ -363,6 +363,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.1-wint-conversion.patch
 	"${FILESDIR}"/${PN}-6.0-fix-lto-type-mismatch.patch
 	"${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch
+	"${FILESDIR}"/${PN}-6.1-gcc-14.patch
 )
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index b5e32f2c8f88..623a4e57eb4d 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -15,7 +15,7 @@ EAPI=8
 FFMPEG_SUBSLOT=58.60.60
 
 SOC_PATCHES=(
-	ffmpeg-rpi-6.1.patch
+	ffmpeg-rpi-6.1-r1.patch
 )
 
 SCM=""
diff --git a/media-video/ffmpeg/files/ffmpeg-6.1-gcc-14.patch b/media-video/ffmpeg/files/ffmpeg-6.1-gcc-14.patch
new file mode 100644
index 000000000000..0db7301f18d9
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-6.1-gcc-14.patch
@@ -0,0 +1,13 @@
+diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
+index 29fc8bd648..1f85fac7f4 100644
+--- a/libavutil/hwcontext_vaapi.c
++++ b/libavutil/hwcontext_vaapi.c
+@@ -1203,7 +1203,7 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst,
+ 
+     if (!use_prime2 || vas != VA_STATUS_SUCCESS) {
+         int k;
+-        unsigned long buffer_handle;
++        uintptr_t buffer_handle;
+         VASurfaceAttribExternalBuffers buffer_desc;
+         VASurfaceAttrib buffer_attrs[2] = {
+             {
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index f6da19f774b9..9e1b5b3198f6 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -1,6 +1,6 @@
 DIST libva-utils-2.20.0.tar.gz 1280967 BLAKE2B b4d80eb3301a27b9e9ea31edf77f0f6d0bad8660d350fbc0ce4502a5f09b613b7d71ded94c1ce94697c3d679f9b06c099ebce4bf6c57b0e02f92f14458a12787 SHA512 e0edf08f90fc5b360c0123cd77fcb125be289700e62e3d53c92312175e0ee082f3714af3784f4b087de1379bb384c1cfc0f5f881e5a9b31d4806bc3216eacbf0
 DIST libva-utils-2.20.1.tar.gz 1281764 BLAKE2B 9561270811a3d9c314a1f3b73a363b1c7fdda2f38a45404a3e1760eb8ee2384288a589e7b6e001e902e8b9d5ee9611839eccec9a9a89fd5676670a5792e3d3ab SHA512 65f7e03a242a520aae4f9e7ea16ea1c437d7915582a21287f23a05c246b92f1691be3e47d9d92cab9eb6eabb190ba77c6cd0bb3a5fec88898a33b352fc70b5a0
 EBUILD libva-utils-2.20.0.ebuild 1887 BLAKE2B af617d30f0280a3db0acd79210fc4a9a87fac15ab625708c334d283213ffe5f195bdffcca9c3f9ce0aa5ad955d7b14f5aac9126ce2d7e7369583a4553832f5df SHA512 b3747cb360cfd2c1f5a39319e9e286d4673afdc3ec4e39155af3d5fea7d680fd0f6faa1f3a7ce67af4cc15a6306afc89daaa710e71a3c34bc973140d3714a98b
-EBUILD libva-utils-2.20.1.ebuild 1895 BLAKE2B 7822e85f24d917ca87c1e7f4bcd33ffa5e019d0858e480cb8fc17578482d508ef54367c5068d19838d8246994d987371dbf4d84ce7565ee0858bde1e258b7abc SHA512 2dd7ef18bdb68663b3e90243358106a59cf16bcf9fefea569e3f0ffb4601d977905099d60f7599f60686504436c0f7225b43a61f4ec18fca8bf484e33c769933
+EBUILD libva-utils-2.20.1.ebuild 1894 BLAKE2B 0699d208d7af8bca1692a98daefea2acd5c5602da7fc9f77376dddbfb3be381b1ca86ddbc7dc660fce445cbef0b6798c3220693018cf287d213d8c7162229364 SHA512 953a158fc3e4ab1582a57ddadaf064b910b50d3ed7c36d463ceb7dd7d005ed4798a52ac059c084ad4a4ec7d055c21f3eac7d6f00953aecd8f558058ccdd8ef07
 EBUILD libva-utils-9999.ebuild 1903 BLAKE2B 977bd6b9097f5fc340e8d59ff5fbfcb7ec0e9f81ac9b9b4bdd4b8a3af3647c895e496dd0c671dcbebe48275469e0fde2288333f4e1f87808642293ca1fa46580 SHA512 c85d4d3322e2851e23a528c031f363a5e06c3982b5bcded6b08471ea9f07e8f91608b50b53d7b0564fb16f6c9b57b379dc524ab27344195d96a68cac14514462
 MISC metadata.xml 596 BLAKE2B 856d27918d6cd6c983271e4f762f7b1278bd90231d33181b5381dbc425523d637c65902526ed1b48a0df6aadf41d77bd249e886dbc485edf93f5394fa458cd13 SHA512 46e6d1ef1cc966aadb696293fb1b5f86d1f3fe5d0245ca01a2d9be6d1b35f29830cee41d4e04f0c8d557dd20eb41ae927dc60a854ce24862a2b2f7fc8faee766
diff --git a/media-video/libva-utils/libva-utils-2.20.1.ebuild b/media-video/libva-utils/libva-utils-2.20.1.ebuild
index b08b407bf80c..4de57531c234 100644
--- a/media-video/libva-utils/libva-utils-2.20.1.ebuild
+++ b/media-video/libva-utils/libva-utils-2.20.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva-utils"
 else
 	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"