Date: Tuesday, January 24, 2023 @ 15:26:37
Author: andyrtr
Revision: 467290
archrelease: copy trunk to extra-x86_64
Added:
xf86-video-vmware/repos/extra-x86_64/PKGBUILD
(from rev 467289, xf86-video-vmware/trunk/PKGBUILD)
xf86-video-vmware/repos/extra-x86_64/keys/
Deleted:
xf86-video-vmware/repos/extra-x86_64/PKGBUILD
xf86-video-vmware/repos/extra-x86_64/gcc12.1.diff
xf86-video-vmware/repos/extra-x86_64/gcc8.diff
xf86-video-vmware/repos/extra-x86_64/keys/
--------------+
PKGBUILD | 92 +++++++++++++++------------------
gcc12.1.diff | 13 ----
gcc8.diff | 157 ---------------------------------------------------------
3 files changed, 42 insertions(+), 220 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-24 15:26:30 UTC (rev 467289)
+++ PKGBUILD 2023-01-24 15:26:37 UTC (rev 467290)
@@ -1,50 +0,0 @@
-# Maintainer: Jan de Groot <[email protected]>
-
-pkgname=xf86-video-vmware
-pkgver=13.3.0
-pkgrel=4
-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' 'debug')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
- gcc8.diff
- gcc12.1.diff)
-sha512sums=('c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca'
- 'SKIP'
-
'd05522c84dfa1a88bb9e892087f0a67968142b87f1d7f902e8d77150eae7a26ef7f43cef256d2173be060042b86336123fa7c7f521b37ca98f8fb45871bf30ad'
-
'944fdfac8f7d7feca722ee43f7f3dff8ba3ef82c29012406ed36437ee917e9bfc9aeb33d28891daccc13c323d8862c45f69cb484306737feb8a41a47e8075e60')
-validpgpkeys=('90D027AEAF33CBABC140735BC1F5D3CDF5176580') # Thomas Hellstrom
(VMware) <[email protected]>
-
-prepare() {
- cd $pkgname-${pkgver}
- patch -Np0 -i ../gcc8.diff
- patch -Np1 -i ../gcc12.1.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/extra-x86_64/PKGBUILD (from rev 467289,
xf86-video-vmware/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-01-24 15:26:37 UTC (rev 467290)
@@ -0,0 +1,42 @@
+# Maintainer: Andreas Radke <[email protected]>
+# Contributor: Jan de Groot <[email protected]>
+
+pkgname=xf86-video-vmware
+pkgver=13.4.0
+pkgrel=1
+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.xz{,.sig})
+sha512sums=('7cacde21a490501dd9c2e9121040274c1f6ef64e6dc0ef49946b400f6297fab73a6e9548e45fe8930cee9028e65e45aaff9ba489dd69ac75a5133114726bf55d'
+ 'SKIP')
+#validpgpkeys=('90D027AEAF33CBABC140735BC1F5D3CDF5176580') # Thomas Hellstrom
(VMware) <[email protected]>
+validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer
(Who-T) <[email protected]>
+
+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}/"
+}
Deleted: gcc12.1.diff
===================================================================
--- gcc12.1.diff 2023-01-24 15:26:30 UTC (rev 467289)
+++ gcc12.1.diff 2023-01-24 15:26:37 UTC (rev 467290)
@@ -1,13 +0,0 @@
-diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
-index
acc2b569305de299bf76ec55482cd472853d4df4..480a5f1a825470bfedc62b32d42d514e8cadc368
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;
- }
Deleted: gcc8.diff
===================================================================
--- gcc8.diff 2023-01-24 15:26:30 UTC (rev 467289)
+++ gcc8.diff 2023-01-24 15:26:37 UTC (rev 467290)
@@ -1,157 +0,0 @@
---- 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
