[arch-commits] Commit in xf86-video-vmware/trunk (2 files)
Andreas Radke
andyrtr at archlinux.org
Thu May 17 10:11:55 UTC 2018
Date: Thursday, May 17, 2018 @ 10:11:55
Author: andyrtr
Revision: 324441
upgpkg: xf86-video-vmware 13.3.0-1
upstream update 13.3.0
Modified:
xf86-video-vmware/trunk/PKGBUILD
Deleted:
xf86-video-vmware/trunk/0001-saa-Build-compatibility-with-xserver-1.20.patch
------------------------------------------------------+
0001-saa-Build-compatibility-with-xserver-1.20.patch | 33 -----------------
PKGBUILD | 29 ++++----------
2 files changed, 8 insertions(+), 54 deletions(-)
Deleted: 0001-saa-Build-compatibility-with-xserver-1.20.patch
===================================================================
--- 0001-saa-Build-compatibility-with-xserver-1.20.patch 2018-05-17 10:09:08 UTC (rev 324440)
+++ 0001-saa-Build-compatibility-with-xserver-1.20.patch 2018-05-17 10:11:55 UTC (rev 324441)
@@ -1,33 +0,0 @@
-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
-
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-17 10:09:08 UTC (rev 324440)
+++ PKGBUILD 2018-05-17 10:11:55 UTC (rev 324441)
@@ -2,8 +2,7 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=xf86-video-vmware
-_commit=6b7dc2f9304298e669e7ac97594b948d1476ae52 # master
-pkgver=13.0.2+69+g6b7dc2f
+pkgver=13.3.0
pkgrel=1
pkgdesc="X.org vmware video driver"
arch=(x86_64)
@@ -14,32 +13,20 @@
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
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
gcc8.diff)
-sha256sums=('SKIP'
- 'eb8fcf7b0b886e47c8d8deb12e7d33742223723f76de8122e6161b46fa052403'
- '76ac76c213a3a27e757d62d59980ddd65b34ac02bd0e4efb00833fc69c01793e')
+sha512sums=('c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca'
+ 'SKIP'
+ 'd05522c84dfa1a88bb9e892087f0a67968142b87f1d7f902e8d77150eae7a26ef7f43cef256d2173be060042b86336123fa7c7f521b37ca98f8fb45871bf30ad')
validpgpkeys=('90D027AEAF33CBABC140735BC1F5D3CDF5176580') # Thomas Hellstrom (VMware) <thellstrom at vmware.com>
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/^xf86-video-vmware-//;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
-
+ cd $pkgname-${pkgver}
patch -Np0 -i ../gcc8.diff
-
- NOCONFIGURE=1 ./autogen.sh
}
build() {
- cd ${pkgname} #-${pkgver}
+ 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.
@@ -53,7 +40,7 @@
}
package() {
- cd ${pkgname} #-${pkgver}
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
More information about the arch-commits
mailing list