diff options
author | GoliathLabs | 2020-06-11 20:09:38 +0200 |
---|---|---|
committer | GoliathLabs | 2020-06-11 20:09:38 +0200 |
commit | 5099c5af420f03c8d27dacfbba2c64a0519404d3 (patch) | |
tree | caa18ee1ba15d705d6a73a2428837f43f6c7b61b | |
parent | e553000a36b2cbd371f32675e7eef89dfa37b7b8 (diff) | |
download | aur-xf86-video-chips.tar.gz |
Updated: 1.4.0
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | PKGBUILD | 25 | ||||
-rw-r--r-- | git-fixes.patch | 29 |
3 files changed, 18 insertions, 56 deletions
@@ -1,24 +1,22 @@ pkgbase = xf86-video-chips pkgdesc = X.org Chips and Technologies video driver - pkgver = 1.2.6 - pkgrel = 3 + pkgver = 1.4.0 + pkgrel = 1 url = https://xorg.freedesktop.org/ arch = i686 arch = x86_64 license = custom makedepends = xorg-server-devel - makedepends = X-ABI-VIDEODRV_VERSION=23 + makedepends = X-ABI-VIDEODRV_VERSION=24.0 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-chips-1.2.6.tar.bz2 - source = https://xorg.freedesktop.org//releases/individual/driver/xf86-video-chips-1.2.6.tar.bz2.sig - source = git-fixes.patch + conflicts = xorg-server<1.20 + conflicts = X-ABI-VIDEODRV_VERSION<24 + conflicts = X-ABI-VIDEODRV_VERSION>=25 + source = https://xorg.freedesktop.org//releases/individual/driver/xf86-video-chips-1.4.0.tar.bz2 + source = https://xorg.freedesktop.org//releases/individual/driver/xf86-video-chips-1.4.0.tar.bz2.sig validpgpkeys = 3BB639E56F861FA2E86505690FDD682D974CA72A - sha256sums = 99aef5cf9f58391eefab5b4983814f417fd1cf2e4a0f93564de1e9bd75636b1c + sha256sums = 07f3e41e8f7e6ac24e62cfa94a1aa85f20f03ab375ad89e1a944a09df0f11fbf sha256sums = SKIP - sha256sums = f1bfcc34d9c36cb7110052af586a5161611b17120c72b7c72d577123c29e4334 pkgname = xf86-video-chips @@ -1,29 +1,22 @@ -# $Id: PKGBUILD 281797 2016-11-22 05:44:54Z lcarlier $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Felix Golatofski <contact@xdfr.de> +# Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-video-chips -pkgver=1.2.6 -pkgrel=3 +pkgver=1.4.0 +pkgrel=1 pkgdesc="X.org Chips and Technologies 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') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig} - git-fixes.patch) -sha256sums=('99aef5cf9f58391eefab5b4983814f417fd1cf2e4a0f93564de1e9bd75636b1c' - 'SKIP' - 'f1bfcc34d9c36cb7110052af586a5161611b17120c72b7c72d577123c29e4334') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=24.0') +conflicts=('xorg-server<1.20' 'X-ABI-VIDEODRV_VERSION<24' 'X-ABI-VIDEODRV_VERSION>=25') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}) +sha256sums=('07f3e41e8f7e6ac24e62cfa94a1aa85f20f03ab375ad89e1a944a09df0f11fbf' + 'SKIP') validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <mattst88@gmail.com> -prepare() { - cd ${pkgname}-${pkgver} - patch -Np1 -i ../git-fixes.patch -} - build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr diff --git a/git-fixes.patch b/git-fixes.patch deleted file mode 100644 index b2c1ab5773ce..000000000000 --- a/git-fixes.patch +++ /dev/null @@ -1,29 +0,0 @@ -From aa82ecb1401140089fc75850c73fa917d137a0cc 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 - - |