debian/changelog | 15 +++
debian/patches/fix-ftbfs-ppc64el.patch | 16 ----
debian/patches/glamor-disable-debugging-msgs.diff | 32 ++++++++
debian/patches/series | 4 -
debian/patches/update-intel-pciids.diff | 87 ++++++++++++++++++++++
5 files changed, 134 insertions(+), 20 deletions(-)
New commits:
commit a92eb5f6454085c39d751da0a77677d2b1123fe2
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Jan 28 14:53:59 2016 +0200
drop fix-ftbfs-ppc64el.patch, update changelog
diff --git a/debian/changelog b/debian/changelog
index 8c36692..77650de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.18.0-3ubuntu1) UNRELEASED; urgency=medium
+
+ * Merge from Debian experimental
+ * patches: Refreshed, dropped what's upstream.
+ * xmir-fixes.diff: Port xmir to 1.18.
+ * fix-ftbfs-ppc64el.patch: Dropped, not needed anymore.
+
+ -- Timo Aaltonen <tjaal...@debian.org> Tue, 08 Dec 2015 19:47:06 +0200
+
xorg-server (2:1.18.0-3) unstable; urgency=medium
* update-intel-pciids.diff: Sync dri2 mapping ids for intel.
@@ -6,14 +15,6 @@ xorg-server (2:1.18.0-3) unstable; urgency=medium
-- Timo Aaltonen <tjaal...@debian.org> Wed, 27 Jan 2016 16:41:59 +0200
-xorg-server (2:1.18.0-1ubuntu1) UNRELEASED; urgency=medium
-
- * Merge from Debian experimental
- * patches: Refreshed, dropped what's upstream.
- * xmir-fixes.diff: Port xmir to 1.18.
-
- -- Timo Aaltonen <tjaal...@debian.org> Tue, 08 Dec 2015 19:47:06 +0200
-
xorg-server (2:1.18.0-2) unstable; urgency=medium
[ Laurent Bigonville ]
diff --git a/debian/patches/fix-ftbfs-ppc64el.patch
b/debian/patches/fix-ftbfs-ppc64el.patch
deleted file mode 100644
index fa452c1..0000000
--- a/debian/patches/fix-ftbfs-ppc64el.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix ftbfs on ppc64el
-Author: Maarten Lankhorst <maarten.lankho...@ubuntu.com>
-
-diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
-index a9a9fa5..f88cdc0 100644
---- a/hw/kdrive/src/kinput.c
-+++ b/hw/kdrive/src/kinput.c
-@@ -221,7 +221,7 @@ KdUnregisterFd(void *closure, int fd, Bool do_close)
- if (do_close)
- close(kdInputFds[i].fd);
- kdNumInputFds--;
-- for (j = i; j < (kdNumInputFds - 1); j++)
-+ for (j = i; j < (kdNumInputFds - 1) && j < (KD_MAX_INPUT_FDS -
1); j++)
- kdInputFds[j] = kdInputFds[j + 1];
- break;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 4426023..7cf15e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -48,7 +48,6 @@ xf86-ignore-conflicting-rr-caps.patch
fix-detach-gpu.patch
disable-rotation-transform-gpuscreens.patch
-fix-ftbfs-ppc64el.patch
xmir.patch
xmir-desktop-file-hint-flag.patch
drm_device_keep_trying.patch
commit 36288f4297b1779383916b357091eddbb203fb79
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Wed Jan 27 16:42:10 2016 +0200
release to unstable
diff --git a/debian/changelog b/debian/changelog
index 8503cce..be300ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.18.0-3) UNRELEASED; urgency=medium
+xorg-server (2:1.18.0-3) unstable; urgency=medium
* update-intel-pciids.diff: Sync dri2 mapping ids for intel.
* glamor-disable-debugging-msgs.diff: Make glamor less noisy with
recent mesa.
- -- Timo Aaltonen <tjaal...@debian.org> Wed, 27 Jan 2016 14:21:32 +0200
+ -- Timo Aaltonen <tjaal...@debian.org> Wed, 27 Jan 2016 16:41:59 +0200
xorg-server (2:1.18.0-2) unstable; urgency=medium
commit 31dc999cb909eaaff5ccde9e9b3224d5b1119816
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Wed Jan 27 16:41:15 2016 +0200
glamor-disable-debugging-msgs.diff: Make glamor less noisy with recent mesa.
diff --git a/debian/changelog b/debian/changelog
index a27212d..8503cce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xorg-server (2:1.18.0-3) UNRELEASED; urgency=medium
* update-intel-pciids.diff: Sync dri2 mapping ids for intel.
+ * glamor-disable-debugging-msgs.diff: Make glamor less noisy with
+ recent mesa.
-- Timo Aaltonen <tjaal...@debian.org> Wed, 27 Jan 2016 14:21:32 +0200
diff --git a/debian/patches/glamor-disable-debugging-msgs.diff
b/debian/patches/glamor-disable-debugging-msgs.diff
new file mode 100644
index 0000000..6556848
--- /dev/null
+++ b/debian/patches/glamor-disable-debugging-msgs.diff
@@ -0,0 +1,32 @@
+commit 1db6de7b6a6ee240eb50a13fe1fa1e135d7cb93b
+Author: Michel Dänzer <michel.daen...@amd.com>
+Date: Tue Jan 12 15:42:47 2016 +0900
+
+ glamor: Disable debugging messages other than GL API errors
+
+ According to Nicolai Hähnle, the relevant specification says "All
+ messages are initially enabled unless their assigned severity is
+ DEBUG_SEVERITY_LOW", so we need to explicitly disable the messages we
+ don't want to get. Failing that, we were accidentally logging e.g.
+ shader stats intended for shader-db.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93659
+ Tested-by: Laurent Carlier <lordhea...@gmail.com>
+ Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com>
+ Signed-off-by: Michel Dänzer <michel.daen...@amd.com>
+ Reviewed-by: Eric Anholt <e...@anholt.net>
+
+diff --git a/glamor/glamor.c b/glamor/glamor.c
+index 116d10c..81aba2d 100644
+--- a/glamor/glamor.c
++++ b/glamor/glamor.c
+@@ -393,6 +393,9 @@ glamor_setup_debug_output(ScreenPtr screen)
+ return;
+
+ glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
++ /* Disable debugging messages other than GL API errors */
++ glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL,
++ GL_FALSE);
+ glDebugMessageControl(GL_DEBUG_SOURCE_API,
+ GL_DEBUG_TYPE_ERROR,
+ GL_DONT_CARE,
diff --git a/debian/patches/series b/debian/patches/series
index d24b744..4055e15 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
#08_xfree86_fix_ia64_inx_outx.diff
add_support_new_libsystemd.patch
update-intel-pciids.diff
+glamor-disable-debugging-msgs.diff
commit 0305db3c6dc3f1028b4c7ce8b83cffa913000e3c
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Wed Jan 27 14:21:52 2016 +0200
update-intel-pciids.diff: Sync dri2 mapping ids for intel.
diff --git a/debian/changelog b/debian/changelog
index b8bc1cb..a27212d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.18.0-3) UNRELEASED; urgency=medium
+
+ * update-intel-pciids.diff: Sync dri2 mapping ids for intel.
+
+ -- Timo Aaltonen <tjaal...@debian.org> Wed, 27 Jan 2016 14:21:32 +0200
+
xorg-server (2:1.18.0-2) unstable; urgency=medium
[ Laurent Bigonville ]
diff --git a/debian/patches/series b/debian/patches/series
index d0ff25a..d24b744 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
05_Revert-Unload-submodules.diff
#08_xfree86_fix_ia64_inx_outx.diff
add_support_new_libsystemd.patch
+update-intel-pciids.diff
diff --git a/debian/patches/update-intel-pciids.diff
b/debian/patches/update-intel-pciids.diff
new file mode 100644
index 0000000..e67819b
--- /dev/null
+++ b/debian/patches/update-intel-pciids.diff
@@ -0,0 +1,87 @@
+commit 51cf2ea3f846fd7785754f7a31d35514daa8a672
+Author: Timo Aaltonen <tjaal...@debian.org>
+Date: Wed Jan 27 13:56:29 2016 +0200
+
+ dri2: Sync i915_pci_ids.h and i965_pci_ids.h from mesa
+
+ Adds Skylake, Kabylake and Broxton allowing them to use
+ modesetting + glamor with dri2.
+
+ Signed-off-by: Timo Aaltonen <timo.aalto...@canonical.com>
+
+diff --git a/hw/xfree86/dri2/pci_ids/i915_pci_ids.h
b/hw/xfree86/dri2/pci_ids/i915_pci_ids.h
+index 7d51975..1c43c8e 100644
+--- a/hw/xfree86/dri2/pci_ids/i915_pci_ids.h
++++ b/hw/xfree86/dri2/pci_ids/i915_pci_ids.h
+@@ -11,5 +11,5 @@ CHIPSET(0x27AE, I945_GME, "Intel(R) 945GME")
+ CHIPSET(0x29B2, Q35_G, "Intel(R) Q35")
+ CHIPSET(0x29C2, G33_G, "Intel(R) G33")
+ CHIPSET(0x29D2, Q33_G, "Intel(R) Q33")
+-CHIPSET(0xA011, IGD_GM, "Intel(R) IGD")
+-CHIPSET(0xA001, IGD_G, "Intel(R) IGD")
++CHIPSET(0xA011, PNV_GM, "Intel(R) Pineview M")
++CHIPSET(0xA001, PNV_G, "Intel(R) Pineview")
+diff --git a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
+index 2e04301..5139e27 100644
+--- a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
++++ b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
+@@ -109,7 +109,55 @@ CHIPSET(0x162A, bdw_gt3, "Intel(R) Iris Pro P6300
(Broadwell GT3e)")
+ CHIPSET(0x162B, bdw_gt3, "Intel(R) Iris 6100 (Broadwell GT3)")
+ CHIPSET(0x162D, bdw_gt3, "Intel(R) Broadwell GT3")
+ CHIPSET(0x162E, bdw_gt3, "Intel(R) Broadwell GT3")
+-CHIPSET(0x22B0, chv, "Intel(R) Cherryview")
+-CHIPSET(0x22B1, chv, "Intel(R) Cherryview")
+-CHIPSET(0x22B2, chv, "Intel(R) Cherryview")
+-CHIPSET(0x22B3, chv, "Intel(R) Cherryview")
++CHIPSET(0x1902, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
++CHIPSET(0x1906, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
++CHIPSET(0x190A, skl_gt1, "Intel(R) Skylake GT1")
++CHIPSET(0x190E, skl_gt1, "Intel(R) Skylake GT1")
++CHIPSET(0x1912, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
++CHIPSET(0x1913, skl_gt2, "Intel(R) Skylake GT2f")
++CHIPSET(0x1915, skl_gt2, "Intel(R) Skylake GT2f")
++CHIPSET(0x1916, skl_gt2, "Intel(R) HD Graphics 520 (Skylake GT2)")
++CHIPSET(0x1917, skl_gt2, "Intel(R) Skylake GT2f")
++CHIPSET(0x191A, skl_gt2, "Intel(R) Skylake GT2")
++CHIPSET(0x191B, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
++CHIPSET(0x191D, skl_gt2, "Intel(R) HD Graphics P530 (Skylake GT2)")
++CHIPSET(0x191E, skl_gt2, "Intel(R) HD Graphics 515 (Skylake GT2)")
++CHIPSET(0x1921, skl_gt2, "Intel(R) Skylake GT2")
++CHIPSET(0x1923, skl_gt3, "Intel(R) Iris Graphics 540 (Skylake GT3e)")
++CHIPSET(0x1926, skl_gt3, "Intel(R) HD Graphics 535 (Skylake GT3)")
++CHIPSET(0x1927, skl_gt3, "Intel(R) Iris Graphics 550 (Skylake GT3e)")
++CHIPSET(0x192A, skl_gt4, "Intel(R) Skylake GT4")
++CHIPSET(0x192B, skl_gt3, "Intel(R) Iris Graphics (Skylake GT3fe)")
++CHIPSET(0x1932, skl_gt4, "Intel(R) Skylake GT4")
++CHIPSET(0x193A, skl_gt4, "Intel(R) Skylake GT4")
++CHIPSET(0x193B, skl_gt4, "Intel(R) Skylake GT4")
++CHIPSET(0x193D, skl_gt4, "Intel(R) Skylake GT4")
++CHIPSET(0x5902, kbl_gt1, "Intel(R) Kabylake GT1")
++CHIPSET(0x5906, kbl_gt1, "Intel(R) Kabylake GT1")
++CHIPSET(0x590A, kbl_gt1, "Intel(R) Kabylake GT1")
++CHIPSET(0x590B, kbl_gt1, "Intel(R) Kabylake GT1")
++CHIPSET(0x590E, kbl_gt1, "Intel(R) Kabylake GT1")
++CHIPSET(0x5913, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
++CHIPSET(0x5915, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
++CHIPSET(0x5917, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
++CHIPSET(0x5912, kbl_gt2, "Intel(R) Kabylake GT2")
++CHIPSET(0x5916, kbl_gt2, "Intel(R) Kabylake GT2")
++CHIPSET(0x591A, kbl_gt2, "Intel(R) Kabylake GT2")
++CHIPSET(0x591B, kbl_gt2, "Intel(R) Kabylake GT2")
++CHIPSET(0x591D, kbl_gt2, "Intel(R) Kabylake GT2")
++CHIPSET(0x591E, kbl_gt2, "Intel(R) Kabylake GT2")
++CHIPSET(0x5921, kbl_gt2, "Intel(R) Kabylake GT2F")
++CHIPSET(0x5926, kbl_gt3, "Intel(R) Kabylake GT3")
++CHIPSET(0x592A, kbl_gt3, "Intel(R) Kabylake GT3")
++CHIPSET(0x592B, kbl_gt3, "Intel(R) Kabylake GT3")
++CHIPSET(0x5932, kbl_gt4, "Intel(R) Kabylake GT4")
++CHIPSET(0x593A, kbl_gt4, "Intel(R) Kabylake GT4")
++CHIPSET(0x593B, kbl_gt4, "Intel(R) Kabylake GT4")
++CHIPSET(0x593D, kbl_gt4, "Intel(R) Kabylake GT4")
++CHIPSET(0x22B0, chv, "Intel(R) HD Graphics (Cherryview)")
++CHIPSET(0x22B1, chv, "Intel(R) HD Graphics (Cherryview)")
++CHIPSET(0x22B2, chv, "Intel(R) HD Graphics (Cherryview)")
++CHIPSET(0x22B3, chv, "Intel(R) HD Graphics (Cherryview)")
++CHIPSET(0x0A84, bxt, "Intel(R) HD Graphics (Broxton)")
++CHIPSET(0x1A84, bxt, "Intel(R) HD Graphics (Broxton)")
++CHIPSET(0x5A84, bxt, "Intel(R) HD Graphics (Broxton)")
commit 8c7f308ff346a05acfe3b811f8a414bc8cf72125
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Tue Jan 26 16:31:08 2016 +0200
release to unstable
diff --git a/debian/changelog b/debian/changelog
index df2e086..b8bc1cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.18.0-2) UNRELEASED; urgency=medium
+xorg-server (2:1.18.0-2) unstable; urgency=medium
[ Laurent Bigonville ]
* Enable systemd socket activation support (Closes: #803254)
@@ -7,7 +7,7 @@ xorg-server (2:1.18.0-2) UNRELEASED; urgency=medium
* Let xserver-xorg-dev depend on libxfont-dev, as dixfont.h needs
fontutil.h.
- -- Laurent Bigonville <bi...@debian.org> Sat, 05 Dec 2015 20:26:53 +0100
+ -- Timo Aaltonen <tjaal...@debian.org> Tue, 26 Jan 2016 16:25:33 +0200
xorg-server (2:1.18.0-1) experimental; urgency=medium
