Date: Tuesday, November 22, 2016 @ 05:44:54 Author: lcarlier Revision: 281797
upgpkg: xf86-video-chips 1.2.6-3 xorg-server-1.19 rebuild Added: xf86-video-chips/trunk/git-fixes.patch Modified: xf86-video-chips/trunk/PKGBUILD -----------------+ PKGBUILD | 19 +++++++++++++------ git-fixes.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-11-22 05:35:55 UTC (rev 281796) +++ PKGBUILD 2016-11-22 05:44:54 UTC (rev 281797) @@ -4,19 +4,26 @@ pkgname=xf86-video-chips pkgver=1.2.6 -pkgrel=2 +pkgrel=3 pkgdesc="X.org Chips and Technologies video driver" arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" +url="https://xorg.freedesktop.org/" license=('custom') depends=(glibc) -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=20') -conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 'X-ABI-VIDEODRV_VERSION>=21') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}) +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') + 'SKIP' + 'f1bfcc34d9c36cb7110052af586a5161611b17120c72b7c72d577123c29e4334') validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <matts...@gmail.com> +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i ../git-fixes.patch +} + build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr Added: git-fixes.patch =================================================================== --- git-fixes.patch (rev 0) +++ git-fixes.patch 2016-11-22 05:44:54 UTC (rev 281797) @@ -0,0 +1,29 @@ +From aa82ecb1401140089fc75850c73fa917d137a0cc 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 + +