[arch-commits] Commit in intel-dri/repos (3 files)

[Jan de Groot]

    Date: Sunday, March 29, 2009 @ 12:29:16
  Author: jgc
Revision: 32223

Merged revisions 32222 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/intel-dri/trunk

........
  r32222 | jgc | 2009-03-29 16:29:04 +0000 (Sun, 29 Mar 2009) | 1 line
  
  upgpkg: intel-dri 7.4-1
........

Modified:
  intel-dri/repos/testing-x86_64/	(properties)
  intel-dri/repos/testing-x86_64/PKGBUILD
Deleted:
  intel-dri/repos/testing-x86_64/intel-disable-ttm-warning.patch

---------------------------------+
 PKGBUILD                        |    6 +++---
 intel-disable-ttm-warning.patch |   13 -------------
 2 files changed, 3 insertions(+), 16 deletions(-)


Property changes on: intel-dri/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /intel-dri/trunk:1-28357
   + /intel-dri/trunk:1-32222

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-03-29 16:29:04 UTC (rev 32222)
+++ testing-x86_64/PKGBUILD	2009-03-29 16:29:16 UTC (rev 32223)
@@ -2,18 +2,18 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=intel-dri
-pkgver=7.3
+pkgver=7.4
 pkgrel=1
 pkgdesc="Mesa DRI drivers for Intel chipsets"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
-depends=('libdrm>=2.4.4' 'expat>=2.0.1' 'libgl>=7.3')
+depends=('libdrm>=2.4.5-3' 'expat>=2.0.1' 'libgl>=7.4')
 makedepends=('glproto>=1.4.9' 'dri2proto>=1.1.93' 'pkgconfig')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/mesa3d/MesaLib-${pkgver}.tar.bz2
 	mesa-7.1-link-shared.patch
 	intel-revert-vbl.patch)
-md5sums=('781e7811a6ed5c97b2b8defefc8ffbc9'
+md5sums=('7ecddb341a2691e0dfdb02f697109834'
          'f0baa948d9810f268413111ee439d24b'
 	 'a111f4dc82e894f8801bc3fa129af7af')
 

Deleted: testing-x86_64/intel-disable-ttm-warning.patch
===================================================================
--- testing-x86_64/intel-disable-ttm-warning.patch	2009-03-29 16:29:04 UTC (rev 32222)
+++ testing-x86_64/intel-disable-ttm-warning.patch	2009-03-29 16:29:16 UTC (rev 32223)
@@ -1,13 +0,0 @@
-diff -ruN Mesa-7.2.orig/src/mesa/drivers/dri/intel/intel_context.c Mesa-7.2/src/mesa/drivers/dri/intel/intel_context.c
---- Mesa-7.2.orig/src/mesa/drivers/dri/intel/intel_context.c	2008-09-13 20:25:44.000000000 +0000
-+++ Mesa-7.2/src/mesa/drivers/dri/intel/intel_context.c	2008-12-21 21:27:45.000000000 +0000
-@@ -490,9 +490,6 @@
-    if (intel->bufmgr == NULL) {
-       if (ttm_disable) {
- 	 fprintf(stderr, "TTM buffer manager disabled.  Using classic.\n");
--      } else {
--	 fprintf(stderr, "Failed to initialize TTM buffer manager.  "
--		 "Falling back to classic.\n");
-       }
- 
-       if (intelScreen->tex.size == 0) {