commit: ebf0a62268c4b27ffd37234cc8ed9e6054e0053c Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sat Feb 17 14:51:49 2024 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sat Feb 17 14:52:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf0a622
media-video/ffmpeg: Fix Clang and GCC 14 issues with new RPi patch Closes: https://bugs.gentoo.org/924558 Closes: https://bugs.gentoo.org/924743 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> media-video/ffmpeg/Manifest | 2 +- media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild | 3 ++- media-video/ffmpeg/ffmpeg-9999.ebuild | 2 +- media-video/ffmpeg/files/ffmpeg-6.1-gcc-14.patch | 13 +++++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 4175fef70c6f..46e2ae80d0e7 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -7,4 +7,4 @@ 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 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] = { + {
