diff options
| author | root <root@rshg054.dnsready.net> | 2012-12-29 02:13:48 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-12-29 02:13:48 -0800 |
| commit | 5dd7ed82e788ebad2e920e0f2db7468cc6547cfe (patch) | |
| tree | f467412e09912ababcd8fe6c05193d829f514dcd /extra/xf86-video-neomagic | |
| parent | 3009e8addb4a894329bf8ab3e8fb763361833978 (diff) | |
Sat Dec 29 02:10:20 PST 2012
Diffstat (limited to 'extra/xf86-video-neomagic')
| -rw-r--r-- | extra/xf86-video-neomagic/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/xf86-video-neomagic/shadowfb.patch | 18 |
2 files changed, 26 insertions, 4 deletions
diff --git a/extra/xf86-video-neomagic/PKGBUILD b/extra/xf86-video-neomagic/PKGBUILD index cb909513b..67abbdac7 100644 --- a/extra/xf86-video-neomagic/PKGBUILD +++ b/extra/xf86-video-neomagic/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169532 2012-10-23 10:08:56Z jgc $ +# $Id: PKGBUILD 173943 2012-12-28 18:53:54Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> 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 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS 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 diff --git a/extra/xf86-video-neomagic/shadowfb.patch b/extra/xf86-video-neomagic/shadowfb.patch new file mode 100644 index 000000000..1cc963b96 --- /dev/null +++ b/extra/xf86-video-neomagic/shadowfb.patch @@ -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) { |