Date: Monday, November 21, 2016 @ 12:23:21
Author: lcarlier
Revision: 281734
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
xf86-video-tdfx/repos/staging-i686/
xf86-video-tdfx/repos/staging-i686/PKGBUILD
(from rev 281733, xf86-video-tdfx/trunk/PKGBUILD)
xf86-video-tdfx/repos/staging-i686/git-fixes.patch
(from rev 281733, xf86-video-tdfx/trunk/git-fixes.patch)
xf86-video-tdfx/repos/staging-x86_64/
xf86-video-tdfx/repos/staging-x86_64/PKGBUILD
(from rev 281733, xf86-video-tdfx/trunk/PKGBUILD)
xf86-video-tdfx/repos/staging-x86_64/git-fixes.patch
(from rev 281733, xf86-video-tdfx/trunk/git-fixes.patch)
--------------------------------+
staging-i686/PKGBUILD | 40 +++++++++++++++++++++++++++++++++++++++
staging-i686/git-fixes.patch | 34 +++++++++++++++++++++++++++++++++
staging-x86_64/PKGBUILD | 40 +++++++++++++++++++++++++++++++++++++++
staging-x86_64/git-fixes.patch | 34 +++++++++++++++++++++++++++++++++
4 files changed, 148 insertions(+)
Copied: xf86-video-tdfx/repos/staging-i686/PKGBUILD (from rev 281733,
xf86-video-tdfx/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2016-11-21 12:23:21 UTC (rev 281734)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jan de Groot <j...@archlinux.org>
+
+pkgname=xf86-video-tdfx
+pkgver=1.4.6
+pkgrel=1
+pkgdesc="X.org tdfx video driver"
+arch=(i686 x86_64)
+url="https://xorg.freedesktop.org/";
+license=('custom')
+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')
+optdepends=('tdfx-dri: DRI1 support from community repo')
+groups=('xorg-drivers')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
+ git-fixes.patch)
+sha256sums=('3a8a88867c40ad61f1c9a09ffd7ac64102fa821685855d50ce66c7603dcc6d37'
+ 'SKIP'
+ 'f0db3082cf55196492b34083005a9a57b6b532ef2d9cc6403f1b05e1a5424de0')
+validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner
<matts...@gmail.com>
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/git-fixes.patch
+}
+
+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}/"
+}
Copied: xf86-video-tdfx/repos/staging-i686/git-fixes.patch (from rev 281733,
xf86-video-tdfx/trunk/git-fixes.patch)
===================================================================
--- staging-i686/git-fixes.patch (rev 0)
+++ staging-i686/git-fixes.patch 2016-11-21 12:23:21 UTC (rev 281734)
@@ -0,0 +1,34 @@
+From b99390efcb55d7d4a68e8c595119c1af4426fc0b Mon Sep 17 00:00:00 2001
+From: Adam Jackson <a...@redhat.com>
+Date: Tue, 19 Jul 2016 10:03:56 -0400
+Subject: Adapt Block/WakeupHandler signature for ABI 23
+
+Signed-off-by: Adam Jackson <a...@redhat.com>
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 98ba435..44daea4 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -78,11 +78,19 @@
+
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++
++#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
++#define WAKEUPHANDLER_ARGS arg, result
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer
pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+
+ #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer
read_mask
+ #define WAKEUPHANDLER_ARGS arg, result, read_mask
++#endif
+
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
+--
+cgit v0.10.2
+
Copied: xf86-video-tdfx/repos/staging-x86_64/PKGBUILD (from rev 281733,
xf86-video-tdfx/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2016-11-21 12:23:21 UTC (rev 281734)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jan de Groot <j...@archlinux.org>
+
+pkgname=xf86-video-tdfx
+pkgver=1.4.6
+pkgrel=1
+pkgdesc="X.org tdfx video driver"
+arch=(i686 x86_64)
+url="https://xorg.freedesktop.org/";
+license=('custom')
+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')
+optdepends=('tdfx-dri: DRI1 support from community repo')
+groups=('xorg-drivers')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
+ git-fixes.patch)
+sha256sums=('3a8a88867c40ad61f1c9a09ffd7ac64102fa821685855d50ce66c7603dcc6d37'
+ 'SKIP'
+ 'f0db3082cf55196492b34083005a9a57b6b532ef2d9cc6403f1b05e1a5424de0')
+validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner
<matts...@gmail.com>
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/git-fixes.patch
+}
+
+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}/"
+}
Copied: xf86-video-tdfx/repos/staging-x86_64/git-fixes.patch (from rev 281733,
xf86-video-tdfx/trunk/git-fixes.patch)
===================================================================
--- staging-x86_64/git-fixes.patch (rev 0)
+++ staging-x86_64/git-fixes.patch 2016-11-21 12:23:21 UTC (rev 281734)
@@ -0,0 +1,34 @@
+From b99390efcb55d7d4a68e8c595119c1af4426fc0b Mon Sep 17 00:00:00 2001
+From: Adam Jackson <a...@redhat.com>
+Date: Tue, 19 Jul 2016 10:03:56 -0400
+Subject: Adapt Block/WakeupHandler signature for ABI 23
+
+Signed-off-by: Adam Jackson <a...@redhat.com>
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 98ba435..44daea4 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -78,11 +78,19 @@
+
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++
++#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
++#define WAKEUPHANDLER_ARGS arg, result
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer
pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+
+ #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer
read_mask
+ #define WAKEUPHANDLER_ARGS arg, result, read_mask
++#endif
+
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
+--
+cgit v0.10.2
+
