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-tdfx | |
| parent | e81bd948a32f8b411197818651f517ddf431ab0a (diff) | |
Tue Mar 19 00:04:27 PDT 2013
Diffstat (limited to 'extra/xf86-video-tdfx')
| -rw-r--r-- | extra/xf86-video-tdfx/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/xf86-video-tdfx/git-fixes.patch | 32 |
2 files changed, 40 insertions, 6 deletions
diff --git a/extra/xf86-video-tdfx/PKGBUILD b/extra/xf86-video-tdfx/PKGBUILD index 0e13090fd..997c74f8c 100644 --- a/extra/xf86-video-tdfx/PKGBUILD +++ b/extra/xf86-video-tdfx/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 168590 2012-10-13 11:45:58Z andyrtr $ +# $Id: PKGBUILD 180215 2013-03-18 16:09:21Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-tdfx pkgver=1.4.5 -pkgrel=2 +pkgrel=3 pkgdesc="X.org tdfx 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') optdepends=('tdfx-dri: DRI1 support from community repo') options=(!libtool) groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch) +sha256sums=('70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859' + 'a79d50f619e6976b90a73f1a9842390e1b3fa37e1ce519bfbb178bd3161af9b5') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/git-fixes.patch ./configure --prefix=/usr make } diff --git a/extra/xf86-video-tdfx/git-fixes.patch b/extra/xf86-video-tdfx/git-fixes.patch new file mode 100644 index 000000000..30399cf1a --- /dev/null +++ b/extra/xf86-video-tdfx/git-fixes.patch @@ -0,0 +1,32 @@ +From 10498d2730c651eb7a1890eb9e728269732e9dad Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:59 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c +index ddd5431..412da07 100644 +--- a/src/tdfx_driver.c ++++ b/src/tdfx_driver.c +@@ -62,10 +62,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + #include "compiler.h" + +-/* Drivers using the mi implementation of backing store need: */ +- +-#include "mibstore.h" +- + /* All drivers using the vgahw module need this */ + /* This driver needs to be modified to not use vgaHW for multihead operation */ + #include "vgaHW.h" +@@ -2373,7 +2369,6 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) { + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +-- +cgit v0.9.0.2-2-gbebe |