diff options
| author | root <root@rshg054.dnsready.net> | 2012-10-07 00:37:20 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-10-07 00:37:20 -0700 |
| commit | 682e4a12f537d598cb116ba394ceeae1eafc281e (patch) | |
| tree | b48c04d80686157d339741b922053c2e88b15d68 /testing/xf86-video-vesa | |
| parent | e7552010f531ef1b114352f0ce71a307360bf1d4 (diff) | |
Sun Oct 7 00:37:16 PDT 2012
Diffstat (limited to 'testing/xf86-video-vesa')
| -rw-r--r-- | testing/xf86-video-vesa/PKGBUILD | 33 | ||||
| -rw-r--r-- | testing/xf86-video-vesa/revert-kernelcheck.patch | 31 |
2 files changed, 64 insertions, 0 deletions
diff --git a/testing/xf86-video-vesa/PKGBUILD b/testing/xf86-video-vesa/PKGBUILD new file mode 100644 index 000000000..222c80a1e --- /dev/null +++ b/testing/xf86-video-vesa/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 168246 2012-10-06 20:08:43Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-video-vesa +pkgver=2.3.2 +pkgrel=2 +pkgdesc="X.org vesa video driver" +arch=(i686 x86_64) +license=('custom') +url="http://xorg.freedesktop.org/" +depends=('glibc') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +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/testing/xf86-video-vesa/revert-kernelcheck.patch b/testing/xf86-video-vesa/revert-kernelcheck.patch new file mode 100644 index 000000000..37418cc3f --- /dev/null +++ b/testing/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 |