Bug#1021182: xserver-xorg-video-vmware: diff for NMU version 1:13.3.0-3.1
Control: tags 1021182 + pending
Dear maintainer,
I've prepared an NMU for xserver-xorg-video-vmware (versioned as 1:13.3.0-3.1)
and uploaded it to DELAYED/15. Please feel free to tell me if I should cancel it.
cu
Adrian
diff -u xserver-xorg-video-vmware-13.3.0/debian/changelog xserver-xorg-video-vmware-13.3.0/debian/changelog
--- xserver-xorg-video-vmware-13.3.0/debian/changelog
+++ xserver-xorg-video-vmware-13.3.0/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-vmware (1:13.3.0-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream fix for array bug discovered by gcc 12.
+ (Closes: #1021182)
+
+ -- Adrian Bunk <bunk@debian.org> Sat, 15 Oct 2022 15:13:05 +0300
+
xserver-xorg-video-vmware (1:13.3.0-3) unstable; urgency=medium
* control: Migrate to x11proto-dev.
diff -u xserver-xorg-video-vmware-13.3.0/debian/patches/series xserver-xorg-video-vmware-13.3.0/debian/patches/series
--- xserver-xorg-video-vmware-13.3.0/debian/patches/series
+++ xserver-xorg-video-vmware-13.3.0/debian/patches/series
@@ -1 +1 @@
-# placeholder
+0001-vmwgfx-fix-missing-array-notation.patch
only in patch2:
unchanged:
--- xserver-xorg-video-vmware-13.3.0.orig/debian/patches/0001-vmwgfx-fix-missing-array-notation.patch
+++ xserver-xorg-video-vmware-13.3.0/debian/patches/0001-vmwgfx-fix-missing-array-notation.patch
@@ -0,0 +1,33 @@
+From 77b8183b3395333d5d4c73e25c2d011748f15eda Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Sun, 8 May 2022 03:00:10 +0000
+Subject: 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;
+ }
+--
+2.30.2
+
Reply to: