Bug#724325: xserver-xorg-video-nv: FTBFS against xserver 1.14
Julien Cristau: On Wed, Sep 25, 2013 at 10:57:10 +, Robert Millan wrote: Petr Salinger: your package needs to be rebuilt against xorg-server 1.14. That most likely means pulling in a couple changes from upstream git HEAD. It suffices to put attached file into debian/patches/ and enlist it in debian/patches/series. Please, could some DD (Robert, please) do the upload. Ideally for both kfreebsd-*, as non-free is usually not auto-build. I'm on it. AFAICT only kbsd-amd64 was uploaded, not -i386? kfreebsd-i386 uploaded now. -- Robert Millan -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#724325: xserver-xorg-video-nv: FTBFS against xserver 1.14
On Wed, Sep 25, 2013 at 10:57:10 +, Robert Millan wrote: Petr Salinger: your package needs to be rebuilt against xorg-server 1.14. That most likely means pulling in a couple changes from upstream git HEAD. It suffices to put attached file into debian/patches/ and enlist it in debian/patches/series. Please, could some DD (Robert, please) do the upload. Ideally for both kfreebsd-*, as non-free is usually not auto-build. I'm on it. AFAICT only kbsd-amd64 was uploaded, not -i386? Cheers, Julien signature.asc Description: Digital signature
Bug#724325: xserver-xorg-video-nv: FTBFS against xserver 1.14
Petr Salinger: your package needs to be rebuilt against xorg-server 1.14. That most likely means pulling in a couple changes from upstream git HEAD. It suffices to put attached file into debian/patches/ and enlist it in debian/patches/series. Please, could some DD (Robert, please) do the upload. Ideally for both kfreebsd-*, as non-free is usually not auto-build. I'm on it. -- Robert Millan -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#724325: xserver-xorg-video-nv: FTBFS against xserver 1.14
your package needs to be rebuilt against xorg-server 1.14. That
most likely means pulling in a couple changes from upstream git HEAD.
It suffices to put attached file into debian/patches/
and enlist it in debian/patches/series.
Please, could some DD (Robert, please) do the upload.
Ideally for both kfreebsd-*, as non-free is usually not auto-build.
Petrdiff --git a/src/g80_driver.c b/src/g80_driver.c
index cc4e197..719b96c 100644
--- 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 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL)
}
}
-miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
xf86SetSilkenMouse(pScreen);
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 6dad6e5..8f35334 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -2550,7 +2550,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
if (!pNv-NoAccel)
NVAccelInit(pScreen);
-miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
xf86SetSilkenMouse(pScreen);
diff --git a/src/nv_include.h b/src/nv_include.h
index fb190bf..72c74d5 100644
--- 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
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))) {
diff --git a/src/riva_driver.c b/src/riva_driver.c
index e0667ef..759501e 100644
--- a/src/riva_driver.c
+++ b/src/riva_driver.c
@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
if (!pRiva-NoAccel)
RivaAccelInit(pScreen);
-miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
xf86SetSilkenMouse(pScreen);
diff --git a/src/riva_include.h b/src/riva_include.h
index f2c5302..c7aeef7 100644
--- 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
Bug#724325: xserver-xorg-video-nv: FTBFS against xserver 1.14
Source: xserver-xorg-video-nv Version: 1:2.1.20-1 Severity: serious Justification: fails to build from source (but built successfully in the past) Hi, your package needs to be rebuilt against xorg-server 1.14. That most likely means pulling in a couple changes from upstream git HEAD. Cheers, Julien signature.asc Description: Digital signature
