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

[Laurent Carlier]

Date: Monday, November 21, 2016 @ 11:57:01
  Author: lcarlier
Revision: 281721

archrelease: copy trunk to staging-i686, staging-x86_64

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

-+
 staging-i686/PKGBUILD   |   38 ++
 staging-i686/revert-kernelcheck.patch   |   31 
 staging-x86_64/PKGBUILD |   38 ++
 staging-x86_64/revert-kernelcheck.patch |   31 
 4 files changed, 138 insertions(+)

Copied: xf86-video-vesa/repos/staging-i686/PKGBUILD (from rev 281720, 
xf86-video-vesa/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2016-11-21 11:57:01 UTC (rev 281721)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan de Groot 
+
+pkgname=xf86-video-vesa
+pkgver=2.3.4
+pkgrel=3
+pkgdesc="X.org vesa video driver"
+arch=(i686 x86_64)
+license=('custom')
+url="https://xorg.freedesktop.org/;
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 
'X-ABI-VIDEODRV_VERSION>=24')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
+revert-kernelcheck.patch)
+sha256sums=('7bddf4d879dd6f67088ecb203a31e12334aab980174bd0909930a21f32e251c1'
+'SKIP'
+'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c')
+validpgpkeys=('DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') #  "Adam Jackson 
"
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch"
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./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-i686/revert-kernelcheck.patch (from rev 
281720, xf86-video-vesa/trunk/revert-kernelcheck.patch)
===
--- staging-i686/revert-kernelcheck.patch   (rev 0)
+++ staging-i686/revert-kernelcheck.patch   2016-11-21 11:57:01 UTC (rev 
281721)
@@ -0,0 +1,31 @@
+From b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f Mon Sep 17 00:00:00 2001
+From: Adam Jackson 
+Date: Wed, 08 Dec 2010 18:45:32 +
+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 
+---
+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/staging-x86_64/PKGBUILD (from rev 281720, 
xf86-video-vesa/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2016-11-21 11:57:01 UTC (rev 281721)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan de Groot 
+
+pkgname=xf86-video-vesa
+pkgver=2.3.4
+pkgrel=3
+pkgdesc="X.org vesa video driver"
+arch=(i686 x86_64)
+license=('custom')
+url="https://xorg.freedesktop.org/;
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 
'X-ABI-VIDEODRV_VERSION>=24')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
+revert-kernelcheck.patch)
+sha256sums=('7bddf4d879dd6f67088ecb203a31e12334aab980174bd0909930a21f32e251c1'
+'SKIP'
+

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

[Andreas Radke]

Date: Wednesday, November 11, 2015 @ 10:47:39
  Author: andyrtr
Revision: 250730

archrelease: copy trunk to staging-i686, staging-x86_64

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

-+
 staging-i686/PKGBUILD   |   38 ++
 staging-i686/revert-kernelcheck.patch   |   31 
 staging-x86_64/PKGBUILD |   38 ++
 staging-x86_64/revert-kernelcheck.patch |   31 
 4 files changed, 138 insertions(+)

Copied: xf86-video-vesa/repos/staging-i686/PKGBUILD (from rev 250729, 
xf86-video-vesa/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-11-11 09:47:39 UTC (rev 250730)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan de Groot 
+
+pkgname=xf86-video-vesa
+pkgver=2.3.4
+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=20')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 
'X-ABI-VIDEODRV_VERSION>=21')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
+revert-kernelcheck.patch)
+sha256sums=('7bddf4d879dd6f67088ecb203a31e12334aab980174bd0909930a21f32e251c1'
+'SKIP'
+'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c')
+validpgpkeys=('DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') #  "Adam Jackson 
"
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch"
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./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-i686/revert-kernelcheck.patch (from rev 
250729, xf86-video-vesa/trunk/revert-kernelcheck.patch)
===
--- staging-i686/revert-kernelcheck.patch   (rev 0)
+++ staging-i686/revert-kernelcheck.patch   2015-11-11 09:47:39 UTC (rev 
250730)
@@ -0,0 +1,31 @@
+From b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f Mon Sep 17 00:00:00 2001
+From: Adam Jackson 
+Date: Wed, 08 Dec 2010 18:45:32 +
+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 
+---
+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/staging-x86_64/PKGBUILD (from rev 250729, 
xf86-video-vesa/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-11-11 09:47:39 UTC (rev 250730)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan de Groot 
+
+pkgname=xf86-video-vesa
+pkgver=2.3.4
+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=20')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 
'X-ABI-VIDEODRV_VERSION>=21')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
+revert-kernelcheck.patch)
+sha256sums=('7bddf4d879dd6f67088ecb203a31e12334aab980174bd0909930a21f32e251c1'
+'SKIP'
+

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

[andyrtr]

Date: Saturday, October 6, 2012 @ 14:44:20
  Author: andyrtr
Revision: 168188

archrelease: copy trunk to staging-i686, staging-x86_64

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

-+
 staging-i686/PKGBUILD   |   33 ++
 staging-i686/revert-kernelcheck.patch   |   31 
 staging-x86_64/PKGBUILD |   33 ++
 staging-x86_64/revert-kernelcheck.patch |   31 
 4 files changed, 128 insertions(+)

Copied: xf86-video-vesa/repos/staging-i686/PKGBUILD (from rev 168187, 
xf86-video-vesa/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-10-06 18:44:20 UTC (rev 168188)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot j...@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-server1.13.0' 'X-ABI-VIDEODRV_VERSION13' 
'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}/
+}

Copied: xf86-video-vesa/repos/staging-i686/revert-kernelcheck.patch (from rev 
168187, xf86-video-vesa/trunk/revert-kernelcheck.patch)
===
--- staging-i686/revert-kernelcheck.patch   (rev 0)
+++ staging-i686/revert-kernelcheck.patch   2012-10-06 18:44:20 UTC (rev 
168188)
@@ -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 +
+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/staging-x86_64/PKGBUILD (from rev 168187, 
xf86-video-vesa/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-10-06 18:44:20 UTC (rev 168188)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot j...@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-server1.13.0' 'X-ABI-VIDEODRV_VERSION13' 
'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