diff --git a/.gitignore b/.gitignore index ea3fa61..4f8c9e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1 @@ -xf86-video-vmware-10.16.7.tar.bz2 -xf86-video-vmware-11.0.1.tar.bz2 -/xf86-video-vmware-11.0.3.tar.bz2 -/xf86-video-vmware-12.0.1.tar.bz2 -/xf86-video-vmware-12.0.2.tar.bz2 -/xf86-video-vmware-20120718.tar.bz2 -/xf86-video-vmware-20130109.tar.bz2 -/xf86-video-vmware-13.0.1.tar.bz2 -/xf86-video-vmware-20131207.tar.bz2 -/xf86-video-vmware-13.0.2.tar.bz2 -/xf86-video-vmware-20140613.tar.bz2 -/xf86-video-vmware-20150211.tar.bz2 -/xf86-video-vmware-13.2.1.tar.bz2 -/xf86-video-vmware-13.3.0.tar.bz2 +/xf86-video-vmware-*.tar.xz diff --git a/0012-vmwgfx-Change-header-inclusion-order-to-avoid-xorg-h.patch b/0012-vmwgfx-Change-header-inclusion-order-to-avoid-xorg-h.patch deleted file mode 100644 index 941dc30..0000000 --- a/0012-vmwgfx-Change-header-inclusion-order-to-avoid-xorg-h.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 50ab008cb965dc9e47e0a84a1950e2485bbd3c44 Mon Sep 17 00:00:00 2001 -From: Martin Krastev -Date: Tue, 30 Nov 2021 11:47:39 -0800 -Subject: [PATCH 12/18] vmwgfx: Change header inclusion order to avoid xorg - headers catching stdbool.h - -libdrm commit e641e2a632d779f638ac2ba983b9fceb20b3fac4 added -stdbool.h to the library headers which conflicts with xorg headers. - -Signed-off-by: Martin Krastev -Reviewed-by: Zack Rusin -Signed-off-by: Zack Rusin ---- - vmwgfx/vmwgfx_driver.h | 6 +++--- - vmwgfx/vmwgfx_saa.c | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/vmwgfx/vmwgfx_driver.h b/vmwgfx/vmwgfx_driver.h -index fa8e308..467fb21 100644 ---- a/vmwgfx/vmwgfx_driver.h -+++ b/vmwgfx/vmwgfx_driver.h -@@ -36,15 +36,15 @@ - #include - #include - #include --#include --#include --#include - #include - #include - #include - #include - #include - #include -+#include -+#include -+#include - - #include "../src/compat-api.h" - #ifdef DRI2 -diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c -index 0881e2f..457f397 100644 ---- a/vmwgfx/vmwgfx_saa.c -+++ b/vmwgfx/vmwgfx_saa.c -@@ -29,11 +29,11 @@ - #include - #include - #include --#include - #include - #include "vmwgfx_saa.h" - #include "vmwgfx_drmi.h" - #include "vmwgfx_saa_priv.h" -+#include - - /* - * Damage to be added as soon as we attach storage to the pixmap. --- -2.38.1 - diff --git a/0013-vmwgfx-fix-missing-array-notation.patch b/0013-vmwgfx-fix-missing-array-notation.patch deleted file mode 100644 index 5692b32..0000000 --- a/0013-vmwgfx-fix-missing-array-notation.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 77b8183b3395333d5d4c73e25c2d011748f15eda Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Sun, 8 May 2022 03:00:10 +0000 -Subject: [PATCH 13/18] 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.38.1 - diff --git a/sources b/sources index 2070a6e..7933047 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xf86-video-vmware-13.3.0.tar.bz2) = c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca +SHA512 (xf86-video-vmware-13.4.0.tar.xz) = 7cacde21a490501dd9c2e9121040274c1f6ef64e6dc0ef49946b400f6297fab73a6e9548e45fe8930cee9028e65e45aaff9ba489dd69ac75a5133114726bf55d diff --git a/xorg-x11-drv-vmware.spec b/xorg-x11-drv-vmware.spec index 207c21b..bfab542 100644 --- a/xorg-x11-drv-vmware.spec +++ b/xorg-x11-drv-vmware.spec @@ -12,18 +12,15 @@ Summary: Xorg X11 vmware video driver Name: xorg-x11-drv-vmware -Version: 13.3.0 -Release: 2%{?dist} +Version: 13.4.0 +Release: 1%{?dist} URL: http://www.x.org License: MIT %if 0%{?gitdate} Source0: %{tarball}-%{gitdate}.tar.bz2 %else -Source0: https://ftp.x.org/archive/individual/driver/%{tarball}-%{version}.tar.bz2 -# upstream compile fixes -Patch12: 0012-vmwgfx-Change-header-inclusion-order-to-avoid-xorg-h.patch -Patch13: 0013-vmwgfx-fix-missing-array-notation.patch +Source0: https://ftp.x.org/archive/individual/driver/%{tarball}-%{version}.tar.xz %endif ExclusiveArch: %{ix86} x86_64 ia64 @@ -39,7 +36,7 @@ Requires: Xorg %(xserver-sdk-abi-requires ansic) Requires: Xorg %(xserver-sdk-abi-requires videodrv) Requires: libxatracker >= 8.0.1-4 -%description +%description X.Org X11 vmware video driver. %prep @@ -62,6 +59,9 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- %{_mandir}/man4/vmware.4* %changelog +* Tue Jan 24 2023 Peter Hutterer - 13.4.0-1 +- vmware 13.4.0 + * Sat Jan 21 2023 Fedora Release Engineering - 13.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild