From 415856bdd4f48ab4f2732996f0bae58595092bbe Mon Sep 17 00:00:00 2001
From: Parabola <dev@list.parabolagnulinux.org>
Date: Tue, 5 Apr 2011 14:26:38 +0000
Subject: Tue Apr  5 14:26:38 UTC 2011

---
 testing/xf86-video-mach64/PKGBUILD                | 29 ++++++++++++++
 testing/xf86-video-mach64/mach64-fix-pixmap.patch | 47 +++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 testing/xf86-video-mach64/PKGBUILD
 create mode 100644 testing/xf86-video-mach64/mach64-fix-pixmap.patch

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

diff --git a/testing/xf86-video-mach64/PKGBUILD b/testing/xf86-video-mach64/PKGBUILD
new file mode 100644
index 000000000..0fa53fc78
--- /dev/null
+++ b/testing/xf86-video-mach64/PKGBUILD
@@ -0,0 +1,29 @@
+# $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=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.10.0')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+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
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/testing/xf86-video-mach64/mach64-fix-pixmap.patch b/testing/xf86-video-mach64/mach64-fix-pixmap.patch
new file mode 100644
index 000000000..6f1a64748
--- /dev/null
+++ b/testing/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