[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD git-fixes.patch)

[Jan de Groot]

    Date: Monday, October 18, 2010 @ 08:47:22
  Author: jgc
Revision: 95275

upgpkg: xf86-video-intel 2.13.0-4
Another update. Fixes unresolved symbols in case shadowfb is enabled. Update to last git snapshot

Modified:
  xf86-video-intel/trunk/PKGBUILD
  xf86-video-intel/trunk/git-fixes.patch

-----------------+
 PKGBUILD        |    5 +++--
 git-fixes.patch |   17 +++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-18 09:21:01 UTC (rev 95274)
+++ PKGBUILD	2010-10-18 12:47:22 UTC (rev 95275)
@@ -3,7 +3,7 @@
 
 pkgname=xf86-video-intel
 pkgver=2.13.0
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -17,13 +17,14 @@
         git-fixes.patch
         8xx-enable-shadow.patch)
 md5sums=('de2f8a5836d90c71f3175dcd46d03ec0'
-         '4527d56758d7ef07d7dddb9442c9a98f'
+         '2be4bf1558b996ad361ed30ce0633e7a'
          'baecc481d73e6fe31dbf6c28b649c5d6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/git-fixes.patch"
   patch -Np0 -i "${srcdir}/8xx-enable-shadow.patch"
+  autoreconf --install
   ./configure --prefix=/usr --enable-dri
   make
   make DESTDIR="${pkgdir}" install

Modified: git-fixes.patch
===================================================================
--- git-fixes.patch	2010-10-18 09:21:01 UTC (rev 95274)
+++ git-fixes.patch	2010-10-18 12:47:22 UTC (rev 95275)
@@ -356,6 +356,23 @@
  			static int once;
  
  			/* The GPU has hung and unlikely to recover by this point. */
+diff --git a/src/intel_display.c b/src/intel_display.c
+index 74ce736..d32224e 100644
+--- a/src/intel_display.c
++++ b/src/intel_display.c
+@@ -1161,7 +1161,11 @@ intel_output_set_property(xf86OutputPtr output, Atom property,
+ 		}
+ 	}
+ 
+-	return FALSE;
++	/* We didn't recognise this property, just report success in order
++	 * to allow the set to continue, otherwise we break setting of
++	 * common properties like EDID.
++	 */
++	return TRUE;
+ }
+ 
+ static Bool
 diff --git a/src/intel_dri.c b/src/intel_dri.c
 index 9804272..67f7be9 100644
 --- a/src/intel_dri.c