diff options
Diffstat (limited to 'extra/xf86-video-glint')
| -rw-r--r-- | extra/xf86-video-glint/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/xf86-video-glint/git-fix.diff | 30 |
2 files changed, 39 insertions, 7 deletions
diff --git a/extra/xf86-video-glint/PKGBUILD b/extra/xf86-video-glint/PKGBUILD index e3105fdc9..df917019d 100644 --- a/extra/xf86-video-glint/PKGBUILD +++ b/extra/xf86-video-glint/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 168573 2012-10-13 11:44:48Z andyrtr $ +# $Id: PKGBUILD 180198 2013-03-18 16:09:07Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-glint pkgver=1.2.8 -pkgrel=2 +pkgrel=3 pkgdesc="X.org GLINT/Permedia video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' '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' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff) +sha256sums=('657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221' + '8bf833751bea92543835c7f0c55b6a6ed7c4df62034372f5f6ae122b3ba8f231') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + patch -Np1 -i ${srcdir}/git-fix.diff + ./configure --prefix=/usr make } diff --git a/extra/xf86-video-glint/git-fix.diff b/extra/xf86-video-glint/git-fix.diff new file mode 100644 index 000000000..6bc5738c8 --- /dev/null +++ b/extra/xf86-video-glint/git-fix.diff @@ -0,0 +1,30 @@ +From 073d5b0b392781bf4a6aa7f9e2dbe2ae51caed2c Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:38 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/glint_driver.c b/src/glint_driver.c +index b6d20a9..aa78516 100644 +--- a/src/glint_driver.c ++++ b/src/glint_driver.c +@@ -52,8 +52,6 @@ + #include "compiler.h" + #include "mipointer.h" + +-#include "mibstore.h" +- + #include "pm3_regs.h" + #include "glint_regs.h" + #include "IBM.h" +@@ -2904,7 +2902,6 @@ GLINTScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +-- +cgit v0.9.0.2-2-gbebe |