[arch-commits] Commit in xf86-video-intel/trunk (2 files)

[Laurent Carlier]

    Date: Sunday, September 21, 2014 @ 21:21:05
  Author: lcarlier
Revision: 222552

upgpkg: xf86-video-intel 2.99.916-2

fix FS#41944

Added:
  xf86-video-intel/trunk/0001-sna-Use-default-monitor-options-on-the-first-output.patch
Modified:
  xf86-video-intel/trunk/PKGBUILD

----------------------------------------------------------------+
 0001-sna-Use-default-monitor-options-on-the-first-output.patch |   37 ++++++++++
 PKGBUILD                                                       |   15 +++-
 2 files changed, 49 insertions(+), 3 deletions(-)

Added: 0001-sna-Use-default-monitor-options-on-the-first-output.patch
===================================================================
--- 0001-sna-Use-default-monitor-options-on-the-first-output.patch	                        (rev 0)
+++ 0001-sna-Use-default-monitor-options-on-the-first-output.patch	2014-09-21 19:21:05 UTC (rev 222552)
@@ -0,0 +1,37 @@
+From 1aefd16964c30264c05d136cef3e1e7de5eb9c53 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Fri, 12 Sep 2014 07:46:43 +0100
+Subject: [PATCH] sna: Use default monitor options on the first output
+
+commit 6554cf0a69f04710b64f3488384fe5cb2748dc35
+Author: Chris Wilson <chris at chris-wilson.co.uk>
+Date:   Mon Aug 11 12:22:17 2014 +0100
+
+    sna: Parse output options early during initialisation
+
+rearranged the monitor query to before the num_outputs increment. The
+result was that it choose the second output as the default and not the
+intended first.
+
+Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=522500
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+---
+ src/sna/sna_display.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index f136c20..f6cfc80 100644
+--- a/src/sna/sna_display.c
++++ b/src/sna/sna_display.c
+@@ -3751,7 +3751,7 @@ sna_output_add(struct sna *sna, unsigned id, unsigned serial)
+ 	output->name = (char *)(output + 1);
+ 	memcpy(output->name, name, len + 1);
+ 
+-	output->use_screen_monitor = config->num_output != 1;
++	output->use_screen_monitor = config->num_output != 0;
+ 	xf86OutputUseScreenMonitor(output, !output->use_screen_monitor);
+ 	assert(output->options);
+ 
+-- 
+2.1.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-21 18:58:28 UTC (rev 222551)
+++ PKGBUILD	2014-09-21 19:21:05 UTC (rev 222552)
@@ -4,7 +4,7 @@
 
 pkgname=xf86-video-intel
 pkgver=2.99.916
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -23,9 +23,18 @@
 conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19'
            '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)
-sha256sums=('409a819f4ac3e7c9432dd4acafe4621bbb3702adb34b1ea942b2e6d7c71eed01')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        0001-sna-Use-default-monitor-options-on-the-first-output.patch)
+sha256sums=('409a819f4ac3e7c9432dd4acafe4621bbb3702adb34b1ea942b2e6d7c71eed01'
+            '0195f5e5e69fc4b86d7ab51bc3d297e283cbdaec5c729702cca1b213809b4a18')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  # Fix FS#41944 merged upstream
+  patch -Np1 -i ../0001-sna-Use-default-monitor-options-on-the-first-output.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \