summaryrefslogtreecommitdiffstats
path: root/abs/core/xf86-video-vesa
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core/xf86-video-vesa')
-rw-r--r--abs/core/xf86-video-vesa/PKGBUILD23
-rw-r--r--abs/core/xf86-video-vesa/revert-kernelcheck.patch31
2 files changed, 46 insertions, 8 deletions
diff --git a/abs/core/xf86-video-vesa/PKGBUILD b/abs/core/xf86-video-vesa/PKGBUILD
index 0b5dbf3..565aeab 100644
--- a/abs/core/xf86-video-vesa/PKGBUILD
+++ b/abs/core/xf86-video-vesa/PKGBUILD
@@ -1,25 +1,32 @@
-# $Id: PKGBUILD 88551 2010-08-24 08:35:22Z jgc $
+# $Id: PKGBUILD 163838 2012-07-21 10:36:33Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xf86-video-vesa
-pkgver=2.3.0
-pkgrel=3
+pkgver=2.3.2
+pkgrel=1
pkgdesc="X.org vesa video driver"
arch=(i686 x86_64)
license=('custom')
url="http://xorg.freedesktop.org/"
depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server-devel')
-conflicts=('xorg-server<1.9.0')
-groups=('xorg' 'xorg-video-drivers')
+makedepends=('pkgconfig' 'xorg-server-devel>=1.11.99.903')
+conflicts=('xorg-server<1.11.99.903')
+groups=('xorg-drivers' 'xorg')
options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('4689b7c295d7a8d7326302dafecb812739617134')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ revert-kernelcheck.patch)
+sha256sums=('144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3'
+ 'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch"
./configure --prefix=/usr
make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/abs/core/xf86-video-vesa/revert-kernelcheck.patch b/abs/core/xf86-video-vesa/revert-kernelcheck.patch
new file mode 100644
index 0000000..37418cc
--- /dev/null
+++ b/abs/core/xf86-video-vesa/revert-kernelcheck.patch
@@ -0,0 +1,31 @@
+From b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@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@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