[Glibc-bsd-commits] r4961 - in trunk/xserver-xorg-video-nv/debian: . patches

[Robert Millan]

Author: rmh
Date: 2013-09-25 11:29:32 +0000 (Wed, 25 Sep 2013)
New Revision: 4961

Added:
   trunk/xserver-xorg-video-nv/debian/patches/00_git_update.diff
Modified:
   trunk/xserver-xorg-video-nv/debian/changelog
   trunk/xserver-xorg-video-nv/debian/patches/01_fix_linking.diff
   trunk/xserver-xorg-video-nv/debian/patches/series
Log:
Cherry-pick FreeBSD build fixes from upstream git.  (Closes: #724325)

Modified: trunk/xserver-xorg-video-nv/debian/changelog
===================================================================
--- trunk/xserver-xorg-video-nv/debian/changelog	2013-09-25 11:00:52 UTC (rev 4960)
+++ trunk/xserver-xorg-video-nv/debian/changelog	2013-09-25 11:29:32 UTC (rev 4961)
@@ -1,3 +1,11 @@
+xserver-xorg-video-nv (1:2.1.20-2) UNRELEASED; urgency=low
+
+  [ Petr Salinger ]
+  * Cherry-pick FreeBSD build fixes from upstream git.
+    (Closes: #724325)
+
+ -- Robert Millan <rmh at debian.org>  Wed, 25 Sep 2013 13:04:06 +0200
+
 xserver-xorg-video-nv (1:2.1.20-1) unstable; urgency=low
 
   * New upstream release.  (Closes: #683409)

Added: trunk/xserver-xorg-video-nv/debian/patches/00_git_update.diff
===================================================================
--- trunk/xserver-xorg-video-nv/debian/patches/00_git_update.diff	                        (rev 0)
+++ trunk/xserver-xorg-video-nv/debian/patches/00_git_update.diff	2013-09-25 11:29:32 UTC (rev 4961)
@@ -0,0 +1,77 @@
+--- a/src/g80_driver.c
++++ b/src/g80_driver.c
+@@ -34,7 +34,6 @@
+ #include <xf86Resources.h>
+ #endif
+ #include <mipointer.h>
+-#include <mibstore.h>
+ #include <micmap.h>
+ #include <xf86cmap.h>
+ #include <fb.h>
+@@ -833,7 +832,6 @@
+         }
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+--- a/src/nv_driver.c
++++ b/src/nv_driver.c
+@@ -2550,7 +2550,6 @@
+     if (!pNv->NoAccel)
+ 	NVAccelInit(pScreen);
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+--- a/src/nv_include.h
++++ b/src/nv_include.h
+@@ -24,12 +24,10 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
++#include "xf86Modes.h"
+ 
+ #include "vbe.h"
+ 
+--- a/src/nv_setup.c
++++ b/src/nv_setup.c
+@@ -491,6 +491,8 @@
+ 
+     pNv->Television = FALSE;
+ 
++    vgaHWGetIOBase(pVga);
++
+     if(!pNv->twoHeads) {
+        pNv->CRTCnumber = 0;
+        if((monitorA = NVProbeDDC(pScrn, 0))) {
+--- a/src/riva_driver.c
++++ b/src/riva_driver.c
+@@ -1168,7 +1168,6 @@
+     if (!pRiva->NoAccel)
+ 	RivaAccelInit(pScreen);
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+--- a/src/riva_include.h
++++ b/src/riva_include.h
+@@ -22,9 +22,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"

Modified: trunk/xserver-xorg-video-nv/debian/patches/01_fix_linking.diff
===================================================================
--- trunk/xserver-xorg-video-nv/debian/patches/01_fix_linking.diff	2013-09-25 11:00:52 UTC (rev 4960)
+++ trunk/xserver-xorg-video-nv/debian/patches/01_fix_linking.diff	2013-09-25 11:29:32 UTC (rev 4961)
@@ -3,10 +3,8 @@
 
 Avoids undefined references, ensures correct package dependencies.
 
-Index: xserver-xorg-video-nv/src/Makefile.am
-===================================================================
---- xserver-xorg-video-nv.orig/src/Makefile.am
-+++ xserver-xorg-video-nv/src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -27,6 +27,7 @@
  nv_drv_la_LTLIBRARIES = nv_drv.la
  nv_drv_la_LDFLAGS = -module -avoid-version

Modified: trunk/xserver-xorg-video-nv/debian/patches/series
===================================================================
--- trunk/xserver-xorg-video-nv/debian/patches/series	2013-09-25 11:00:52 UTC (rev 4960)
+++ trunk/xserver-xorg-video-nv/debian/patches/series	2013-09-25 11:29:32 UTC (rev 4961)
@@ -1 +1,2 @@
+00_git_update.diff
 01_fix_linking.diff