[arch-commits] Commit in xf86-video-voodoo/repos (8 files)
Laurent Carlier
lcarlier at archlinux.org
Fri Aug 11 09:49:53 UTC 2017
Date: Friday, August 11, 2017 @ 09:49:53
Author: lcarlier
Revision: 301905
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xf86-video-voodoo/repos/extra-i686/PKGBUILD
(from rev 301904, xf86-video-voodoo/trunk/PKGBUILD)
xf86-video-voodoo/repos/extra-i686/git-fixes.diff
(from rev 301904, xf86-video-voodoo/trunk/git-fixes.diff)
xf86-video-voodoo/repos/extra-x86_64/PKGBUILD
(from rev 301904, xf86-video-voodoo/trunk/PKGBUILD)
xf86-video-voodoo/repos/extra-x86_64/git-fixes.diff
(from rev 301904, xf86-video-voodoo/trunk/git-fixes.diff)
Deleted:
xf86-video-voodoo/repos/extra-i686/PKGBUILD
xf86-video-voodoo/repos/extra-i686/git-fixes.diff
xf86-video-voodoo/repos/extra-x86_64/PKGBUILD
xf86-video-voodoo/repos/extra-x86_64/git-fixes.diff
-----------------------------+
/PKGBUILD | 86 ++++++++++++++++++++++++++++++++++++++++++
/git-fixes.diff | 46 ++++++++++++++++++++++
extra-i686/PKGBUILD | 35 -----------------
extra-i686/git-fixes.diff | 23 -----------
extra-x86_64/PKGBUILD | 35 -----------------
extra-x86_64/git-fixes.diff | 23 -----------
6 files changed, 132 insertions(+), 116 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-08-11 09:49:47 UTC (rev 301904)
+++ extra-i686/PKGBUILD 2017-08-11 09:49:53 UTC (rev 301905)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-voodoo
-pkgver=1.2.5
-pkgrel=8
-pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver"
-arch=(i686 x86_64)
-url="https://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23' 'xf86dgaproto')
-conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24')
-groups=('xorg-drivers')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.diff)
-sha256sums=('9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8'
- 'ab21fc45573bb309f3ad413a3242a48e0850b0fe36f30cad8443a2555cafcd66')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -Np1 -i ../git-fixes.diff
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: xf86-video-voodoo/repos/extra-i686/PKGBUILD (from rev 301904, xf86-video-voodoo/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-08-11 09:49:53 UTC (rev 301905)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-voodoo
+pkgver=1.2.5
+pkgrel=9
+pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver"
+arch=(i686 x86_64)
+url="https://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23' 'xf86dgaproto')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24')
+groups=('xorg-drivers')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.diff)
+sha256sums=('9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8'
+ 'ab21fc45573bb309f3ad413a3242a48e0850b0fe36f30cad8443a2555cafcd66')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../git-fixes.diff
+}
+
+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 -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: extra-i686/git-fixes.diff
===================================================================
--- extra-i686/git-fixes.diff 2017-08-11 09:49:47 UTC (rev 301904)
+++ extra-i686/git-fixes.diff 2017-08-11 09:49:53 UTC (rev 301905)
@@ -1,23 +0,0 @@
-From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied at redhat.com>
-Date: Mon, 22 Sep 2014 10:56:02 +1000
-Subject: don't use PCITAG in struct anymore
-
-
-diff --git a/src/voodoo.h b/src/voodoo.h
-index bfed497..c3eb64e 100644
---- a/src/voodoo.h
-+++ b/src/voodoo.h
-@@ -23,7 +23,9 @@ typedef struct {
-
- Bool Voodoo2; /* Set if Voodoo2 */
- pciVideoPtr PciInfo; /* PCI data */
-+#ifndef XSERVER_LIBPCIACCESS
- PCITAG PciTag;
-+#endif
- CARD32 PhysBase;
-
- CARD32 Width; /* Current width */
---
-cgit v0.10.2
-
Copied: xf86-video-voodoo/repos/extra-i686/git-fixes.diff (from rev 301904, xf86-video-voodoo/trunk/git-fixes.diff)
===================================================================
--- extra-i686/git-fixes.diff (rev 0)
+++ extra-i686/git-fixes.diff 2017-08-11 09:49:53 UTC (rev 301905)
@@ -0,0 +1,23 @@
+From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at redhat.com>
+Date: Mon, 22 Sep 2014 10:56:02 +1000
+Subject: don't use PCITAG in struct anymore
+
+
+diff --git a/src/voodoo.h b/src/voodoo.h
+index bfed497..c3eb64e 100644
+--- a/src/voodoo.h
++++ b/src/voodoo.h
+@@ -23,7 +23,9 @@ typedef struct {
+
+ Bool Voodoo2; /* Set if Voodoo2 */
+ pciVideoPtr PciInfo; /* PCI data */
++#ifndef XSERVER_LIBPCIACCESS
+ PCITAG PciTag;
++#endif
+ CARD32 PhysBase;
+
+ CARD32 Width; /* Current width */
+--
+cgit v0.10.2
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-08-11 09:49:47 UTC (rev 301904)
+++ extra-x86_64/PKGBUILD 2017-08-11 09:49:53 UTC (rev 301905)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-voodoo
-pkgver=1.2.5
-pkgrel=8
-pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver"
-arch=(i686 x86_64)
-url="https://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23' 'xf86dgaproto')
-conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24')
-groups=('xorg-drivers')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.diff)
-sha256sums=('9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8'
- 'ab21fc45573bb309f3ad413a3242a48e0850b0fe36f30cad8443a2555cafcd66')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -Np1 -i ../git-fixes.diff
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: xf86-video-voodoo/repos/extra-x86_64/PKGBUILD (from rev 301904, xf86-video-voodoo/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-08-11 09:49:53 UTC (rev 301905)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-voodoo
+pkgver=1.2.5
+pkgrel=9
+pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver"
+arch=(i686 x86_64)
+url="https://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23' 'xf86dgaproto')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24')
+groups=('xorg-drivers')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.diff)
+sha256sums=('9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8'
+ 'ab21fc45573bb309f3ad413a3242a48e0850b0fe36f30cad8443a2555cafcd66')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../git-fixes.diff
+}
+
+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 -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: extra-x86_64/git-fixes.diff
===================================================================
--- extra-x86_64/git-fixes.diff 2017-08-11 09:49:47 UTC (rev 301904)
+++ extra-x86_64/git-fixes.diff 2017-08-11 09:49:53 UTC (rev 301905)
@@ -1,23 +0,0 @@
-From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied at redhat.com>
-Date: Mon, 22 Sep 2014 10:56:02 +1000
-Subject: don't use PCITAG in struct anymore
-
-
-diff --git a/src/voodoo.h b/src/voodoo.h
-index bfed497..c3eb64e 100644
---- a/src/voodoo.h
-+++ b/src/voodoo.h
-@@ -23,7 +23,9 @@ typedef struct {
-
- Bool Voodoo2; /* Set if Voodoo2 */
- pciVideoPtr PciInfo; /* PCI data */
-+#ifndef XSERVER_LIBPCIACCESS
- PCITAG PciTag;
-+#endif
- CARD32 PhysBase;
-
- CARD32 Width; /* Current width */
---
-cgit v0.10.2
-
Copied: xf86-video-voodoo/repos/extra-x86_64/git-fixes.diff (from rev 301904, xf86-video-voodoo/trunk/git-fixes.diff)
===================================================================
--- extra-x86_64/git-fixes.diff (rev 0)
+++ extra-x86_64/git-fixes.diff 2017-08-11 09:49:53 UTC (rev 301905)
@@ -0,0 +1,23 @@
+From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at redhat.com>
+Date: Mon, 22 Sep 2014 10:56:02 +1000
+Subject: don't use PCITAG in struct anymore
+
+
+diff --git a/src/voodoo.h b/src/voodoo.h
+index bfed497..c3eb64e 100644
+--- a/src/voodoo.h
++++ b/src/voodoo.h
+@@ -23,7 +23,9 @@ typedef struct {
+
+ Bool Voodoo2; /* Set if Voodoo2 */
+ pciVideoPtr PciInfo; /* PCI data */
++#ifndef XSERVER_LIBPCIACCESS
+ PCITAG PciTag;
++#endif
+ CARD32 PhysBase;
+
+ CARD32 Width; /* Current width */
+--
+cgit v0.10.2
+
More information about the arch-commits
mailing list