[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD sna_backlight_fixes.diff)

[andyrtr at archlinux.org]

    Date: Wednesday, July 25, 2012 @ 11:10:25
  Author: andyrtr
Revision: 164054

upgpkg: xf86-video-intel 2.20.1-3

fix backlight also for sna

Added:
  xf86-video-intel/trunk/sna_backlight_fixes.diff
Modified:
  xf86-video-intel/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |    9 +++++--
 sna_backlight_fixes.diff |   54 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-25 06:40:02 UTC (rev 164053)
+++ PKGBUILD	2012-07-25 15:10:25 UTC (rev 164054)
@@ -4,7 +4,7 @@
 
 pkgname=xf86-video-intel
 pkgver=2.20.1
-pkgrel=2
+pkgrel=3
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -18,14 +18,17 @@
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        gmux_backlight.diff)
+        gmux_backlight.diff
+        sna_backlight_fixes.diff)
 sha256sums=('de340a527dfa26bba6f79b423c2fe2b1d70657e46fa3fb468613c047443ff424'
-            '87383122dae69512f86039e9d72110bd6bf4cf717756a31b34862c200277b31b')
+            '87383122dae69512f86039e9d72110bd6bf4cf717756a31b34862c200277b31b'
+            'a4a6bc1c4a6b79c80c56764eed8ab318a587ed554d5d9a381cc7238ab884ec04')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   # https://bugs.freedesktop.org/show_bug.cgi?id=52423
   patch -Np1 -i ${srcdir}/gmux_backlight.diff
+  patch -Np1 -i ${srcdir}/sna_backlight_fixes.diff
   ./configure --prefix=/usr \
     --enable-dri
   make

Added: sna_backlight_fixes.diff
===================================================================
--- sna_backlight_fixes.diff	                        (rev 0)
+++ sna_backlight_fixes.diff	2012-07-25 15:10:25 UTC (rev 164054)
@@ -0,0 +1,54 @@
+From 0ab6d7a50d37cf4454577cb8c333d4b8683aa054 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Wed, 25 Jul 2012 11:20:36 +0000
+Subject: sna: Prefer platform backlight devices over firmware
+
+This is in contrast to libbacklight but closer to our original code as
+we prefer a known custom backlight controller over the ACPI interfaces.
+As only the ACPI interfaces are marked as firmware, and the custom
+backlight controllers as platform, we therefore need to prefer platform
+backlight devices.
+
+Reported-by: Austin Lund <austin.lund at gmail.com>
+References: https://bugs.freedesktop.org/show_bug.cgi?id=52423
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index b31f08d..ebecd21 100644
+--- a/src/sna/sna_display.c
++++ b/src/sna/sna_display.c
+@@ -282,8 +282,8 @@ sna_output_backlight_get_max(xf86OutputPtr output)
+ }
+ 
+ enum {
+-	FIRMWARE,
+ 	PLATFORM,
++	FIRMWARE,
+ 	RAW,
+ 	NAMED,
+ };
+--
+cgit v0.9.0.2-2-gbebe
+From 484b072072c8297a87940c9e32097923f0a77c8f Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Wed, 25 Jul 2012 11:22:47 +0000
+Subject: sna: Add 'gmux_backlight' to list of known devices for backwards compatability
+
+Reported-by: Austin Lund <austin.lund at gmail.com>
+References: https://bugs.freedesktop.org/show_bug.cgi?id=52423
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index ebecd21..a908596 100644
+--- a/src/sna/sna_display.c
++++ b/src/sna/sna_display.c
+@@ -292,6 +292,7 @@ static void
+ sna_output_backlight_init(xf86OutputPtr output)
+ {
+ 	static const char *known_interfaces[] = {
++		"gmux_backlight",
+ 		"asus-laptop",
+ 		"asus-nb-wmi",
+ 		"eeepc",
+--
+cgit v0.9.0.2-2-gbebe