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

[Jan de Groot]

    Date: Sunday, December 21, 2008 @ 16:33:51
  Author: jgc
Revision: 22093

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

........
  r22092 | jgc | 2008-12-21 21:33:39 +0000 (Sun, 21 Dec 2008) | 2 lines
  
  upgpkg: intel-dri 7.2-2
      Disable vsync, remove useless TTM warning because TTM is dead
........

Added:
  intel-dri/repos/extra-x86_64/intel-disable-ttm-warning.patch
    (from rev 22092, intel-dri/trunk/intel-disable-ttm-warning.patch)
  intel-dri/repos/extra-x86_64/intel-revert-vbl.patch
    (from rev 22092, intel-dri/trunk/intel-revert-vbl.patch)
Modified:
  intel-dri/repos/extra-x86_64/	(properties)
  intel-dri/repos/extra-x86_64/PKGBUILD

---------------------------------+
 PKGBUILD                        |   16 +++++++++++-----
 intel-disable-ttm-warning.patch |   13 +++++++++++++
 intel-revert-vbl.patch          |   21 +++++++++++++++++++++
 3 files changed, 45 insertions(+), 5 deletions(-)


Property changes on: intel-dri/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /intel-dri/trunk:1-14181
   + /intel-dri/trunk:1-22092
Deleted: svn:mergeinfo
   - 

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-21 21:33:39 UTC (rev 22092)
+++ extra-x86_64/PKGBUILD	2008-12-21 21:33:51 UTC (rev 22093)
@@ -3,21 +3,27 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=intel-dri
 pkgver=7.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Mesa DRI drivers for Intel chipsets"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 depends=('libdrm>=2.3.1' 'expat>=2.0.1' 'libgl>=7.2')
-makedepends=('dri2proto>=1.1' 'glproto>=1.4.9' 'pkgconfig' 'libxfixes' 'libxdamage' 'libxxf86vm' 'libxext')
+makedepends=('glproto>=1.4.9' 'pkgconfig' 'libxfixes' 'libxdamage' 'libxxf86vm' 'libxext')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/mesa3d/MesaLib-${pkgver}.tar.bz2
-	mesa-7.1-link-shared.patch)
+	mesa-7.1-link-shared.patch
+	intel-revert-vbl.patch
+	intel-disable-ttm-warning.patch)
 md5sums=('04d379292e023df0b0266825cb0dbde5'
-         'f0baa948d9810f268413111ee439d24b')
+         'f0baa948d9810f268413111ee439d24b'
+         'a111f4dc82e894f8801bc3fa129af7af'
+         'a393d374b5d187ff2a5bb90b0f347c9a')
 
 build() {
   cd ${srcdir}/Mesa-${pkgver}
-  patch -Np1 -i ${srcdir}/mesa-7.1-link-shared.patch
+  patch -Np1 -i "${srcdir}/intel-revert-vbl.patch" || return 1
+  patch -Np1 -i "${srcdir}/intel-disable-ttm-warning.patch" || return 1
+  patch -Np1 -i "${srcdir}/mesa-7.1-link-shared.patch" || return 1
   ./configure --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
     --with-dri-drivers=i810,i915,i965 \

Copied: intel-dri/repos/extra-x86_64/intel-disable-ttm-warning.patch (from rev 22092, intel-dri/trunk/intel-disable-ttm-warning.patch)
===================================================================
--- extra-x86_64/intel-disable-ttm-warning.patch	                        (rev 0)
+++ extra-x86_64/intel-disable-ttm-warning.patch	2008-12-21 21:33:51 UTC (rev 22093)
@@ -0,0 +1,13 @@
+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) {

Copied: intel-dri/repos/extra-x86_64/intel-revert-vbl.patch (from rev 22092, intel-dri/trunk/intel-revert-vbl.patch)
===================================================================
--- extra-x86_64/intel-revert-vbl.patch	                        (rev 0)
+++ extra-x86_64/intel-revert-vbl.patch	2008-12-21 21:33:51 UTC (rev 22093)
@@ -0,0 +1,21 @@
+commit 532d2051245a1d8afe7ca236f1d966d555bb121a
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Fri Sep 12 17:21:25 2008 +1000
+
+    Revert "intel: sync to vblank by default"
+    
+    This reverts commit e9bf3e4cc9a7e4bcd4c45bd707541d26ecdf0409.
+
+diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
+index c193830..f02192d 100644
+--- a/src/mesa/drivers/dri/intel/intel_screen.c
++++ b/src/mesa/drivers/dri/intel/intel_screen.c
+@@ -55,7 +55,7 @@ PUBLIC const char __driConfigOptions[] =
+    DRI_CONF_BEGIN
+    DRI_CONF_SECTION_PERFORMANCE
+       DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS)
+-      DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_ALWAYS_SYNC)
++      DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0)
+       /* Options correspond to DRI_CONF_BO_REUSE_DISABLED,
+        * DRI_CONF_BO_REUSE_ALL
+        */