Date: Sunday, November 8, 2009 @ 15:51:33 Author: jgc Revision: 58504
Merged revisions 58503 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/xf86-video-nv/trunk ........ r58503 | jgc | 2009-11-08 21:51:17 +0100 (Sun, 08 Nov 2009) | 2 lines upgpkg: xf86-video-nv 2.1.15-2 Add patch to fix segfault on G80 hardware (FS#16979) ........ Added: xf86-video-nv/repos/extra-i686/nv-2.1.15-g80-nop-gamma.patch (from rev 58503, xf86-video-nv/trunk/nv-2.1.15-g80-nop-gamma.patch) Modified: xf86-video-nv/repos/extra-i686/ (properties) xf86-video-nv/repos/extra-i686/PKGBUILD -------------------------------+ PKGBUILD | 9 ++++++--- nv-2.1.15-g80-nop-gamma.patch | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) Property changes on: xf86-video-nv/repos/extra-i686 ___________________________________________________________________ Modified: svnmerge-integrated - /xf86-video-nv/trunk:1-55614 + /xf86-video-nv/trunk:1-58503 Modified: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2009-11-08 20:51:17 UTC (rev 58503) +++ extra-i686/PKGBUILD 2009-11-08 20:51:33 UTC (rev 58504) @@ -3,7 +3,7 @@ pkgname=xf86-video-nv pkgver=2.1.15 -pkgrel=1 +pkgrel=2 pkgdesc="X.org nv video driver" arch=(i686 x86_64) license=('custom') @@ -13,11 +13,14 @@ conflicts=('xorg-server<1.7.0') options=('!libtool') groups=('xorg-video-drivers') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -md5sums=('1b22188bd9012a148206940708b52ea6') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + nv-2.1.15-g80-nop-gamma.patch) +md5sums=('1b22188bd9012a148206940708b52ea6' + '9c021cbda033509e8e1bae0042aab82f') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/nv-2.1.15-g80-nop-gamma.patch" || return 1 ./configure --prefix=/usr || return 1 make || return 1 make DESTDIR="${pkgdir}" install || return 1 Copied: xf86-video-nv/repos/extra-i686/nv-2.1.15-g80-nop-gamma.patch (from rev 58503, xf86-video-nv/trunk/nv-2.1.15-g80-nop-gamma.patch) =================================================================== --- extra-i686/nv-2.1.15-g80-nop-gamma.patch (rev 0) +++ extra-i686/nv-2.1.15-g80-nop-gamma.patch 2009-11-08 20:51:33 UTC (rev 58504) @@ -0,0 +1,25 @@ +diff -up xf86-video-nv-2.1.15/src/g80_display.c.jx xf86-video-nv-2.1.15/src/g80_display.c +--- xf86-video-nv-2.1.15/src/g80_display.c.jx 2009-07-15 21:11:05.000000000 -0400 ++++ xf86-video-nv-2.1.15/src/g80_display.c 2009-10-28 04:14:55.189892176 -0400 +@@ -645,6 +645,12 @@ G80CrtcCommit(xf86CrtcPtr crtc) + C(0x00000080, 0); + } + ++static void ++G80DispGammaSet(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue, ++ int size) ++{ ++} ++ + static const xf86CrtcFuncsRec g80_crtc_funcs = { + .dpms = G80CrtcDPMSSet, + .save = NULL, +@@ -654,7 +660,7 @@ static const xf86CrtcFuncsRec g80_crtc_f + .mode_fixup = G80CrtcModeFixup, + .prepare = G80CrtcPrepare, + .mode_set = G80CrtcModeSet, +- // .gamma_set = G80DispGammaSet, ++ .gamma_set = G80DispGammaSet, + .commit = G80CrtcCommit, + .shadow_create = NULL, + .shadow_destroy = NULL,