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

[Laurent Carlier]

    Date: Monday, July 21, 2014 @ 22:02:42
  Author: lcarlier
Revision: 217537

upgpkg: xf86-video-intel 2.99.912-4

disable dri3, broken with xorg-server 1.16 (FS#41275 FS#41264 FS#41261)

Added:
  xf86-video-intel/trunk/disable-dri3.patch
Modified:
  xf86-video-intel/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   11 +++++++---
 disable-dri3.patch |   52 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-21 18:37:19 UTC (rev 217536)
+++ PKGBUILD	2014-07-21 20:02:42 UTC (rev 217537)
@@ -4,7 +4,7 @@
 
 pkgname=xf86-video-intel
 pkgver=2.99.912
-pkgrel=3
+pkgrel=4
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -24,9 +24,11 @@
            'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch)
+	0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch
+	disable-dri3.patch)
 sha256sums=('7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501'
-            '19fe39fa5cd175e14f77d67dbd731f992c8f51161d90b73c63f52604a9eed7ce')
+            '19fe39fa5cd175e14f77d67dbd731f992c8f51161d90b73c63f52604a9eed7ce'
+            '2cddfd09c7c32f0cd80819fbb1226095bc77665e9e1943df4a1e9d3a8295cedb')
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -33,6 +35,9 @@
 
   # fix FS#40863, merged upstream
   patch -Np1 -i ../0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch
+  # ugly patch from fedora to disable dri3 (FS#41275 FS#41264 FS#41261)
+  patch -Np1 -i ../disable-dri3.patch
+  autoreconf -fiv
 }
 
 build() {

Added: disable-dri3.patch
===================================================================
--- disable-dri3.patch	                        (rev 0)
+++ disable-dri3.patch	2014-07-21 20:02:42 UTC (rev 217537)
@@ -0,0 +1,52 @@
+From 86b58835fce56ae13453a89a0b0d93c9517c2758 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede at redhat.com>
+Date: Thu, 12 Jun 2014 22:54:50 +0200
+Subject: [PATCH] HACK/quick-fix: disable dri3
+
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+---
+ configure.ac | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b3b6e8e..2937afc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -248,7 +248,8 @@ if test "x$shm" = "xyes"; then
+ 		  AC_MSG_RESULT(assuming no))
+ fi
+ 
+-PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"])
++dnl PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"])
++x11_dri3="no"
+ AM_CONDITIONAL(X11_DRI3, test "x$x11_dri3" = "xyes" -a "x$shm" = "xyes")
+ 
+ AC_ARG_ENABLE(tools,
+@@ -264,7 +265,8 @@ fi
+ if test "x$tools" != "xno"; then
+ 	ivo_requires="xinerama xrandr xdamage xfixes xcursor xtst xrender xext x11 pixman-1"
+ 	PKG_CHECK_MODULES(IVO, [$ivo_requires], [ivo="yes"], [ivo="no"])
+-	PKG_CHECK_MODULES(IVO_DRI3, [xcb-dri3 xcb-sync x11-xcb xshmfence x11], [ivo_dri3="yes"], [ivo_dri3="no"])
++	dnl PKG_CHECK_MODULES(IVO_DRI3, [xcb-dri3 xcb-sync x11-xcb xshmfence x11], [ivo_dri3="yes"], [ivo_dri3="no"])
++	ivo_dri3="no"
+ 	if test "x$ivo_dri3" = "xyes"; then
+ 		IVO_CFLAGS="$IVO_CFLAGS $IVO_DRI3_CFLAGS -DDRI3"
+ 		IVO_LIBS="$IVO_LIBS $IVO_DRI3_LIBS"
+@@ -520,10 +522,10 @@ if test "x$DRI" != "xno"; then
+ 		CFLAGS=$save_CFLAGS
+ 	fi
+ 
+-	XORG_DRIVER_CHECK_EXT(DRI3, dri3proto)
+-	if test "x$_EXT_CHECK" != "xno"; then
+-		PKG_CHECK_MODULES(DRI3, [dri3proto], [DRI3=$DRI], [])
+-	fi
++	dnl XORG_DRIVER_CHECK_EXT(DRI3, dri3proto)
++	dnl if test "x$_EXT_CHECK" != "xno"; then
++	dnl	PKG_CHECK_MODULES(DRI3, [dri3proto], [DRI3=$DRI], [])
++	dnl fi
+ 	if test "x$DRI3" != "xno"; then
+ 		save_CFLAGS=$CFLAGS
+ 		CFLAGS="$XORG_CFLAGS $DRI3_CFLAGS"
+-- 
+2.0.0
+