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-vesa | |
| parent | e81bd948a32f8b411197818651f517ddf431ab0a (diff) | |
Tue Mar 19 00:04:27 PDT 2013
Diffstat (limited to 'extra/xf86-video-vesa')
| -rw-r--r-- | extra/xf86-video-vesa/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/xf86-video-vesa/git-fixes.patch | 55 |
2 files changed, 64 insertions, 6 deletions
diff --git a/extra/xf86-video-vesa/PKGBUILD b/extra/xf86-video-vesa/PKGBUILD index 3f48ff9d6..b05999c60 100644 --- a/extra/xf86-video-vesa/PKGBUILD +++ b/extra/xf86-video-vesa/PKGBUILD @@ -1,26 +1,29 @@ -# $Id: PKGBUILD 168594 2012-10-13 11:46:21Z andyrtr $ +# $Id: PKGBUILD 180219 2013-03-18 16:09:24Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-vesa pkgver=2.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="X.org vesa video driver" arch=(i686 x86_64) license=('custom') url="http://xorg.freedesktop.org/" 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 - revert-kernelcheck.patch) + revert-kernelcheck.patch + git-fixes.patch) sha256sums=('144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3' - 'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c') + 'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c' + 'beba7e8499b1d0b457762e28e7e413b223cbe87a84a39a3566e96c44da8544a1') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch" + patch -Np1 -i ${srcdir}/git-fixes.patch ./configure --prefix=/usr make } diff --git a/extra/xf86-video-vesa/git-fixes.patch b/extra/xf86-video-vesa/git-fixes.patch new file mode 100644 index 000000000..fee498d0c --- /dev/null +++ b/extra/xf86-video-vesa/git-fixes.patch @@ -0,0 +1,55 @@ +From 7aafaf56fbca97f36c775462c1ceea3e03700c42 Mon Sep 17 00:00:00 2001 +From: Alexandr Shadchin <alexandr.shadchin@gmail.com> +Date: Sat, 18 Aug 2012 14:53:34 +0000 +Subject: Fix check function in VESASaveRestore + +Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com> +Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- +diff --git a/src/vesa.c b/src/vesa.c +index 8ac77da..11cd26c 100644 +--- a/src/vesa.c ++++ b/src/vesa.c +@@ -1626,7 +1626,7 @@ VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function) + { + VESAPtr pVesa; + +- if (MODE_QUERY < 0 || function > MODE_RESTORE) ++ if (function < MODE_QUERY || function > MODE_RESTORE) + return (FALSE); + + pVesa = VESAGetRec(pScrn); +-- +cgit v0.9.0.2-2-gbebe +From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:55:03 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/vesa.c b/src/vesa.c +index 11cd26c..b73d104 100644 +--- a/src/vesa.c ++++ b/src/vesa.c +@@ -49,9 +49,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + /* Colormap handling */ + #include "micmap.h" + #include "xf86cmap.h" +@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL) + VESADGAInit(pScrn, pScreen); + + xf86SetBlackWhitePixels(pScreen); +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* software cursor */ +-- +cgit v0.9.0.2-2-gbebe |