Date: Monday, November 21, 2016 @ 12:14:49 Author: lcarlier Revision: 281732
archrelease: copy trunk to staging-i686, staging-x86_64 Added: xf86-video-trident/repos/staging-i686/ xf86-video-trident/repos/staging-i686/PKGBUILD (from rev 281731, xf86-video-trident/trunk/PKGBUILD) xf86-video-trident/repos/staging-i686/git-fixes.patch (from rev 281731, xf86-video-trident/trunk/git-fixes.patch) xf86-video-trident/repos/staging-x86_64/ xf86-video-trident/repos/staging-x86_64/PKGBUILD (from rev 281731, xf86-video-trident/trunk/PKGBUILD) xf86-video-trident/repos/staging-x86_64/git-fixes.patch (from rev 281731, xf86-video-trident/trunk/git-fixes.patch) --------------------------------+ staging-i686/PKGBUILD | 39 +++++++++++++++++++++++++++++++++++++++ staging-i686/git-fixes.patch | 28 ++++++++++++++++++++++++++++ staging-x86_64/PKGBUILD | 39 +++++++++++++++++++++++++++++++++++++++ staging-x86_64/git-fixes.patch | 28 ++++++++++++++++++++++++++++ 4 files changed, 134 insertions(+) Copied: xf86-video-trident/repos/staging-i686/PKGBUILD (from rev 281731, xf86-video-trident/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2016-11-21 12:14:49 UTC (rev 281732) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=xf86-video-trident +pkgver=1.3.7 +pkgrel=3 +pkgdesc="X.org Trident 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{,.sig} + git-fixes.patch) +sha256sums=('ecd518de627a0d49e17c158bfc72ab657386c6907c91ef89fa09332558e413ae' + 'SKIP' + '22571bf377e0cd37a8bd48e4d382f1d43010e1bde6382862c226052019120335') +validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <matts...@gmail.com> + +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i ../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-trident/repos/staging-i686/git-fixes.patch (from rev 281731, xf86-video-trident/trunk/git-fixes.patch) =================================================================== --- staging-i686/git-fixes.patch (rev 0) +++ staging-i686/git-fixes.patch 2016-11-21 12:14:49 UTC (rev 281732) @@ -0,0 +1,28 @@ +From b5f4d35327863a14224d2a63885cd8b3b83a1815 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 6bc946f..89976e4 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -75,8 +75,13 @@ + + #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 ++#else + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask ++#endif + + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen +-- +cgit v0.10.2 + Copied: xf86-video-trident/repos/staging-x86_64/PKGBUILD (from rev 281731, xf86-video-trident/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2016-11-21 12:14:49 UTC (rev 281732) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=xf86-video-trident +pkgver=1.3.7 +pkgrel=3 +pkgdesc="X.org Trident 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{,.sig} + git-fixes.patch) +sha256sums=('ecd518de627a0d49e17c158bfc72ab657386c6907c91ef89fa09332558e413ae' + 'SKIP' + '22571bf377e0cd37a8bd48e4d382f1d43010e1bde6382862c226052019120335') +validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <matts...@gmail.com> + +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i ../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-trident/repos/staging-x86_64/git-fixes.patch (from rev 281731, xf86-video-trident/trunk/git-fixes.patch) =================================================================== --- staging-x86_64/git-fixes.patch (rev 0) +++ staging-x86_64/git-fixes.patch 2016-11-21 12:14:49 UTC (rev 281732) @@ -0,0 +1,28 @@ +From b5f4d35327863a14224d2a63885cd8b3b83a1815 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 6bc946f..89976e4 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -75,8 +75,13 @@ + + #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 ++#else + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask ++#endif + + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen +-- +cgit v0.10.2 +