diff options
| author |   Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2024-08-29 09:47:03 +0200 |
|---|---|---|
| committer | Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2024-08-29 09:47:03 +0200 |
| commit | 61d5569fa8071eb9c90f91de5b3a87d1674f9c63 (patch) | |
| tree | 1dcf52c997792e11d9932292fef06dc7e3d1eee2 /media-video | |
| parent | sys-kernel/ugrd: add 1.19.2, drop 1.16.0, integrate tests (diff) | |
| download | gentoo-61d5569fa8071eb9c90f91de5b3a87d1674f9c63.tar.gz gentoo-61d5569fa8071eb9c90f91de5b3a87d1674f9c63.tar.bz2 gentoo-61d5569fa8071eb9c90f91de5b3a87d1674f9c63.zip | |
media-video/ffmpeg: fix incompatible pointer types in 4.4.5
Closes: https://bugs.gentoo.org/936433
Co-authored-by: Kostadin Shishmanov <kocelfc@tutanota.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-4.4.5.ebuild | 1 | ||||
| -rw-r--r-- | media-video/ffmpeg/files/ffmpeg-4.4.5-incmptbl-pntr-types.patch | 15 |
2 files changed, 16 insertions, 0 deletions
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] = { + { |