diff options
| author | root <root@rshg054.dnsready.net> | 2011-10-12 23:14:40 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-10-12 23:14:40 +0000 |
| commit | b79408ae7429f4e5c99582cb55127b6e86b7fdac (patch) | |
| tree | 022f1f4179bb356f8c94ff00a4a56edbeaa7dc9c /extra/xf86-video-xgixp | |
| parent | f482dc1bd42773a12552e5a60df119410a0d8bd8 (diff) | |
Wed Oct 12 23:14:40 UTC 2011
Diffstat (limited to 'extra/xf86-video-xgixp')
| -rw-r--r-- | extra/xf86-video-xgixp/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch | 23 |
2 files changed, 32 insertions, 5 deletions
diff --git a/extra/xf86-video-xgixp/PKGBUILD b/extra/xf86-video-xgixp/PKGBUILD index 30d34d3a5..c3dd3e706 100644 --- a/extra/xf86-video-xgixp/PKGBUILD +++ b/extra/xf86-video-xgixp/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 115409 2011-03-17 18:38:51Z andyrtr $ +# $Id: PKGBUILD 140282 2011-10-11 21:28:12Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-xgixp pkgver=1.8.0 -pkgrel=3 +pkgrel=4 pkgdesc="X.org XGIXP video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa') +makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto') +conflicts=('xorg-server<1.10.99.902') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('67caeaa4c746572160208fe23c7257f62cb442a3') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + api-compat-fix-for-DRAWABLE_BUFFER.patch) +sha1sums=('67caeaa4c746572160208fe23c7257f62cb442a3' + 'ea140a13963bbf33cdff1ad75789d765867ec53b') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/api-compat-fix-for-DRAWABLE_BUFFER.patch" ./configure --prefix=/usr make make DESTDIR="${pkgdir}" install diff --git a/extra/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch b/extra/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch new file mode 100644 index 000000000..f8cb64673 --- /dev/null +++ b/extra/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch @@ -0,0 +1,23 @@ +From 86258a6fd8fc8bb09a52ee446b37abe6bd0843ef Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Fri, 25 Mar 2011 22:46:55 +0000 +Subject: API compat fix for DRAWABLE_BUFFER + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/xgi_driver.c b/src/xgi_driver.c +index e54d8c7..189b84a 100644 +--- a/src/xgi_driver.c ++++ b/src/xgi_driver.c +@@ -2708,7 +2708,9 @@ xg47_setup_fb_wrap(ReadMemoryProcPtr *read_ptr, + { + switch (pDraw->type) { + case DRAWABLE_WINDOW: ++#ifdef DRAWABLE_BUFFER + case DRAWABLE_BUFFER: ++#endif + *read_ptr = xg47_read_memory_swap_func; + *write_ptr = xg47_write_memory_swap_func; + break; +-- +cgit v0.8.3-6-g21f6 |