[arch-commits] Commit in xf86-video-vmware/repos (4 files)
Andreas Radke
andyrtr at archlinux.org
Fri May 11 19:14:46 UTC 2018
Date: Friday, May 11, 2018 @ 19:14:45
Author: andyrtr
Revision: 323970
archrelease: copy trunk to staging-x86_64
Added:
xf86-video-vmware/repos/staging-x86_64/
xf86-video-vmware/repos/staging-x86_64/0001-saa-Build-compatibility-with-xserver-1.20.patch
(from rev 323969, xf86-video-vmware/trunk/0001-saa-Build-compatibility-with-xserver-1.20.patch)
xf86-video-vmware/repos/staging-x86_64/PKGBUILD
(from rev 323969, xf86-video-vmware/trunk/PKGBUILD)
xf86-video-vmware/repos/staging-x86_64/gcc8.diff
(from rev 323969, xf86-video-vmware/trunk/gcc8.diff)
------------------------------------------------------+
0001-saa-Build-compatibility-with-xserver-1.20.patch | 33 +++
PKGBUILD | 61 ++++++
gcc8.diff | 157 +++++++++++++++++
3 files changed, 251 insertions(+)
Copied: xf86-video-vmware/repos/staging-x86_64/0001-saa-Build-compatibility-with-xserver-1.20.patch (from rev 323969, xf86-video-vmware/trunk/0001-saa-Build-compatibility-with-xserver-1.20.patch)
===================================================================
--- staging-x86_64/0001-saa-Build-compatibility-with-xserver-1.20.patch (rev 0)
+++ staging-x86_64/0001-saa-Build-compatibility-with-xserver-1.20.patch 2018-05-11 19:14:45 UTC (rev 323970)
@@ -0,0 +1,33 @@
+From 7e5237dd08f2a469d0bc699cbcde763cc93c7407 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Tue, 7 Nov 2017 15:42:59 -0500
+Subject: [PATCH xf86-video-vmware] saa: Build compatibility with xserver 1.20
+
+fbGetRotatedPixmap went away with 24bpp support, just treat it as NULL
+and we'll do the right thing.
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+ saa/saa.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/saa/saa.c b/saa/saa.c
+index be9520e..d956853 100644
+--- a/saa/saa.c
++++ b/saa/saa.c
+@@ -370,6 +370,11 @@ saa_op_reads_destination(CARD8 op)
+ }
+ }
+
++/* compatibility with xserver >= 1.20 */
++#ifndef fbGetRotatedPixmap
++#define fbGetRotatedPixmap(pGC) NULL
++#endif
++
+ static void
+ saa_validate_gc(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
+ {
+--
+2.16.2
+
+
Copied: xf86-video-vmware/repos/staging-x86_64/PKGBUILD (from rev 323969, xf86-video-vmware/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-05-11 19:14:45 UTC (rev 323970)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-vmware
+_commit=6b7dc2f9304298e669e7ac97594b948d1476ae52 # master
+pkgver=xf86+video+vmware+13.0.2+69+g6b7dc2f
+pkgrel=1
+pkgdesc="X.org vmware video driver"
+arch=(x86_64)
+url="https://xorg.freedesktop.org/"
+license=('custom')
+depends=('mesa' 'libsystemd')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=24.0' 'git')
+conflicts=('xorg-server<1.20' 'X-ABI-VIDEODRV_VERSION<24' 'X-ABI-VIDEODRV_VERSION>=25')
+groups=('xorg-drivers')
+options=('!emptydirs')
+#source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig})
+source=("git+https://anongit.freedesktop.org/git/xorg/driver/xf86-video-vmware#commit=$_commit"
+ 0001-saa-Build-compatibility-with-xserver-1.20.patch
+ gcc8.diff)
+sha256sums=('SKIP'
+ 'eb8fcf7b0b886e47c8d8deb12e7d33742223723f76de8122e6161b46fa052403'
+ '76ac76c213a3a27e757d62d59980ddd65b34ac02bd0e4efb00833fc69c01793e')
+validpgpkeys=('90D027AEAF33CBABC140735BC1F5D3CDF5176580') # Thomas Hellstrom (VMware) <thellstrom at vmware.com>
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+ # xorg-server 1.20 build fix by FC
+ patch -Np1 -i ../0001-saa-Build-compatibility-with-xserver-1.20.patch
+
+ patch -Np0 -i ../gcc8.diff
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+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 323969, xf86-video-vmware/trunk/gcc8.diff)
===================================================================
--- staging-x86_64/gcc8.diff (rev 0)
+++ staging-x86_64/gcc8.diff 2018-05-11 19:14:45 UTC (rev 323970)
@@ -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