Date: Monday, November 21, 2016 @ 14:51:38
Author: lcarlier
Revision: 281753
upgpkg: xf86-video-nv 2.1.20-8
xorg-server-1.19 rebuild
Modified:
xf86-video-nv/trunk/PKGBUILD
xf86-video-nv/trunk/git-fixes.patch
-+
PKGBUILD| 12 +-
git-fixes.patch | 268 +-
2 files changed, 270 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-11-21 14:45:48 UTC (rev 281752)
+++ PKGBUILD2016-11-21 14:51:38 UTC (rev 281753)
@@ -4,18 +4,18 @@
pkgname=xf86-video-nv
pkgver=2.1.20
-pkgrel=7
+pkgrel=8
pkgdesc="X.org nv video driver"
arch=('i686' 'x86_64')
license=('custom')
-url="http://xorg.freedesktop.org/;
+url="https://xorg.freedesktop.org/;
depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=20')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20'
'X-ABI-VIDEODRV_VERSION>=21')
-groups=('xorg-drivers' 'xorg')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23'
'X-ABI-VIDEODRV_VERSION>=24')
+groups=('xorg-drivers')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
git-fixes.patch)
sha256sums=('8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf'
-'0ec4234fd9202956d25ca93e9131930e4a3fbba5de2ca870d0cf2302ccb76b46')
+'f4deb2b8f8acbbe901a25a8e9e0f29de80a63b62189ea00c95143be69f5fa87b')
prepare() {
cd ${pkgname}-${pkgver}
Modified: git-fixes.patch
===
--- git-fixes.patch 2016-11-21 14:45:48 UTC (rev 281752)
+++ git-fixes.patch 2016-11-21 14:51:38 UTC (rev 281753)
@@ -1,10 +1,17 @@
From fc78fe98222b0204b8a2872a529763d6fe5048da Mon Sep 17 00:00:00 2001
From: Adam Jackson
-Date: Tue, 25 Sep 2012 12:54:49 +
-Subject: Remove mibstore.h
+Date: Tue, 25 Sep 2012 08:54:49 -0400
+Subject: [PATCH 1/5] Remove mibstore.h
Signed-off-by: Adam Jackson
---
+ src/g80_driver.c | 2 --
+ src/nv_driver.c| 1 -
+ src/nv_include.h | 3 ---
+ src/riva_driver.c | 1 -
+ src/riva_include.h | 3 ---
+ 5 files changed, 10 deletions(-)
+
diff --git a/src/g80_driver.c b/src/g80_driver.c
index cc4e197..719b96c 100644
--- a/src/g80_driver.c
@@ -77,5 +84,258 @@
#include "micmap.h"
#include "xf86DDC.h"
---
-cgit v0.9.0.2-2-gbebe
+--
+2.10.2
+
+
+From 49ee1c26ea982e302169c949ebd0abb9d8ef362c Mon Sep 17 00:00:00 2001
+From: Jeremy White
+Date: Thu, 21 Mar 2013 08:59:06 -0700
+Subject: [PATCH 2/5] Include xf86Modes.h to use functions from
+ hw/xfree86/modes/xf86Modes.c.
+
+Signed-off-by: Jeremy White
+Reviewed-by: Robert Morell
+Reviewed-by: Aaron Plattner
+Signed-off-by: Aaron Plattner
+---
+ src/nv_include.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/nv_include.h b/src/nv_include.h
+index f174eef..72c74d5 100644
+--- a/src/nv_include.h
b/src/nv_include.h
+@@ -27,6 +27,7 @@
+ #include "micmap.h"
+
+ #include "xf86DDC.h"
++#include "xf86Modes.h"
+
+ #include "vbe.h"
+
+--
+2.10.2
+
+
+From 0b6619fec39fada995646fb95bb25e72d3c9a491 Mon Sep 17 00:00:00 2001
+From: Egbert Eich
+Date: Tue, 13 Aug 2013 20:36:59 +0200
+Subject: [PATCH 3/5] init: Initialize VGA IOBase before using it
+
+The NV driver did never set the VGA IOBase for those registers which
+have different addresses dependent whether the VGA engine is running in
+mono or color mode.
+This has not been detected as the VGA mode and font save/restore
+functions initialize this value themselves.
+
+Signed-off-by: Egbert Eich
+Reviewed-by: Mark Kettenis
+---
+ src/nv_setup.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/nv_setup.c b/src/nv_setup.c
+index 203e7b2..92ca3ec 100644
+--- a/src/nv_setup.c
b/src/nv_setup.c
+@@ -491,6 +491,8 @@ NVCommonSetup(ScrnInfoPtr pScrn)
+
+ pNv->Television = FALSE;
+
++vgaHWGetIOBase(pVga);
++
+ if(!pNv->twoHeads) {
+pNv->CRTCnumber = 0;
+if((monitorA = NVProbeDDC(pScrn, 0))) {
+--
+2.10.2
+
+
+From 38d888e0f377bf28373b55c3250c39ab5f8c95b3 Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb
+Date: Mon, 18 Nov 2013 21:14:42 +0100
+Subject: [PATCH 4/5] Fix shadow framebuffer implementation.
+
+Makes it possible to run the nv driver without XAA on cards where
+EXA is not supported.
+
+Signed-off-by: Matthieu Herrb
+Reviewed-by: Adam Jackson
+---
+ src/nv_driver.c | 44 +---
+ src/nv_local.h | 1 +
+ src/nv_proto.h | 1 +
+ src/nv_shadow.c | 11 +++
+ src/nv_type.h | 2 ++
+ 5 files changed, 56 insertions(+), 3 deletions(-)
+
+diff --git
