[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD fix-off-by-one-assert.patch)

[andyrtr at archlinux.org]

    Date: Saturday, January 8, 2011 @ 18:21:12
  Author: andyrtr
Revision: 105448

upgpkg: xf86-video-intel 2.14.0-1
final upstream release

Modified:
  xf86-video-intel/trunk/PKGBUILD
Deleted:
  xf86-video-intel/trunk/fix-off-by-one-assert.patch

-----------------------------+
 PKGBUILD                    |    9 +++------
 fix-off-by-one-assert.patch |   23 -----------------------
 2 files changed, 3 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-08 23:00:27 UTC (rev 105447)
+++ PKGBUILD	2011-01-08 23:21:12 UTC (rev 105448)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.13.903
+pkgver=2.14.0
 pkgrel=1
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
 arch=(i686 x86_64)
@@ -13,14 +13,11 @@
 conflicts=('xorg-server<1.9.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
 options=('!libtool')
 groups=('xorg-video-drivers')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        fix-off-by-one-assert.patch)
-sha1sums=('4ef6414055ceb3f98e4fec3481f3d9e7f08a5512'
-          'b36550921657572ecf28fa1bfac785655c6fbf49')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('05f187582aeabda57fcd6f2782cfbf8e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix-off-by-one-assert.patch"
   ./configure --prefix=/usr --enable-dri
   make
   make DESTDIR="${pkgdir}" install

Deleted: fix-off-by-one-assert.patch
===================================================================
--- fix-off-by-one-assert.patch	2011-01-08 23:00:27 UTC (rev 105447)
+++ fix-off-by-one-assert.patch	2011-01-08 23:21:12 UTC (rev 105448)
@@ -1,23 +0,0 @@
-From 22d7b61791c382088a6c0df5dce3a15405d6c495 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Tue, 04 Jan 2011 12:32:01 +0000
-Subject: i965: Fix off-by-one in assert
-
-Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
----
-diff --git a/src/i965_render.c b/src/i965_render.c
-index ca5e6b6..b1ac6ba 100644
---- a/src/i965_render.c
-+++ b/src/i965_render.c
-@@ -1730,8 +1730,7 @@ static void i965_bind_surfaces(struct intel_screen_private *intel)
- {
- 	uint32_t *binding_table;
- 
--	assert(intel->surface_used + 4 * sizeof(struct brw_surface_state_padded) <
--	       sizeof(intel->surface_data));
-+	assert(intel->surface_used + 4 * sizeof(struct brw_surface_state_padded) <= sizeof(intel->surface_data));
- 
- 	binding_table = (uint32_t*) (intel->surface_data + intel->surface_used);
- 	intel->surface_table = intel->surface_used;
---
-cgit v0.8.3-6-g21f6