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-sisusb | |
| parent | e81bd948a32f8b411197818651f517ddf431ab0a (diff) | |
Tue Mar 19 00:04:27 PDT 2013
Diffstat (limited to 'extra/xf86-video-sisusb')
| -rw-r--r-- | extra/xf86-video-sisusb/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/xf86-video-sisusb/git-fixes.patch | 29 |
2 files changed, 37 insertions, 6 deletions
diff --git a/extra/xf86-video-sisusb/PKGBUILD b/extra/xf86-video-sisusb/PKGBUILD index 7d9a9ee9f..14617168c 100644 --- a/extra/xf86-video-sisusb/PKGBUILD +++ b/extra/xf86-video-sisusb/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 168589 2012-10-13 11:45:54Z andyrtr $ +# $Id: PKGBUILD 180224 2013-03-18 16:10:38Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-sisusb pkgver=0.9.6 -pkgrel=2 +pkgrel=3 pkgdesc="X.org SiS USB 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=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch) +sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046' + '9b64f4a9160c1055d3e01e1b603840986163a7880dbbb5c12f3a7d4c66739134') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/git-fixes.patch ./configure --prefix=/usr make } diff --git a/extra/xf86-video-sisusb/git-fixes.patch b/extra/xf86-video-sisusb/git-fixes.patch new file mode 100644 index 000000000..dc920dabd --- /dev/null +++ b/extra/xf86-video-sisusb/git-fixes.patch @@ -0,0 +1,29 @@ +From 293d0902705c272b83432a955fb6a3c96dd6cea7 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:52 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c +index 539b9f1..0fdc8e9 100644 +--- a/src/sisusb_driver.c ++++ b/src/sisusb_driver.c +@@ -39,7 +39,6 @@ + #include "shadowfb.h" + #include "micmap.h" + #include "mipointer.h" +-#include "mibstore.h" + + #include "sisusb_regs.h" + #include "sisusb_dac.h" +@@ -1907,7 +1906,6 @@ SISUSBScreenInit(SCREEN_INIT_ARGS_DECL) + /* Initialize the accelerators */ + SiSUSBAccelInit(pScreen); + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* NO SilkenMouse. Never. Ever. */ +-- +cgit v0.9.0.2-2-gbebe |