[arch-commits] Commit in xf86-video-nv/trunk (PKGBUILD nv-2.1.15-g80-nop-gamma.patch)

[Jan de Groot]

    Date: Saturday, March 13, 2010 @ 15:02:47
  Author: jgc
Revision: 72209

upgpkg: xf86-video-nv 2.1.17-1
Update to 2.1.17, remove upstream-applied patch

Modified:
  xf86-video-nv/trunk/PKGBUILD
Deleted:
  xf86-video-nv/trunk/nv-2.1.15-g80-nop-gamma.patch

-------------------------------+
 PKGBUILD                      |   11 ++++-------
 nv-2.1.15-g80-nop-gamma.patch |   25 -------------------------
 2 files changed, 4 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-13 19:58:51 UTC (rev 72208)
+++ PKGBUILD	2010-03-13 20:02:47 UTC (rev 72209)
@@ -2,8 +2,8 @@
 # Maintainer:Jan de Groot <jgc at archlinux.org>
 
 pkgname=xf86-video-nv
-pkgver=2.1.15
-pkgrel=2
+pkgver=2.1.17
+pkgrel=1
 pkgdesc="X.org nv video driver"
 arch=(i686 x86_64)
 license=('custom')
@@ -13,14 +13,11 @@
 conflicts=('xorg-server<1.7.0')
 options=('!libtool')
 groups=('xorg-video-drivers')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        nv-2.1.15-g80-nop-gamma.patch)
-md5sums=('1b22188bd9012a148206940708b52ea6'
-         '9c021cbda033509e8e1bae0042aab82f')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('9f165c085e6420470191a544404066524f2f1c61')
 
 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

Deleted: nv-2.1.15-g80-nop-gamma.patch
===================================================================
--- nv-2.1.15-g80-nop-gamma.patch	2010-03-13 19:58:51 UTC (rev 72208)
+++ nv-2.1.15-g80-nop-gamma.patch	2010-03-13 20:02:47 UTC (rev 72209)
@@ -1,25 +0,0 @@
-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,