From 28b5bbf3fee0627993658e096eadab71c2779912 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Tue, 12 Apr 2011 10:53:36 +0000
Subject: Tue Apr 12 10:53:36 UTC 2011

---
 extra/xf86-video-mach64/PKGBUILD                | 13 ++++---
 extra/xf86-video-mach64/mach64-fix-pixmap.patch | 47 +++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 extra/xf86-video-mach64/mach64-fix-pixmap.patch

(limited to 'extra/xf86-video-mach64')

diff --git a/extra/xf86-video-mach64/PKGBUILD b/extra/xf86-video-mach64/PKGBUILD
index dd080c051..0fa53fc78 100644
--- a/extra/xf86-video-mach64/PKGBUILD
+++ b/extra/xf86-video-mach64/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 114315 2011-03-12 11:46:25Z jgc $
+# $Id: PKGBUILD 115331 2011-03-17 17:51:48Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-mach64
 pkgver=6.8.2
-pkgrel=5
+pkgrel=6
 pkgdesc="X.org mach64 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc' 'mach64-dri')
 makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa')
-conflicts=('xorg-server<1.9.0')
+conflicts=('xorg-server<1.10.0')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('b7303689a6a971b956061fd81399dc81adb865af')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+	mach64-fix-pixmap.patch)
+sha1sums=('b7303689a6a971b956061fd81399dc81adb865af'
+          '9658d16b964c1c0a3f8aa68f6706bd643cef321e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/mach64-fix-pixmap.patch
   ./configure --prefix=/usr --enable-dri
   make
   make DESTDIR="${pkgdir}" install
diff --git a/extra/xf86-video-mach64/mach64-fix-pixmap.patch b/extra/xf86-video-mach64/mach64-fix-pixmap.patch
new file mode 100644
index 000000000..6f1a64748
--- /dev/null
+++ b/extra/xf86-video-mach64/mach64-fix-pixmap.patch
@@ -0,0 +1,47 @@
+diff --git a/src/aticonsole.c b/src/aticonsole.c
+index 1be147e..6e742d9 100644
+--- a/src/aticonsole.c
++++ b/src/aticonsole.c
+@@ -28,6 +28,7 @@
+ #include "config.h"
+ #endif
+ 
++#include "xorgVersion.h"
+ #include "ati.h"
+ #include "aticonsole.h"
+ #include "atii2c.h"
+@@ -689,7 +690,9 @@ ATIEnterVT
+     ScreenPtr   pScreen     = pScreenInfo->pScreen;
+     ATIPtr      pATI        = ATIPTR(pScreenInfo);
+     PixmapPtr   pScreenPixmap;
++#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
+     DevUnion    PixmapPrivate;
++#endif
+     Bool        Entered;
+ 
+     if (!ATIEnterGraphics(NULL, pScreenInfo, pATI))
+@@ -714,19 +717,24 @@ ATIEnterVT
+     }
+ 
+     pScreenPixmap = (*pScreen->GetScreenPixmap)(pScreen);
++
++#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
+     PixmapPrivate = pScreenPixmap->devPrivate;
+     if (!PixmapPrivate.ptr)
+         pScreenPixmap->devPrivate = pScreenInfo->pixmapPrivate;
++#endif
+ 
+     /* Tell framebuffer about remapped aperture */
+     Entered = (*pScreen->ModifyPixmapHeader)(pScreenPixmap,
+         -1, -1, -1, -1, -1, pATI->pMemory);
+ 
++#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
+     if (!PixmapPrivate.ptr)
+     {
+         pScreenInfo->pixmapPrivate = pScreenPixmap->devPrivate;
+         pScreenPixmap->devPrivate.ptr = NULL;
+     }
++#endif
+ 
+ #ifdef XF86DRI_DEVEL
+ 
-- 
cgit v1.2.3-54-g00ecf