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-tseng | |
| parent | e81bd948a32f8b411197818651f517ddf431ab0a (diff) | |
Tue Mar 19 00:04:27 PDT 2013
Diffstat (limited to 'extra/xf86-video-tseng')
| -rw-r--r-- | extra/xf86-video-tseng/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/xf86-video-tseng/git-fixes.patch | 31 |
2 files changed, 39 insertions, 6 deletions
diff --git a/extra/xf86-video-tseng/PKGBUILD b/extra/xf86-video-tseng/PKGBUILD index a87980924..701c2dcae 100644 --- a/extra/xf86-video-tseng/PKGBUILD +++ b/extra/xf86-video-tseng/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 168592 2012-10-13 11:46:06Z andyrtr $ +# $Id: PKGBUILD 180217 2013-03-18 16:09:23Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-tseng pkgver=1.2.5 -pkgrel=2 +pkgrel=3 pkgdesc="X.org tseng 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) -sha256sums=('c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch) +sha256sums=('c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819' + '8a337e2bab9a5ee7ba15dde6665abcfa9559d769074873cb2a85cc86716bd5da') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/git-fixes.patch ./configure --prefix=/usr make } diff --git a/extra/xf86-video-tseng/git-fixes.patch b/extra/xf86-video-tseng/git-fixes.patch new file mode 100644 index 000000000..88f9cc570 --- /dev/null +++ b/extra/xf86-video-tseng/git-fixes.patch @@ -0,0 +1,31 @@ +From d2d5c8437e401181f56804cc68594c4831a0983d Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:55:02 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/tseng_driver.c b/src/tseng_driver.c +index ffafb19..0db62e5 100644 +--- a/src/tseng_driver.c ++++ b/src/tseng_driver.c +@@ -39,9 +39,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + #include "fb.h" + + #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 +@@ -1453,7 +1450,6 @@ TsengScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +- miInitializeBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + /* Initialise cursor functions */ + miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); +-- +cgit v0.9.0.2-2-gbebe |