diff options
Diffstat (limited to 'extra/xf86-video-sisimedia')
| -rw-r--r-- | extra/xf86-video-sisimedia/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/xf86-video-sisimedia/remove_mibstore.h.patch | 18 |
2 files changed, 25 insertions, 4 deletions
diff --git a/extra/xf86-video-sisimedia/PKGBUILD b/extra/xf86-video-sisimedia/PKGBUILD index 3c7340046..add01b89b 100644 --- a/extra/xf86-video-sisimedia/PKGBUILD +++ b/extra/xf86-video-sisimedia/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 177523 2013-02-06 18:40:48Z jgc $ +# $Id: PKGBUILD 180223 2013-03-18 16:10:37Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-sisimedia pkgver=0.9.1 -pkgrel=6 +pkgrel=7 pkgdesc="X.org SiS 671 video driver" arch=(i686 x86_64) url="http://www.linuxconsulting.ro/xorg-drivers/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto') -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' 'xf86dgaproto') +conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15') options=('!libtool') source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-0.9.1_20091203.tar.bz2 xf86-video-sis-0.9.1-20102701.patch @@ -39,6 +39,7 @@ source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia- sisimedia-xorg-1.13.patch deprecated-sym2.patch disable-UploadToScreen-DownloadFromScreen.patch + remove_mibstore.h.patch COPYING) sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430' '61715bb86180decde55a56fad9a12d841c89fbb2' @@ -67,6 +68,7 @@ sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430' '4ea333d659abe2b78f07511467c5356f39bf8695' '9bef0b61c0505cc64464073d73684e6933d3f84c' 'ff95fd41be43560245caa40adc6b481f2dafca7d' + 'e130b4b4cafa0d54426a9b9c4735ad4bf46686f5' 'a64e244f274bcb155f892d0488a1a4b1b2f7d70d') build() { @@ -95,6 +97,7 @@ build() { patch -Np0 -i "${srcdir}/fix-xv-crash.patch" patch -Np1 -i "${srcdir}/sisimedia-no-xaa.patch" patch -Np1 -i "${srcdir}/sisimedia-xorg-1.13.patch" + patch -Np1 -i "${srcdir}/remove_mibstore.h.patch" patch -Np1 -i "${srcdir}/deprecated-sym2.patch" patch -Np1 -i "${srcdir}/disable-UploadToScreen-DownloadFromScreen.patch" diff --git a/extra/xf86-video-sisimedia/remove_mibstore.h.patch b/extra/xf86-video-sisimedia/remove_mibstore.h.patch new file mode 100644 index 000000000..ebfa74f5a --- /dev/null +++ b/extra/xf86-video-sisimedia/remove_mibstore.h.patch @@ -0,0 +1,18 @@ +--- xf86-video-sis-0.9.1/src/sis_driver.c 2013-03-10 13:02:25.000000000 +0100 ++++ xf86-video-sis-0.9.1/src/sis_driver.c.new 2013-03-10 13:04:24.349309791 +0100 +@@ -86,7 +86,6 @@ + #include "fb.h" + #include "micmap.h" + #include "mipointer.h" +-#include "mibstore.h" + #include "edid.h" + + #define SIS_NEED_inSISREG +@@ -9637,7 +9636,6 @@ + } + pSiS->SiSFastVidCopyDone = TRUE; + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + |