[arch-commits] Commit in xf86-video-xgixp/trunk (2 files)

[Jan de Groot]

    Date: Thursday, August 11, 2011 @ 03:24:33
  Author: jgc
Revision: 135215

upgpkg: xf86-video-xgixp 1.8.0-4
Rebuild for xorg-server 1.11, add patch to fix compilation, add glproto makedepend

Added:
  xf86-video-xgixp/trunk/api-compat-fix-for-DRAWABLE_BUFFER.patch
Modified:
  xf86-video-xgixp/trunk/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |   12 ++++++++----
 api-compat-fix-for-DRAWABLE_BUFFER.patch |   23 +++++++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-11 07:18:37 UTC (rev 135214)
+++ PKGBUILD	2011-08-11 07:24:33 UTC (rev 135215)
@@ -3,20 +3,24 @@
 
 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

Added: api-compat-fix-for-DRAWABLE_BUFFER.patch
===================================================================
--- api-compat-fix-for-DRAWABLE_BUFFER.patch	                        (rev 0)
+++ api-compat-fix-for-DRAWABLE_BUFFER.patch	2011-08-11 07:24:33 UTC (rev 135215)
@@ -0,0 +1,23 @@
+From 86258a6fd8fc8bb09a52ee446b37abe6bd0843ef Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Fri, 25 Mar 2011 22:46:55 +0000
+Subject: API compat fix for DRAWABLE_BUFFER
+
+Signed-off-by: Adam Jackson <ajax at 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