[arch-commits] Commit in xf86-video-vesa/repos (3 files)

[Andreas Radke]

    Date: Sunday, November 7, 2021 @ 11:34:27
  Author: andyrtr
Revision: 427463

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-vesa/repos/staging-x86_64/
  xf86-video-vesa/repos/staging-x86_64/PKGBUILD
    (from rev 427462, xf86-video-vesa/trunk/PKGBUILD)
  xf86-video-vesa/repos/staging-x86_64/revert-kernelcheck.patch
    (from rev 427462, xf86-video-vesa/trunk/revert-kernelcheck.patch)

--------------------------+
 PKGBUILD                 |   46 +++++++++++++++++++++++++++++++++++++++++++++
 revert-kernelcheck.patch |   31 ++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)

Copied: xf86-video-vesa/repos/staging-x86_64/PKGBUILD (from rev 427462, xf86-video-vesa/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2021-11-07 11:34:27 UTC (rev 427463)
@@ -0,0 +1,46 @@
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-vesa
+pkgver=2.5.0
+pkgrel=2
+pkgdesc="X.org vesa video driver"
+arch=(x86_64)
+license=('custom')
+url="https://xorg.freedesktop.org/"
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=25.2')
+conflicts=('xorg-server<21.1.1' 'X-ABI-VIDEODRV_VERSION<25' 'X-ABI-VIDEODRV_VERSION>=26')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
+        revert-kernelcheck.patch)
+sha512sums=('36fd921f54f33eb25966b5f9ea1e1b3e9009965c012c8b9c676686b472111719921b80cf62dafc746058878253e21f0ef341a2ff2d650df22ca1e35e81716a8b'
+            'SKIP'
+            '2357f9b30732321c774073c3e233d16ebff29aab31bcebf7c6481bd2187554e85ec8b9cd375eaa836b433dfaba4d9e9cea1dcf3659803a388ceb6699ed905923')
+validpgpkeys=('DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') #  "Adam Jackson <ajax at nwnk.net>"
+validpgpkeys+=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # "Adam Jackson <ajax at nwnk.net>"
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch"
+}
+
+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
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Copied: xf86-video-vesa/repos/staging-x86_64/revert-kernelcheck.patch (from rev 427462, xf86-video-vesa/trunk/revert-kernelcheck.patch)
===================================================================
--- staging-x86_64/revert-kernelcheck.patch	                        (rev 0)
+++ staging-x86_64/revert-kernelcheck.patch	2021-11-07 11:34:27 UTC (rev 427463)
@@ -0,0 +1,31 @@
+From b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Wed, 08 Dec 2010 18:45:32 +0000
+Subject: Refuse to load if there's a kernel driver bound to the device
+
+Ported from the equivalent check in nv.
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/vesa.c b/src/vesa.c
+index 168fde1..2523d76 100644
+--- a/src/vesa.c
++++ b/src/vesa.c
+@@ -431,8 +431,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
+     pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, 
+ 				NULL, NULL, NULL, NULL, NULL);
+     if (pScrn != NULL) {
+-	VESAPtr pVesa = VESAGetRec(pScrn);
++	VESAPtr pVesa;
+ 
++	if (pci_device_has_kernel_driver(dev)) {
++	    ErrorF("vesa: Ignoring device with a bound kernel driver\n");
++	    return FALSE;
++	}
++
++	pVesa = VESAGetRec(pScrn);
+ 	VESAInitScrn(pScrn);
+ 	pVesa->pciInfo = dev;
+     }
+--
+cgit v0.9.0.2-2-gbebe