[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD shadowfb.patch)

[andyrtr at archlinux.org]

    Date: Friday, December 28, 2012 @ 13:53:09
  Author: andyrtr
Revision: 173942

upgpkg: xf86-video-neomagic 1.2.7-4

add patch to get the driver working - FS#32604

Added:
  xf86-video-neomagic/trunk/shadowfb.patch
Modified:
  xf86-video-neomagic/trunk/PKGBUILD

----------------+
 PKGBUILD       |   10 +++++++---
 shadowfb.patch |   18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-28 13:12:00 UTC (rev 173941)
+++ PKGBUILD	2012-12-28 18:53:09 UTC (rev 173942)
@@ -3,7 +3,7 @@
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.7
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org neomagic video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -14,13 +14,17 @@
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch)
+        git-fixes.patch
+        shadowfb.patch)
 sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76'
-            '38b67ce2b0ff94f68c8e1f221759fd7e2059383f4dac716356b5ef2ad695507e')
+            '38b67ce2b0ff94f68c8e1f221759fd7e2059383f4dac716356b5ef2ad695507e'
+            'cf7e49f51869efdb22ee8d6e85bf0f557e22f08072e6d90a4dba3e39feabbf36')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/git-fixes.patch"
+  # workaround to get it work again https://bugs.archlinux.org/task/32604
+  patch -Np1 -i ${srcdir}/shadowfb.patch
   autoreconf
   ./configure --prefix=/usr
   make

Added: shadowfb.patch
===================================================================
--- shadowfb.patch	                        (rev 0)
+++ shadowfb.patch	2012-12-28 18:53:09 UTC (rev 173942)
@@ -0,0 +1,18 @@
+diff -ur xf86-video-neomagic-1.2.7.orig/src/neo_driver.c xf86-video-neomagic-1.2.7/src/neo_driver.c
+--- xf86-video-neomagic-1.2.7.orig/src/neo_driver.c	2012-12-26 22:14:47.876393607 -0800
++++ xf86-video-neomagic-1.2.7/src/neo_driver.c	2012-12-26 22:17:10.011933399 -0800
+@@ -1084,9 +1084,13 @@
+ 	xf86DrvMsg(pScrn->scrnIndex,X_CONFIG,
+ 		   "Show chache for debugging\n");
+ 
++    /*
++     * Seems modules shadow and/or shadowfb causes black screen and dead
++     * keyboard with xorg 1.13. Just disable it for now.
++     */
+     if (!xf86LoadSubModule(pScrn, "xaa")) {
+ 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadow\n");
+-	nPtr->shadowFB = 1;
++	nPtr->shadowFB = 0;
+     }
+ 
+     if (nPtr->shadowFB) {