diff options
| author | root <root@rshg054.dnsready.net> | 2013-03-19 00:04:27 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-03-19 00:04:27 -0700 |
| commit | b54c21859be3590a319ceade1f58d0b89ac5ef32 (patch) | |
| tree | 1f4a8c6408144ac159505c48e66641671e87ff54 /extra/xf86-video-chips | |
| parent | e81bd948a32f8b411197818651f517ddf431ab0a (diff) | |
Tue Mar 19 00:04:27 PDT 2013
Diffstat (limited to 'extra/xf86-video-chips')
| -rw-r--r-- | extra/xf86-video-chips/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/xf86-video-chips/git-fix.diff | 39 |
2 files changed, 47 insertions, 6 deletions
diff --git a/extra/xf86-video-chips/PKGBUILD b/extra/xf86-video-chips/PKGBUILD index 28b0a216c..265180ab4 100644 --- a/extra/xf86-video-chips/PKGBUILD +++ b/extra/xf86-video-chips/PKGBUILD @@ -1,25 +1,27 @@ -# $Id: PKGBUILD 168568 2012-10-13 11:44:27Z andyrtr $ +# $Id: PKGBUILD 180194 2013-03-18 16:09:03Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-video-chips pkgver=1.2.5 -pkgrel=2 +pkgrel=3 pkgdesc="X.org Chips and Technologies video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=(glibc) -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h) +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h git-fix.diff) sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2' - 'd04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670') + 'd04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670' + '36165ebc70926ab5a8fe4331c5ce88c7f5f2e6979170b849ac1c2c99b3d1a804') build() { cd "${srcdir}/${pkgname}-${pkgver}" cp ${srcdir}/iopl.h util/ + patch -Np1 -i ${srcdir}/git-fix.diff ./configure --prefix=/usr make } diff --git a/extra/xf86-video-chips/git-fix.diff b/extra/xf86-video-chips/git-fix.diff new file mode 100644 index 000000000..bfd94181e --- /dev/null +++ b/extra/xf86-video-chips/git-fix.diff @@ -0,0 +1,39 @@ +From 151a1ec855a9ada44907cb6bef06a71e9080504b Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:34 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/ct_driver.c b/src/ct_driver.c +index 6f3a5d4..effbc60 100644 +--- a/src/ct_driver.c ++++ b/src/ct_driver.c +@@ -96,9 +96,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + /* All drivers using the mi banking wrapper need this */ + #ifdef HAVE_ISA + #include "mibank.h" +@@ -4145,7 +4142,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL) + pBankInfo = NULL; + return FALSE; + } +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* Initialise cursor functions */ +@@ -4296,7 +4292,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + #ifdef ENABLE_SILKEN_MOUSE + xf86SetSilkenMouse(pScreen); +-- +cgit v0.9.0.2-2-gbebe |