diff options
| author | Laurent Carlier | 2017-01-14 21:24:05 +0100 |
|---|---|---|
| committer | Laurent Carlier | 2017-01-14 21:24:05 +0100 |
| commit | 143f963072f45636555644319db86c410f7b6c0b (patch) | |
| tree | 8aadacf0d32f16e30f2545f48c6ccd8af6fd544c | |
| download | aur-143f963072f45636555644319db86c410f7b6c0b.tar.gz | |
moved from extra
| -rw-r--r-- | .SRCINFO | 26 | ||||
| -rw-r--r-- | PKGBUILD | 39 | ||||
| -rw-r--r-- | git-fixes.patch | 28 |
3 files changed, 93 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..4e7e1037a0df --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,26 @@ +pkgbase = xf86-video-trident + pkgdesc = X.org Trident video driver + pkgver = 1.3.7 + pkgrel = 3 + url = https://xorg.freedesktop.org/ + arch = i686 + arch = x86_64 + groups = xorg-drivers + license = custom + makedepends = xorg-server-devel + makedepends = X-ABI-VIDEODRV_VERSION=23 + makedepends = xf86dgaproto + depends = glibc + conflicts = xorg-server<1.19 + conflicts = X-ABI-VIDEODRV_VERSION<23 + conflicts = X-ABI-VIDEODRV_VERSION>=24 + source = https://xorg.freedesktop.org//releases/individual/driver/xf86-video-trident-1.3.7.tar.bz2 + source = https://xorg.freedesktop.org//releases/individual/driver/xf86-video-trident-1.3.7.tar.bz2.sig + source = git-fixes.patch + validpgpkeys = 3BB639E56F861FA2E86505690FDD682D974CA72A + sha256sums = ecd518de627a0d49e17c158bfc72ab657386c6907c91ef89fa09332558e413ae + sha256sums = SKIP + sha256sums = 22571bf377e0cd37a8bd48e4d382f1d43010e1bde6382862c226052019120335 + +pkgname = xf86-video-trident + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..880be69d6136 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 281731 2016-11-21 12:14:44Z lcarlier $ +# Maintainer: Jan de Groot <jgc@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 <mattst88@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}/" +} diff --git a/git-fixes.patch b/git-fixes.patch new file mode 100644 index 000000000000..401733302e93 --- /dev/null +++ b/git-fixes.patch @@ -0,0 +1,28 @@ +From b5f4d35327863a14224d2a63885cd8b3b83a1815 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 19 Jul 2016 10:03:56 -0400 +Subject: Adapt Block/WakeupHandler signature for ABI 23 + +Signed-off-by: Adam Jackson <ajax@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 + |