[arch-commits] Commit in xf86-video-vesa/repos (8 files)
Laurent Carlier
lcarlier at archlinux.org
Fri Aug 11 09:43:06 UTC 2017
Date: Friday, August 11, 2017 @ 09:43:06
Author: lcarlier
Revision: 301901
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xf86-video-vesa/repos/extra-i686/PKGBUILD
(from rev 301900, xf86-video-vesa/trunk/PKGBUILD)
xf86-video-vesa/repos/extra-i686/revert-kernelcheck.patch
(from rev 301900, xf86-video-vesa/trunk/revert-kernelcheck.patch)
xf86-video-vesa/repos/extra-x86_64/PKGBUILD
(from rev 301900, xf86-video-vesa/trunk/PKGBUILD)
xf86-video-vesa/repos/extra-x86_64/revert-kernelcheck.patch
(from rev 301900, 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
---------------------------------------+
/PKGBUILD | 92 ++++++++++++++++++++++++++++++++
/revert-kernelcheck.patch | 62 +++++++++++++++++++++
extra-i686/PKGBUILD | 38 -------------
extra-i686/revert-kernelcheck.patch | 31 ----------
extra-x86_64/PKGBUILD | 38 -------------
extra-x86_64/revert-kernelcheck.patch | 31 ----------
6 files changed, 154 insertions(+), 138 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-08-11 09:43:00 UTC (rev 301900)
+++ extra-i686/PKGBUILD 2017-08-11 09:43:06 UTC (rev 301901)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-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 <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}/"
-}
Copied: xf86-video-vesa/repos/extra-i686/PKGBUILD (from rev 301900, xf86-video-vesa/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-08-11 09:43:06 UTC (rev 301901)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-vesa
+pkgver=2.3.4
+pkgrel=4
+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 <ajax at nwnk.net>"
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
+ # With them, module fail to load with undefined symbol.
+ # See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
+ export CFLAGS=${CFLAGS/-fno-plt}
+ export CXXFLAGS=${CXXFLAGS/-fno-plt}
+ export LDFLAGS=${LDFLAGS/,-z,now}
+
+ ./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/revert-kernelcheck.patch
===================================================================
--- extra-i686/revert-kernelcheck.patch 2017-08-11 09:43:00 UTC (rev 301900)
+++ extra-i686/revert-kernelcheck.patch 2017-08-11 09:43:06 UTC (rev 301901)
@@ -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 301900, xf86-video-vesa/trunk/revert-kernelcheck.patch)
===================================================================
--- extra-i686/revert-kernelcheck.patch (rev 0)
+++ extra-i686/revert-kernelcheck.patch 2017-08-11 09:43:06 UTC (rev 301901)
@@ -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 2017-08-11 09:43:00 UTC (rev 301900)
+++ extra-x86_64/PKGBUILD 2017-08-11 09:43:06 UTC (rev 301901)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-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 <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}/"
-}
Copied: xf86-video-vesa/repos/extra-x86_64/PKGBUILD (from rev 301900, xf86-video-vesa/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-08-11 09:43:06 UTC (rev 301901)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-vesa
+pkgver=2.3.4
+pkgrel=4
+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 <ajax at nwnk.net>"
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
+ # With them, module fail to load with undefined symbol.
+ # See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
+ export CFLAGS=${CFLAGS/-fno-plt}
+ export CXXFLAGS=${CXXFLAGS/-fno-plt}
+ export LDFLAGS=${LDFLAGS/,-z,now}
+
+ ./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/revert-kernelcheck.patch
===================================================================
--- extra-x86_64/revert-kernelcheck.patch 2017-08-11 09:43:00 UTC (rev 301900)
+++ extra-x86_64/revert-kernelcheck.patch 2017-08-11 09:43:06 UTC (rev 301901)
@@ -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 301900, xf86-video-vesa/trunk/revert-kernelcheck.patch)
===================================================================
--- extra-x86_64/revert-kernelcheck.patch (rev 0)
+++ extra-x86_64/revert-kernelcheck.patch 2017-08-11 09:43:06 UTC (rev 301901)
@@ -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