[arch-commits] Commit in xf86-video-mach64/trunk (PKGBUILD mach64-fix-pixmap.patch)

[Jan de Groot]

    Date: Monday, July 11, 2011 @ 03:23:20
  Author: jgc
Revision: 131142

Remove upstream patch included in release

Modified:
  xf86-video-mach64/trunk/PKGBUILD
Deleted:
  xf86-video-mach64/trunk/mach64-fix-pixmap.patch

-------------------------+
 PKGBUILD                |    7 +-----
 mach64-fix-pixmap.patch |   47 ----------------------------------------------
 2 files changed, 2 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-11 07:18:06 UTC (rev 131141)
+++ PKGBUILD	2011-07-11 07:23:20 UTC (rev 131142)
@@ -13,14 +13,11 @@
 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')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('95a7ec9761fe11dadbcd9078c55148198a91b2f1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-#  patch -Np1 -i ${srcdir}/mach64-fix-pixmap.patch
   ./configure --prefix=/usr --enable-dri
   make
 }

Deleted: mach64-fix-pixmap.patch
===================================================================
--- mach64-fix-pixmap.patch	2011-07-11 07:18:06 UTC (rev 131141)
+++ mach64-fix-pixmap.patch	2011-07-11 07:23:20 UTC (rev 131142)
@@ -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
-