[arch-commits] Commit in xf86-video-xgixp/repos (4 files)

[Jan de Groot]

    Date: Tuesday, October 11, 2011 @ 17:28:10
  Author: jgc
Revision: 140281

db-move: moved xf86-video-xgixp from [testing] to [extra] (i686)

Added:
  xf86-video-xgixp/repos/extra-i686/PKGBUILD
    (from rev 140271, xf86-video-xgixp/repos/testing-i686/PKGBUILD)
  xf86-video-xgixp/repos/extra-i686/api-compat-fix-for-DRAWABLE_BUFFER.patch
    (from rev 140271, xf86-video-xgixp/repos/testing-i686/api-compat-fix-for-DRAWABLE_BUFFER.patch)
Deleted:
  xf86-video-xgixp/repos/extra-i686/PKGBUILD
  xf86-video-xgixp/repos/testing-i686/

------------------------------------------+
 PKGBUILD                                 |   54 +++++++++++++++--------------
 api-compat-fix-for-DRAWABLE_BUFFER.patch |   23 ++++++++++++
 2 files changed, 52 insertions(+), 25 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-10-11 21:28:09 UTC (rev 140280)
+++ extra-i686/PKGBUILD	2011-10-11 21:28:10 UTC (rev 140281)
@@ -1,25 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-xgixp
-pkgver=1.8.0
-pkgrel=3
-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')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('67caeaa4c746572160208fe23c7257f62cb442a3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: xf86-video-xgixp/repos/extra-i686/PKGBUILD (from rev 140271, xf86-video-xgixp/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-10-11 21:28:10 UTC (rev 140281)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-xgixp
+pkgver=1.8.0
+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>=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
+        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
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Copied: xf86-video-xgixp/repos/extra-i686/api-compat-fix-for-DRAWABLE_BUFFER.patch (from rev 140271, xf86-video-xgixp/repos/testing-i686/api-compat-fix-for-DRAWABLE_BUFFER.patch)
===================================================================
--- extra-i686/api-compat-fix-for-DRAWABLE_BUFFER.patch	                        (rev 0)
+++ extra-i686/api-compat-fix-for-DRAWABLE_BUFFER.patch	2011-10-11 21:28:10 UTC (rev 140281)
@@ -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