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

Jan de Groot jgc at archlinux.org
Tue Oct 11 17:29:06 EDT 2011


    Date: Tuesday, October 11, 2011 @ 17:29:05
  Author: jgc
Revision: 140325

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

Added:
  xf86-video-mach64/repos/extra-i686/PKGBUILD
    (from rev 140271, xf86-video-mach64/repos/testing-i686/PKGBUILD)
Deleted:
  xf86-video-mach64/repos/extra-i686/PKGBUILD
  xf86-video-mach64/repos/extra-i686/mach64-fix-pixmap.patch
  xf86-video-mach64/repos/testing-i686/

-------------------------+
 PKGBUILD                |   63 +++++++++++++++++++++-------------------------
 mach64-fix-pixmap.patch |   47 ----------------------------------
 2 files changed, 30 insertions(+), 80 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-10-11 21:29:03 UTC (rev 140324)
+++ extra-i686/PKGBUILD	2011-10-11 21:29:05 UTC (rev 140325)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-mach64
-pkgver=6.9.0
-pkgrel=1
-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=('95a7ec9761fe11dadbcd9078c55148198a91b2f1'
-          '9658d16b964c1c0a3f8aa68f6706bd643cef321e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-#  patch -Np1 -i ${srcdir}/mach64-fix-pixmap.patch
-  ./configure --prefix=/usr --enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: xf86-video-mach64/repos/extra-i686/PKGBUILD (from rev 140271, xf86-video-mach64/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-10-11 21:29:05 UTC (rev 140325)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-mach64
+pkgver=6.9.0
+pkgrel=2
+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>=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
+conflicts=('xorg-server<1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('95a7ec9761fe11dadbcd9078c55148198a91b2f1')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --enable-dri
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Deleted: extra-i686/mach64-fix-pixmap.patch
===================================================================
--- extra-i686/mach64-fix-pixmap.patch	2011-10-11 21:29:03 UTC (rev 140324)
+++ extra-i686/mach64-fix-pixmap.patch	2011-10-11 21:29:05 UTC (rev 140325)
@@ -1,47 +0,0 @@
-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
- 



More information about the arch-commits mailing list