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-i128 | |
| parent | e81bd948a32f8b411197818651f517ddf431ab0a (diff) | |
Tue Mar 19 00:04:27 PDT 2013
Diffstat (limited to 'extra/xf86-video-i128')
| -rw-r--r-- | extra/xf86-video-i128/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/xf86-video-i128/git-fix.diff | 53 |
2 files changed, 61 insertions, 6 deletions
diff --git a/extra/xf86-video-i128/PKGBUILD b/extra/xf86-video-i128/PKGBUILD index f48ca85ab..3b54ba963 100644 --- a/extra/xf86-video-i128/PKGBUILD +++ b/extra/xf86-video-i128/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 168574 2012-10-13 11:44:52Z andyrtr $ +# $Id: PKGBUILD 180199 2013-03-18 16:09:08Z andyrtr $ # Maintainer:Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-i128 pkgver=1.3.6 -pkgrel=2 +pkgrel=3 pkgdesc="X.org Number 9 I128 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') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff) +sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c' + '3805461dd71ff6675fd08afd5c21a230e7f36d6cda6830adac38ceee36d96f4b') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/git-fix.diff ./configure --prefix=/usr make } diff --git a/extra/xf86-video-i128/git-fix.diff b/extra/xf86-video-i128/git-fix.diff new file mode 100644 index 000000000..de3287d13 --- /dev/null +++ b/extra/xf86-video-i128/git-fix.diff @@ -0,0 +1,53 @@ +From 3226d66c951f3621fb940cc5844098d892089eb1 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Wed, 15 Aug 2012 17:03:11 +0000 +Subject: Don't bother to include vbe.h + +Just copied from xf86 boilerplate afaict. + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/i128_driver.c b/src/i128_driver.c +index 66fdee0..a0f08c0 100644 +--- a/src/i128_driver.c ++++ b/src/i128_driver.c +@@ -55,7 +55,6 @@ + #include "micmap.h" + + #include "xf86DDC.h" +-#include "vbe.h" + + #include "xf86cmap.h" + #include "fb.h" +-- +cgit v0.9.0.2-2-gbebe +From c87753733a6e1f85d1d037dced0b47ce0cf41658 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:40 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/i128_driver.c b/src/i128_driver.c +index a0f08c0..51a4135 100644 +--- a/src/i128_driver.c ++++ b/src/i128_driver.c +@@ -50,8 +50,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" + #include "micmap.h" + + #include "xf86DDC.h" +@@ -1556,7 +1554,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL) + return FALSE; + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +-- +cgit v0.9.0.2-2-gbebe |