commit: 61d5569fa8071eb9c90f91de5b3a87d1674f9c63 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Thu Aug 29 07:47:03 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Thu Aug 29 07:47:03 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61d5569f
media-video/ffmpeg: fix incompatible pointer types in 4.4.5 Closes: https://bugs.gentoo.org/936433 Co-authored-by: Kostadin Shishmanov <kocelfc <AT> tutanota.com> Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> media-video/ffmpeg/ffmpeg-4.4.5.ebuild | 1 + .../ffmpeg/files/ffmpeg-4.4.5-incmptbl-pntr-types.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-4.4.5.ebuild b/media-video/ffmpeg/ffmpeg-4.4.5.ebuild index cb1b60ce093f..805cf2c0a13c 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.5.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.5.ebuild @@ -347,6 +347,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.4.4-opencl-parallel-gmake-fix.patch "${FILESDIR}"/${PN}-4.4.4-glslang.patch "${FILESDIR}"/${PN}-4.4.4-amd-av1-vaapi.patch + "${FILESDIR}"/${PN}-4.4.5-incmptbl-pntr-types.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.5-incmptbl-pntr-types.patch b/media-video/ffmpeg/files/ffmpeg-4.4.5-incmptbl-pntr-types.patch new file mode 100644 index 000000000000..a47a62917a29 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-4.4.5-incmptbl-pntr-types.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/936433 + +diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c +index 4b81bd1..4e7f49f 100644 +--- a/libavutil/hwcontext_vaapi.c ++++ b/libavutil/hwcontext_vaapi.c +@@ -1032,7 +1032,7 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst, + uint32_t va_fourcc; + int err, i, j, k; + +- unsigned long buffer_handle; ++ uintptr_t buffer_handle; + VASurfaceAttribExternalBuffers buffer_desc; + VASurfaceAttrib attrs[2] = { + {
