xorg-server: Changes to 'ubuntu'
debian/changelog | 6 ++++++
debian/patches/no-nv.patch | 24 ++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 31 insertions(+)
New commits:
commit 51033f99245f8cf5c03bbcf6f33561a095d1e5ea
Author: Bryce Harrington <bryce@canonical.com>
Date: Wed Apr 3 13:39:08 2013 -0700
Add no-nv.patch: Don't bother autoprobing -nv on linux anymore.
diff --git a/debian/changelog b/debian/changelog
index 2d46fd6..e4b55b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.13.3-0ubuntu5) UNRELEASED; urgency=low
+
+ * Add no-nv.patch: Don't autoprobe -nv on linux.
+
+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 03 Apr 2013 13:39:50 -0700
+
xorg-server (2:1.13.3-0ubuntu4) raring; urgency=low
* Do not bother registering xv/xvmc on gpu screens.
diff --git a/debian/patches/no-nv.patch b/debian/patches/no-nv.patch
new file mode 100644
index 0000000..4fb23e7
--- /dev/null
+++ b/debian/patches/no-nv.patch
@@ -0,0 +1,24 @@
+commit b770266fa9c3fab5374bdf109676e0b129ac4546
+Author: Bryce Harrington <bryce@canonical.com>
+Date: Wed Apr 3 13:36:20 2013 -0700
+
+ Don't bother probing -nv on linux.
+
+ For linux this driver is long obsolete now. It may have some relevance
+ on non-linux systems.
+
+diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
+index b2545be..73a662d 100644
+--- a/hw/xfree86/common/xf86pciBus.c
++++ b/hw/xfree86/common/xf86pciBus.c
+@@ -1220,8 +1220,9 @@ xf86VideoPtrToDriverList(struct pci_device *dev,
+ driverList[idx++] = "nvidia";
+ #ifdef __linux__
+ driverList[idx++] = "nouveau";
+-#endif
++#else
+ driverList[idx++] = "nv";
++#endif
+ break;
+ }
+ case 0x1106:
diff --git a/debian/patches/series b/debian/patches/series
index 1732dba..d856ee5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,6 +31,7 @@
drm_device_keep_trying.patch
xfree86-no-xv-for-gpuscreens.patch
xephyr-glx-register.patch
+no-nv.patch
## waiting for review by upstream
111_armel-drv-fallbacks.patch
Reply to: