xorg-server: Changes to 'ubuntu'
debian/changelog | 13 --
debian/patches/170_primary_pci_video_device.patch | 108 ----------------------
debian/patches/series | 5 -
3 files changed, 6 insertions(+), 120 deletions(-)
New commits:
commit 861b6cf3c47089225280bef320b8b85c9d7e5a93
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Jul 28 15:34:27 2009 +0300
Release 2:1.6.2.901-1ubuntu1
diff --git a/debian/changelog b/debian/changelog
index e2d3399..4ee6ef5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.6.2.901-1ubuntu1) UNRELEASED; urgency=low
+xorg-server (2:1.6.2.901-1ubuntu1) karmic; urgency=low
[ Timo Aaltonen ]
* Merge from Debian unstable. (LP: #403316)
* Drop 170_primary_pci_video_device.patch, included in Debian
- -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 27 Jul 2009 16:39:01 +0300
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 28 Jul 2009 15:34:16 +0300
xorg-server (2:1.6.2.901-1) unstable; urgency=low
commit 74af3eb8cf50ee266d113a1608f06cd0f70e405d
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Jul 28 15:31:50 2009 +0300
Drop patch 170, and disable the nvidia/fglrx patches for now
the autoconfig logic need to be fixed so they'd work properly with xorg.conf
Add a bug closer too.
diff --git a/debian/changelog b/debian/changelog
index 957387a..e2d3399 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,8 @@
xorg-server (2:1.6.2.901-1ubuntu1) UNRELEASED; urgency=low
- [ Bryce Harrington ]
- * Add 104_nvidia_autodetect.patch - Automatically detect and use -nvidia
- or -nouveau instead of -nv if installed. Thanks Sarvatt!
- * Add 105_fglrx_autodetect.patch - Automatically detect and use -fglrx
- on R600 and newer hardware or -radeonhd if either is installed.
-
[ Timo Aaltonen ]
- * Merge from Debian unstable.
+ * Merge from Debian unstable. (LP: #403316)
+ * Drop 170_primary_pci_video_device.patch, included in Debian
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 27 Jul 2009 16:39:01 +0300
diff --git a/debian/patches/170_primary_pci_video_device.patch b/debian/patches/170_primary_pci_video_device.patch
deleted file mode 100644
index f410e11..0000000
--- a/debian/patches/170_primary_pci_video_device.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 69e53f2493c142ef5569af01ce52565be5b2976e Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 3 Mar 2009 10:58:33 -0500
-Subject: [PATCH] Primary video device hack
-
----
- hw/xfree86/common/xf86pciBus.c | 60 ++++++++++++++++++++++++++++++++--------
- 1 files changed, 48 insertions(+), 12 deletions(-)
-
-diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
-index 467a0c3..0d2d01c 100644
---- a/hw/xfree86/common/xf86pciBus.c
-+++ b/hw/xfree86/common/xf86pciBus.c
-@@ -60,11 +60,7 @@ static struct pci_device ** xf86PciVideoInfo = NULL; /* PCI probe for video hw *
- /* PCI classes that get included in xf86PciVideoInfo */
- #define PCIINFOCLASSES(c) \
- ( (((c) & 0x00ff0000) == (PCI_CLASS_PREHISTORIC << 16)) \
-- || (((c) & 0x00ff0000) == (PCI_CLASS_DISPLAY << 16)) \
-- || ((((c) & 0x00ffff00) \
-- == ((PCI_CLASS_MULTIMEDIA << 16) | (PCI_SUBCLASS_MULTIMEDIA_VIDEO << 8)))) \
-- || ((((c) & 0x00ffff00) \
-- == ((PCI_CLASS_PROCESSOR << 16) | (PCI_SUBCLASS_PROCESSOR_COPROC << 8)))) )
-+ || (((c) & 0x00ffff00) == (PCI_CLASS_DISPLAY << 16)) )
-
- /*
- * PCI classes that have messages printed always. The others are only
-@@ -341,6 +337,39 @@ restorePciBusState(BusAccPtr ptr)
- }
- #undef MASKBITS
-
-+/* oh god what have i done */
-+static Bool
-+looks_like_bios_primary(struct pci_device *info)
-+{
-+ unsigned char *bios;
-+ unsigned short vendor, device;
-+ int offset;
-+ Bool ret = FALSE;
-+
-+ bios = xf86MapVidMem(-1, VIDMEM_MMIO, 0xc0000, 0x10000);
-+ if (!bios)
-+ return FALSE;
-+
-+ if (bios[0] != 0x55 || bios[1] != 0xAA)
-+ goto out;
-+
-+ offset = (bios[0x19] << 8) + bios[0x18];
-+
-+ if (bios[offset] != 'P' ||
-+ bios[offset+1] != 'C' ||
-+ bios[offset+2] != 'I' ||
-+ bios[offset+3] != 'R')
-+ goto out;
-+
-+ vendor = (bios[offset+5] << 8) + bios[offset+4];
-+ device = (bios[offset+7] << 8) + bios[offset+6];
-+
-+ ret = (info->vendor_id == vendor) && (info->device_id == device);
-+
-+out:
-+ xf86UnMapVidMem(-1, bios, 0x10000);
-+ return ret;
-+}
-
- /*
- * xf86Bus.c interface
-@@ -375,24 +404,31 @@ xf86PciProbe(void)
- }
- }
-
--
- /* If we haven't found a primary device try a different heuristic */
- if (primaryBus.type == BUS_NONE && num) {
- for (i = 0; i < num; i++) {
- uint16_t command;
-
- info = xf86PciVideoInfo[i];
-+ if (!IS_VGA(info->device_class))
-+ continue;
-+
- pci_device_cfg_read_u16(info, & command, 4);
-
-- if ((command & PCI_CMD_MEM_ENABLE)
-- && ((num == 1) || IS_VGA(info->device_class))) {
-- if (primaryBus.type == BUS_NONE) {
-+ if ((command & PCI_CMD_MEM_ENABLE)) {
-+ if (num == 1) {
- primaryBus.type = BUS_PCI;
- primaryBus.id.pci = info;
-- } else {
-- xf86Msg(X_NOTICE,
-+ break;
-+ } else if (looks_like_bios_primary(info)) {
-+ if (primaryBus.type == BUS_NONE) {
-+ primaryBus.type = BUS_PCI;
-+ primaryBus.id.pci = info;
-+ } else {
-+ xf86Msg(X_NOTICE,
- "More than one possible primary device found\n");
-- primaryBus.type ^= (BusType)(-1);
-+ primaryBus.type ^= (BusType)(-1);
-+ }
- }
- }
- }
---
-1.6.1.3
-
diff --git a/debian/patches/series b/debian/patches/series
index fec3206..759feee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,8 +10,8 @@ fedora-pci-primary.diff
101_fedora_xserver-1.3.0-document-fontpath-correctly.patch
102_ubuntu_sharevts_load_cpu.patch
103_psb_auto.patch
-104_nvidia_autodetect.patch
-105_fglrx_autodetect.patch
+#104_nvidia_autodetect.patch
+#105_fglrx_autodetect.patch
110_fedora_no_move_damage.patch
121_only_switch_vt_when_active.diff
135_rethrow_signals.patch
@@ -29,7 +29,6 @@ fedora-pci-primary.diff
167_nullptr_xisbread.patch
168_glibc_trace_to_stderr.patch
169_mipointer_nullptr_checks.patch
-170_primary_pci_video_device.patch
172_cwgetbackingpicture_nullptr_check.patch
174_set_bg_pixmap_of_cow_to_none.patch
177_animated_cursor_change_master.patch
Reply to: