Date: Saturday, July 21, 2012 @ 06:36:33 Author: andyrtr Revision: 163838
archrelease: copy trunk to extra-i686, extra-x86_64 Added: xf86-video-vesa/repos/extra-i686/PKGBUILD (from rev 163837, xf86-video-vesa/trunk/PKGBUILD) xf86-video-vesa/repos/extra-i686/revert-kernelcheck.patch (from rev 163837, xf86-video-vesa/trunk/revert-kernelcheck.patch) xf86-video-vesa/repos/extra-x86_64/PKGBUILD (from rev 163837, xf86-video-vesa/trunk/PKGBUILD) xf86-video-vesa/repos/extra-x86_64/revert-kernelcheck.patch (from rev 163837, xf86-video-vesa/trunk/revert-kernelcheck.patch) Deleted: xf86-video-vesa/repos/extra-i686/PKGBUILD xf86-video-vesa/repos/extra-i686/revert-kernelcheck.patch xf86-video-vesa/repos/extra-x86_64/PKGBUILD xf86-video-vesa/repos/extra-x86_64/revert-kernelcheck.patch ---------------------------------------+ extra-i686/PKGBUILD | 66 ++++++++++++++++---------------- extra-i686/revert-kernelcheck.patch | 62 +++++++++++++++--------------- extra-x86_64/PKGBUILD | 66 ++++++++++++++++---------------- extra-x86_64/revert-kernelcheck.patch | 62 +++++++++++++++--------------- 4 files changed, 128 insertions(+), 128 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-07-21 10:35:58 UTC (rev 163837) +++ extra-i686/PKGBUILD 2012-07-21 10:36:33 UTC (rev 163838) @@ -1,33 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=xf86-video-vesa -pkgver=2.3.1 -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>=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 - revert-kernelcheck.patch) -sha1sums=('acb4f8104f16476d46ceb366aa932783c3644ead' - 'c14454521ac91aaa08aad8a6025d7720a613d54b') - -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}/" -} Copied: xf86-video-vesa/repos/extra-i686/PKGBUILD (from rev 163837, xf86-video-vesa/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-07-21 10:36:33 UTC (rev 163838) @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=xf86-video-vesa +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>=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 + 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}/" +} Deleted: extra-i686/revert-kernelcheck.patch =================================================================== --- extra-i686/revert-kernelcheck.patch 2012-07-21 10:35:58 UTC (rev 163837) +++ extra-i686/revert-kernelcheck.patch 2012-07-21 10:36:33 UTC (rev 163838) @@ -1,31 +0,0 @@ -From b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f Mon Sep 17 00:00:00 2001 -From: Adam Jackson <a...@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 <a...@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 Copied: xf86-video-vesa/repos/extra-i686/revert-kernelcheck.patch (from rev 163837, xf86-video-vesa/trunk/revert-kernelcheck.patch) =================================================================== --- extra-i686/revert-kernelcheck.patch (rev 0) +++ extra-i686/revert-kernelcheck.patch 2012-07-21 10:36:33 UTC (rev 163838) @@ -0,0 +1,31 @@ +From b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f Mon Sep 17 00:00:00 2001 +From: Adam Jackson <a...@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 <a...@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 Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-07-21 10:35:58 UTC (rev 163837) +++ extra-x86_64/PKGBUILD 2012-07-21 10:36:33 UTC (rev 163838) @@ -1,33 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=xf86-video-vesa -pkgver=2.3.1 -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>=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 - revert-kernelcheck.patch) -sha1sums=('acb4f8104f16476d46ceb366aa932783c3644ead' - 'c14454521ac91aaa08aad8a6025d7720a613d54b') - -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}/" -} Copied: xf86-video-vesa/repos/extra-x86_64/PKGBUILD (from rev 163837, xf86-video-vesa/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-07-21 10:36:33 UTC (rev 163838) @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=xf86-video-vesa +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>=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 + 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}/" +} Deleted: extra-x86_64/revert-kernelcheck.patch =================================================================== --- extra-x86_64/revert-kernelcheck.patch 2012-07-21 10:35:58 UTC (rev 163837) +++ extra-x86_64/revert-kernelcheck.patch 2012-07-21 10:36:33 UTC (rev 163838) @@ -1,31 +0,0 @@ -From b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f Mon Sep 17 00:00:00 2001 -From: Adam Jackson <a...@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 <a...@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 Copied: xf86-video-vesa/repos/extra-x86_64/revert-kernelcheck.patch (from rev 163837, xf86-video-vesa/trunk/revert-kernelcheck.patch) =================================================================== --- extra-x86_64/revert-kernelcheck.patch (rev 0) +++ extra-x86_64/revert-kernelcheck.patch 2012-07-21 10:36:33 UTC (rev 163838) @@ -0,0 +1,31 @@ +From b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f Mon Sep 17 00:00:00 2001 +From: Adam Jackson <a...@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 <a...@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