From cfae931399737af0b09104a026ef3dc7be816467 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Mon, 17 Jul 2023 09:10:37 +0200 Subject: [PATCH] xf86-video-vmware: update to 13.4.0. --- .../patches/fix-compat-gcc12.patch | 30 ---- srcpkgs/xf86-video-vmware/patches/gcc82.patch | 157 ------------------ srcpkgs/xf86-video-vmware/template | 8 +- 3 files changed, 4 insertions(+), 191 deletions(-) delete mode 100644 srcpkgs/xf86-video-vmware/patches/fix-compat-gcc12.patch delete mode 100644 srcpkgs/xf86-video-vmware/patches/gcc82.patch diff --git a/srcpkgs/xf86-video-vmware/patches/fix-compat-gcc12.patch b/srcpkgs/xf86-video-vmware/patches/fix-compat-gcc12.patch deleted file mode 100644 index ff839f16e628..000000000000 --- a/srcpkgs/xf86-video-vmware/patches/fix-compat-gcc12.patch +++ /dev/null @@ -1,30 +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] 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/patches/gcc82.patch b/srcpkgs/xf86-video-vmware/patches/gcc82.patch deleted file mode 100644 index b4c624a3b4eb..000000000000 --- a/srcpkgs/xf86-video-vmware/patches/gcc82.patch +++ /dev/null @@ -1,157 +0,0 @@ ---- a/src/vmware.h 2018-05-11 17:43:24.776710047 +0200 -+++ b/src/vmware.h.new 2018-05-11 17:45:16.599821536 +0200 -@@ -83,7 +83,7 @@ - - typedef struct { - EntityInfoPtr pEnt; --#if XSERVER_LIBPCIACCESS -+#ifdef XSERVER_LIBPCIACCESS - struct pci_device *PciInfo; - #else - pciVideoPtr PciInfo; -@@ -207,7 +207,7 @@ - /* Undefine this to kill all acceleration */ - #define ACCELERATE_OPS - --#if XSERVER_LIBPCIACCESS -+#ifdef XSERVER_LIBPCIACCESS - #define VENDOR_ID(p) (p)->vendor_id - #define DEVICE_ID(p) (p)->device_id - #define SUBVENDOR_ID(p) (p)->subvendor_id ---- a/src/vmware.c 2018-05-11 17:28:30.612158774 +0200 -+++ b/src/vmware.c.new 2018-05-11 17:38:40.108785284 +0200 -@@ -341,7 +341,7 @@ - SVGA_LEGACY_BASE_PORT + SVGA_VALUE_PORT*sizeof(uint32); - } else { - /* Note: This setting of valueReg causes unaligned I/O */ --#if XSERVER_LIBPCIACCESS -+#ifdef XSERVER_LIBPCIACCESS - pVMWARE->portIOBase = pVMWARE->PciInfo->regions[0].base_addr; - #else - pVMWARE->portIOBase = pVMWARE->PciInfo->ioBase[0]; -@@ -383,7 +383,7 @@ - } - pVMWARE->suspensionSavedRegId = id; - --#if !XSERVER_LIBPCIACCESS -+#ifndef XSERVER_LIBPCIACCESS - pVMWARE->PciTag = pciTag(pVMWARE->PciInfo->bus, pVMWARE->PciInfo->device, - pVMWARE->PciInfo->func); - #endif -@@ -727,13 +727,13 @@ - VMWAREMapMem(ScrnInfoPtr pScrn) - { - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); --#if XSERVER_LIBPCIACCESS -+#ifdef XSERVER_LIBPCIACCESS - int err; - struct pci_device *const device = pVMWARE->PciInfo; - void *fbBase; - #endif - --#if XSERVER_LIBPCIACCESS -+#ifdef XSERVER_LIBPCIACCESS - err = pci_device_map_range(device, - pVMWARE->memPhysBase, - pVMWARE->videoRam, -@@ -770,7 +770,7 @@ - - VmwareLog(("Unmapped: %p/%u\n", pVMWARE->FbBase, pVMWARE->videoRam)); - --#if XSERVER_LIBPCIACCESS -+#ifdef XSERVER_LIBPCIACCESS - pci_device_unmap_range(pVMWARE->PciInfo, pVMWARE->FbBase, pVMWARE->videoRam); - #else - xf86UnMapVidMem(pScrn->scrnIndex, pVMWARE->FbBase, pVMWARE->videoRam); -@@ -1045,7 +1045,7 @@ - VMWAREInitFIFO(ScrnInfoPtr pScrn) - { - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); --#if XSERVER_LIBPCIACCESS -+#ifdef XSERVER_LIBPCIACCESS - struct pci_device *const device = pVMWARE->PciInfo; - int err; - void *mmioVirtBase; -@@ -1058,7 +1058,7 @@ - - pVMWARE->mmioPhysBase = vmwareReadReg(pVMWARE, SVGA_REG_MEM_START); - pVMWARE->mmioSize = vmwareReadReg(pVMWARE, SVGA_REG_MEM_SIZE) & ~3; --#if XSERVER_LIBPCIACCESS -+#ifdef XSERVER_LIBPCIACCESS - err = pci_device_map_range(device, pVMWARE->mmioPhysBase, - pVMWARE->mmioSize, - PCI_DEV_MAP_FLAG_WRITABLE, -@@ -1099,7 +1099,7 @@ - TRACEPOINT - - vmwareWriteReg(pVMWARE, SVGA_REG_CONFIG_DONE, 0); --#if XSERVER_LIBPCIACCESS -+#ifdef XSERVER_LIBPCIACCESS - pci_device_unmap_range(pVMWARE->PciInfo, pVMWARE->mmioVirtBase, pVMWARE->mmioSize); - #else - xf86UnMapVidMem(pScrn->scrnIndex, pVMWARE->mmioVirtBase, pVMWARE->mmioSize); ---- a/src/vmware_bootstrap.c 2018-05-11 20:59:15.003530525 +0200 -+++ b/src/vmware_bootstrap.c.new 2018-05-11 21:02:11.228289137 +0200 -@@ -91,7 +91,7 @@ - VMW_STRING(PACKAGE_VERSION_MAJOR) "." VMW_STRING(PACKAGE_VERSION_MINOR) \ - "." VMW_STRING(PACKAGE_VERSION_PATCHLEVEL) - --#if !XSERVER_LIBPCIACCESS -+#ifndef XSERVER_LIBPCIACCESS - static const char VMWAREBuildStr[] = "VMware Guest X Server " - VMWARE_DRIVER_VERSION_STRING " - build=$Name$\n"; - #else -@@ -127,7 +127,7 @@ - #define vmwareLegacyRes NULL - #endif - --#if XSERVER_LIBPCIACCESS -+#ifdef XSERVER_LIBPCIACCESS - #define VENDOR_ID(p) (p)->vendor_id - #define DEVICE_ID(p) (p)->device_id - #define SUBVENDOR_ID(p) (p)->subvendor_id -@@ -141,7 +141,7 @@ - #define CHIP_REVISION(p) (p)->chipRev - #endif - --#if XSERVER_LIBPCIACCESS -+#ifdef XSERVER_LIBPCIACCESS - - #define VMWARE_DEVICE_MATCH(d, i) \ - {PCI_VENDOR_ID_VMWARE, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) } -@@ -220,7 +220,7 @@ - static Bool - VMwarePreinitStub(ScrnInfoPtr pScrn, int flags) - { --#if XSERVER_LIBPCIACCESS -+#ifdef XSERVER_LIBPCIACCESS - struct pci_device *pciInfo; - #else - pciVideoPtr pciInfo; -@@ -270,7 +270,7 @@ - return (*pScrn->PreInit)(pScrn, flags); - }; - --#if XSERVER_LIBPCIACCESS -+#ifdef XSERVER_LIBPCIACCESS - static Bool - VMwarePciProbe (DriverPtr drv, - int entity_num, -@@ -520,7 +520,7 @@ - VMWARE_DRIVER_VERSION, - vmware_driver_name, - VMWAREIdentify, --#if XSERVER_LIBPCIACCESS -+#ifdef XSERVER_LIBPCIACCESS - NULL, - #else - VMWAREProbe, -@@ -532,7 +532,7 @@ - VMWareDriverFunc, - #endif - #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 4 --#if XSERVER_LIBPCIACCESS -+#ifdef XSERVER_LIBPCIACCESS - VMwareDeviceMatch, - VMwarePciProbe, - #else diff --git a/srcpkgs/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template index 14264e1415be..d4cad30b55c7 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=4 +version=13.4.0 +revision=1 archs="i686* x86_64*" build_style=gnu-configure configure_args="--enable-vmwarectrl-client" @@ -12,8 +12,8 @@ short_desc="Modular Xorg VMware virtual video driver" maintainer="Orphaned " license="MIT" homepage="http://xorg.freedesktop.org" -distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" -checksum=47971924659e51666a757269ad941a059ef5afe7a47b5101c174a6022ac4066c +distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.gz" +checksum=d2667ab30350fb1c39393fc4b79ac33ef8b67d5d6cefeb6fb99b111758031b98 lib32disabled=yes