From b8a4608f6e09ade48cfe9bfd287540d5ee7476d6 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Mon, 22 Aug 2022 22:34:15 -0700 Subject: [PATCH] xf86-video-vmware: fix build for gcc12 --- .../patches/fix-compat-gcc12.patch | 30 +++++++++++++++++++ srcpkgs/xf86-video-vmware/template | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xf86-video-vmware/patches/fix-compat-gcc12.patch diff --git a/srcpkgs/xf86-video-vmware/patches/fix-compat-gcc12.patch b/srcpkgs/xf86-video-vmware/patches/fix-compat-gcc12.patch new file mode 100644 index 00000000000000..ff839f16e628e8 --- /dev/null +++ b/srcpkgs/xf86-video-vmware/patches/fix-compat-gcc12.patch @@ -0,0 +1,30 @@ +From 77b8183b3395333d5d4c73e25c2d011748f15eda Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Sun, 8 May 2022 03:00:10 +0000 +Subject: [PATCH] vmwgfx: fix missing array notation + + Fixes error identified by gcc-12.1.0 compiler + +make + CC libvmwgfx_la-vmwgfx_tex_video.lo +vmwgfx_tex_video.c: In function 'stop_video': +vmwgfx_tex_video.c:240:20: error: the comparison will always evaluate as 'true' for the address of 'yuv' will never be NULL [-Werror=address] + 240 | if (priv->yuv[i]) { + | ^~~~ +--- + vmwgfx/vmwgfx_tex_video.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c +index acc2b56..480a5f1 100644 +--- a/vmwgfx/vmwgfx_tex_video.c ++++ b/vmwgfx/vmwgfx_tex_video.c +@@ -237,7 +237,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown) + + for (i=0; i<3; ++i) { + for (j=0; j<2; ++j) { +- if (priv->yuv[i]) { ++ if (priv->yuv[j][i]) { + xa_surface_destroy(priv->yuv[j][i]); + priv->yuv[j][i] = NULL; + } diff --git a/srcpkgs/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template index e7e8e294725621..14264e1415be79 100644 --- a/srcpkgs/xf86-video-vmware/template +++ b/srcpkgs/xf86-video-vmware/template @@ -1,7 +1,7 @@ # Template file for 'xf86-video-vmware' pkgname=xf86-video-vmware version=13.3.0 -revision=3 +revision=4 archs="i686* x86_64*" build_style=gnu-configure configure_args="--enable-vmwarectrl-client"