Attachment 239311 Details for Bug 268789 – multimedia/mplayer: fix build with clang 15

[patch] multimedia/mplayer: fix build with clang 15

multimedia__mplayer-fix-clang15-build-1.diff (text/plain), 1.39 KB, created by Dimitry Andric on 2023-01-06 20:00:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2023-01-06 20:00:26 UTC

Size: 1.39 KB

patch

obsolete

>commit dc11b58df7edb1ccd4042f05b51d31eecdabc19a
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   Fri Jan 6 20:24:01 2023 +0100
>
>    multimedia/mplayer: fix build with clang 15
>    
>    During an exp-run for llvm 15 (see bug 265425), it turned out that
>    multimedia/mplayer failed to build with clang 15:
>    
>      libmpcodecs/vd_ffmpeg.c:742:24: error: incompatible integer to pointer conversion assigning to 'unsigned char *' from 'VdpVideoSurface' (aka 'unsigned int') [-Wint-conversion]
>              mpi->planes[3] = surface;
>                             ^ ~~~~~~~
>    
>    This is because clang 15 now makes the warning about this incompatible
>    conversion into an error by default. Add a cast to suppress the warning.
>
>diff --git a/multimedia/mplayer/files/patch-libmpcodecs_vd__ffmpeg.c b/multimedia/mplayer/files/patch-libmpcodecs_vd__ffmpeg.c
>new file mode 100644
>index 000000000000..53df2ba61794
>--- /dev/null
>+++ b/multimedia/mplayer/files/patch-libmpcodecs_vd__ffmpeg.c
>@@ -0,0 +1,11 @@
>+--- libmpcodecs/vd_ffmpeg.c.orig	2022-08-07 18:20:47 UTC
>++++ libmpcodecs/vd_ffmpeg.c
>+@@ -739,7 +739,7 @@ static int get_buffer(AVCodecContext *avctx, AVFrame *
>+     if (ctx->use_vdpau) {
>+         VdpVideoSurface surface = (VdpVideoSurface)mpi->priv;
>+         avctx->draw_horiz_band= NULL;
>+-        mpi->planes[3] = surface;
>++        mpi->planes[3] = (unsigned char*)surface;
>+     }
>+ #endif
>+ #if CONFIG_XVMC

Actions: View | Diff

Attachments on bug 268789: 239311