[arch-commits] Commit in xf86-video-vmware/repos (3 files)
Andreas Radke
andyrtr at gemini.archlinux.org
Sun Nov 7 16:51:06 UTC 2021
Date: Sunday, November 7, 2021 @ 16:51:06
Author: andyrtr
Revision: 427470
archrelease: copy trunk to staging-x86_64
Added:
xf86-video-vmware/repos/staging-x86_64/
xf86-video-vmware/repos/staging-x86_64/PKGBUILD
(from rev 427469, xf86-video-vmware/trunk/PKGBUILD)
xf86-video-vmware/repos/staging-x86_64/gcc8.diff
(from rev 427469, xf86-video-vmware/trunk/gcc8.diff)
-----------+
PKGBUILD | 47 +++++++++++++++++
gcc8.diff | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 204 insertions(+)
Copied: xf86-video-vmware/repos/staging-x86_64/PKGBUILD (from rev 427469, xf86-video-vmware/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2021-11-07 16:51:06 UTC (rev 427470)
@@ -0,0 +1,47 @@
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-vmware
+pkgver=13.3.0
+pkgrel=3
+pkgdesc="X.org vmware video driver"
+arch=(x86_64)
+url="https://xorg.freedesktop.org/"
+license=('custom')
+depends=('mesa' 'systemd-libs')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=25.2') # 'git')
+conflicts=('xorg-server<21.1.1' 'X-ABI-VIDEODRV_VERSION<25' 'X-ABI-VIDEODRV_VERSION>=26')
+groups=('xorg-drivers')
+options=('!emptydirs')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
+ gcc8.diff)
+sha512sums=('c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca'
+ 'SKIP'
+ 'd05522c84dfa1a88bb9e892087f0a67968142b87f1d7f902e8d77150eae7a26ef7f43cef256d2173be060042b86336123fa7c7f521b37ca98f8fb45871bf30ad')
+validpgpkeys=('90D027AEAF33CBABC140735BC1F5D3CDF5176580') # Thomas Hellstrom (VMware) <thellstrom at vmware.com>
+
+prepare() {
+ cd $pkgname-${pkgver}
+ patch -Np0 -i ../gcc8.diff
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
+ # With them, module fail to load with undefined symbol.
+ # See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
+ export CFLAGS=${CFLAGS/-fno-plt}
+ export CXXFLAGS=${CXXFLAGS/-fno-plt}
+ export LDFLAGS=${LDFLAGS/,-z,now}
+
+ ./configure --prefix=/usr --enable-vmwarectrl-client
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Copied: xf86-video-vmware/repos/staging-x86_64/gcc8.diff (from rev 427469, xf86-video-vmware/trunk/gcc8.diff)
===================================================================
--- staging-x86_64/gcc8.diff (rev 0)
+++ staging-x86_64/gcc8.diff 2021-11-07 16:51:06 UTC (rev 427470)
@@ -0,0 +1,157 @@
+--- src/vmware.h 2018-05-11 17:43:24.776710047 +0200
++++ 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
+--- src/vmware.c 2018-05-11 17:28:30.612158774 +0200
++++ 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);
+--- src/vmware_bootstrap.c 2018-05-11 20:59:15.003530525 +0200
++++ 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
More information about the arch-commits
mailing list