[arch-commits] Commit in xf86-video-vesa/trunk (PKGBUILD revert-kernelcheck.patch)

[Jan de Groot]

    Date: Monday, October 17, 2011 @ 05:54:06
  Author: jgc
Revision: 140591

upgpkg: xf86-video-vesa 2.3.0-7

Remove check for kernel driver, fixes FS#26407

Added:
  xf86-video-vesa/trunk/revert-kernelcheck.patch
Modified:
  xf86-video-vesa/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |    9 ++++++---
 revert-kernelcheck.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-17 08:52:42 UTC (rev 140590)
+++ PKGBUILD	2011-10-17 09:54:06 UTC (rev 140591)
@@ -3,7 +3,7 @@
 
 pkgname=xf86-video-vesa
 pkgver=2.3.0
-pkgrel=6
+pkgrel=7
 pkgdesc="X.org vesa video driver"
 arch=(i686 x86_64)
 license=('custom')
@@ -14,13 +14,16 @@
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch)
+        git-fixes.patch
+        revert-kernelcheck.patch)
 sha1sums=('4689b7c295d7a8d7326302dafecb812739617134'
-          '1e54ae50daa796ab0c29c8088f25e522dc6faa4a')
+          '1e54ae50daa796ab0c29c8088f25e522dc6faa4a'
+          'c14454521ac91aaa08aad8a6025d7720a613d54b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/git-fixes.patch"
+  patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch"
   autoreconf -fi
   ./configure --prefix=/usr
   make

Added: revert-kernelcheck.patch
===================================================================
--- revert-kernelcheck.patch	                        (rev 0)
+++ revert-kernelcheck.patch	2011-10-17 09:54:06 UTC (rev 140591)
@@ -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