[arch-commits] Commit in xf86-video-vesa/repos (10 files)
Andreas Radke
andyrtr at archlinux.org
Wed Jun 24 17:07:23 UTC 2015
Date: Wednesday, June 24, 2015 @ 19:07:23
Author: andyrtr
Revision: 241257
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xf86-video-vesa/repos/extra-i686/PKGBUILD
(from rev 241256, xf86-video-vesa/trunk/PKGBUILD)
xf86-video-vesa/repos/extra-i686/revert-kernelcheck.patch
(from rev 241256, xf86-video-vesa/trunk/revert-kernelcheck.patch)
xf86-video-vesa/repos/extra-x86_64/PKGBUILD
(from rev 241256, xf86-video-vesa/trunk/PKGBUILD)
xf86-video-vesa/repos/extra-x86_64/revert-kernelcheck.patch
(from rev 241256, xf86-video-vesa/trunk/revert-kernelcheck.patch)
Deleted:
xf86-video-vesa/repos/extra-i686/PKGBUILD
xf86-video-vesa/repos/extra-i686/git-fixes.patch
xf86-video-vesa/repos/extra-i686/revert-kernelcheck.patch
xf86-video-vesa/repos/extra-x86_64/PKGBUILD
xf86-video-vesa/repos/extra-x86_64/git-fixes.patch
xf86-video-vesa/repos/extra-x86_64/revert-kernelcheck.patch
---------------------------------------+
/PKGBUILD | 76 ++++++++++++++++++++++++++++++++
/revert-kernelcheck.patch | 62 ++++++++++++++++++++++++++
extra-i686/PKGBUILD | 39 ----------------
extra-i686/git-fixes.patch | 55 -----------------------
extra-i686/revert-kernelcheck.patch | 31 -------------
extra-x86_64/PKGBUILD | 39 ----------------
extra-x86_64/git-fixes.patch | 55 -----------------------
extra-x86_64/revert-kernelcheck.patch | 31 -------------
8 files changed, 138 insertions(+), 250 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-06-24 17:07:10 UTC (rev 241256)
+++ extra-i686/PKGBUILD 2015-06-24 17:07:23 UTC (rev 241257)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-vesa
-pkgver=2.3.2
-pkgrel=6
-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=19')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
- revert-kernelcheck.patch
- git-fixes.patch)
-sha256sums=('144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3'
- 'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c'
- 'beba7e8499b1d0b457762e28e7e413b223cbe87a84a39a3566e96c44da8544a1')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch"
- patch -Np1 -i ${srcdir}/git-fixes.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/extra-i686/PKGBUILD (from rev 241256, xf86-video-vesa/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-06-24 17:07:23 UTC (rev 241257)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-vesa
+pkgver=2.3.4
+pkgrel=1
+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=19')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20')
+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 <ajax at nwnk.net>"
+
+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}/"
+}
Deleted: extra-i686/git-fixes.patch
===================================================================
--- extra-i686/git-fixes.patch 2015-06-24 17:07:10 UTC (rev 241256)
+++ extra-i686/git-fixes.patch 2015-06-24 17:07:23 UTC (rev 241257)
@@ -1,55 +0,0 @@
-From 7aafaf56fbca97f36c775462c1ceea3e03700c42 Mon Sep 17 00:00:00 2001
-From: Alexandr Shadchin <alexandr.shadchin at gmail.com>
-Date: Sat, 18 Aug 2012 14:53:34 +0000
-Subject: Fix check function in VESASaveRestore
-
-Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin at gmail.com>
-Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
----
-diff --git a/src/vesa.c b/src/vesa.c
-index 8ac77da..11cd26c 100644
---- a/src/vesa.c
-+++ b/src/vesa.c
-@@ -1626,7 +1626,7 @@ VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function)
- {
- VESAPtr pVesa;
-
-- if (MODE_QUERY < 0 || function > MODE_RESTORE)
-+ if (function < MODE_QUERY || function > MODE_RESTORE)
- return (FALSE);
-
- pVesa = VESAGetRec(pScrn);
---
-cgit v0.9.0.2-2-gbebe
-From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax at redhat.com>
-Date: Tue, 25 Sep 2012 12:55:03 +0000
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax at redhat.com>
----
-diff --git a/src/vesa.c b/src/vesa.c
-index 11cd26c..b73d104 100644
---- a/src/vesa.c
-+++ b/src/vesa.c
-@@ -49,9 +49,6 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
-
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
- /* Colormap handling */
- #include "micmap.h"
- #include "xf86cmap.h"
-@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL)
- VESADGAInit(pScrn, pScreen);
-
- xf86SetBlackWhitePixels(pScreen);
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
-
- /* software cursor */
---
-cgit v0.9.0.2-2-gbebe
Deleted: extra-i686/revert-kernelcheck.patch
===================================================================
--- extra-i686/revert-kernelcheck.patch 2015-06-24 17:07:10 UTC (rev 241256)
+++ extra-i686/revert-kernelcheck.patch 2015-06-24 17:07:23 UTC (rev 241257)
@@ -1,31 +0,0 @@
-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
Copied: xf86-video-vesa/repos/extra-i686/revert-kernelcheck.patch (from rev 241256, xf86-video-vesa/trunk/revert-kernelcheck.patch)
===================================================================
--- extra-i686/revert-kernelcheck.patch (rev 0)
+++ extra-i686/revert-kernelcheck.patch 2015-06-24 17:07:23 UTC (rev 241257)
@@ -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
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-06-24 17:07:10 UTC (rev 241256)
+++ extra-x86_64/PKGBUILD 2015-06-24 17:07:23 UTC (rev 241257)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-vesa
-pkgver=2.3.2
-pkgrel=6
-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=19')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
- revert-kernelcheck.patch
- git-fixes.patch)
-sha256sums=('144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3'
- 'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c'
- 'beba7e8499b1d0b457762e28e7e413b223cbe87a84a39a3566e96c44da8544a1')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch"
- patch -Np1 -i ${srcdir}/git-fixes.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/extra-x86_64/PKGBUILD (from rev 241256, xf86-video-vesa/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-06-24 17:07:23 UTC (rev 241257)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-vesa
+pkgver=2.3.4
+pkgrel=1
+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=19')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20')
+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 <ajax at nwnk.net>"
+
+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}/"
+}
Deleted: extra-x86_64/git-fixes.patch
===================================================================
--- extra-x86_64/git-fixes.patch 2015-06-24 17:07:10 UTC (rev 241256)
+++ extra-x86_64/git-fixes.patch 2015-06-24 17:07:23 UTC (rev 241257)
@@ -1,55 +0,0 @@
-From 7aafaf56fbca97f36c775462c1ceea3e03700c42 Mon Sep 17 00:00:00 2001
-From: Alexandr Shadchin <alexandr.shadchin at gmail.com>
-Date: Sat, 18 Aug 2012 14:53:34 +0000
-Subject: Fix check function in VESASaveRestore
-
-Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin at gmail.com>
-Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
----
-diff --git a/src/vesa.c b/src/vesa.c
-index 8ac77da..11cd26c 100644
---- a/src/vesa.c
-+++ b/src/vesa.c
-@@ -1626,7 +1626,7 @@ VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function)
- {
- VESAPtr pVesa;
-
-- if (MODE_QUERY < 0 || function > MODE_RESTORE)
-+ if (function < MODE_QUERY || function > MODE_RESTORE)
- return (FALSE);
-
- pVesa = VESAGetRec(pScrn);
---
-cgit v0.9.0.2-2-gbebe
-From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax at redhat.com>
-Date: Tue, 25 Sep 2012 12:55:03 +0000
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax at redhat.com>
----
-diff --git a/src/vesa.c b/src/vesa.c
-index 11cd26c..b73d104 100644
---- a/src/vesa.c
-+++ b/src/vesa.c
-@@ -49,9 +49,6 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
-
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
- /* Colormap handling */
- #include "micmap.h"
- #include "xf86cmap.h"
-@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL)
- VESADGAInit(pScrn, pScreen);
-
- xf86SetBlackWhitePixels(pScreen);
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
-
- /* software cursor */
---
-cgit v0.9.0.2-2-gbebe
Deleted: extra-x86_64/revert-kernelcheck.patch
===================================================================
--- extra-x86_64/revert-kernelcheck.patch 2015-06-24 17:07:10 UTC (rev 241256)
+++ extra-x86_64/revert-kernelcheck.patch 2015-06-24 17:07:23 UTC (rev 241257)
@@ -1,31 +0,0 @@
-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
Copied: xf86-video-vesa/repos/extra-x86_64/revert-kernelcheck.patch (from rev 241256, xf86-video-vesa/trunk/revert-kernelcheck.patch)
===================================================================
--- extra-x86_64/revert-kernelcheck.patch (rev 0)
+++ extra-x86_64/revert-kernelcheck.patch 2015-06-24 17:07:23 UTC (rev 241257)
@@ -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
More information about the arch-commits
mailing list