[arch-commits] Commit in xf86-video-voodoo/repos (3 files)

[Andreas Radke]

    Date: Friday, May 11, 2018 @ 14:53:51
  Author: andyrtr
Revision: 323964

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-voodoo/repos/staging-x86_64/
  xf86-video-voodoo/repos/staging-x86_64/PKGBUILD
    (from rev 323963, xf86-video-voodoo/trunk/PKGBUILD)
  xf86-video-voodoo/repos/staging-x86_64/git-fixes.diff
    (from rev 323963, xf86-video-voodoo/trunk/git-fixes.diff)

----------------+
 PKGBUILD       |   43 +++++++++++++++++++++++++++++++++++++++++++
 git-fixes.diff |   23 +++++++++++++++++++++++
 2 files changed, 66 insertions(+)

Copied: xf86-video-voodoo/repos/staging-x86_64/PKGBUILD (from rev 323963, xf86-video-voodoo/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2018-05-11 14:53:51 UTC (rev 323964)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-voodoo
+pkgver=1.2.5
+pkgrel=10
+pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver"
+arch=(x86_64)
+url="https://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=24.0' 'xf86dgaproto')
+conflicts=('xorg-server<1.20' 'X-ABI-VIDEODRV_VERSION<24' 'X-ABI-VIDEODRV_VERSION>=25')
+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"
+}

Copied: xf86-video-voodoo/repos/staging-x86_64/git-fixes.diff (from rev 323963, xf86-video-voodoo/trunk/git-fixes.diff)
===================================================================
--- staging-x86_64/git-fixes.diff	                        (rev 0)
+++ staging-x86_64/git-fixes.diff	2018-05-11 14:53:51 UTC (rev 323964)
@@ -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
+