xorg-server: Changes to 'debian-unstable'
debian/changelog | 13 ++
debian/patches/40_consolidate_portPriv_pDraw_assignments.diff | 56 ++++++++++
debian/patches/41_vbe_filter_less.diff | 44 +++++++
debian/patches/42_only_run_special_key_behaviours_on_non-XKB.diff | 34 ++++++
debian/patches/43_xephyr_crash_at_exit.diff | 30 +++++
debian/patches/series | 4
6 files changed, 181 insertions(+)
New commits:
commit c0c60bb3da626140d1246acdb2bc15cda6117598
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 2 21:23:16 2007 +0200
Add 43_xephyr_crash_at_exit.diff to avoid crashing Xephyr when first client disconnect.
diff --git a/debian/changelog b/debian/changelog
index 8df548c..070fb03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ xorg-server (2:1.3.0.0.dfsg-7) UNRELEASED; urgency=low
xf86ValidateModes should handle them just fine (closes: #424684).
* Add 42_only_run_special_key_behaviours_on_non-XKB.diff to fix special
keys in Xephyr (closes: #415025).
+ * Add 43_xephyr_crash_at_exit.diff to avoid crashing Xephyr when first
+ client disconnect (closes: #420421).
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 02 Jul 2007 21:22:19 +0200
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 02 Jul 2007 21:22:56 +0200
xorg-server (2:1.3.0.0.dfsg-6) unstable; urgency=low
diff --git a/debian/patches/43_xephyr_crash_at_exit.diff b/debian/patches/43_xephyr_crash_at_exit.diff
new file mode 100644
index 0000000..4e5b130
--- /dev/null
+++ b/debian/patches/43_xephyr_crash_at_exit.diff
@@ -0,0 +1,30 @@
+* Tue Mar 13 2007 Adam Jackson <ajax@redhat.com> 1.2.99.901-2
+- xserver-1.2.99.901-xephyr-crash-at-exit.patch: Fix yet another GLX visual
+ mess. (#231425)
+
+https://bugs.freedesktop.org/show_bug.cgi?id=10713
+http://cvs.fedora.redhat.com/viewcvs/devel/xorg-x11-server/xserver-1.2.99.901-xephyr-crash-at-exit.patch?rev=1.1&view=log
+Debian bug #420421 (and maybe #424517)
+
+--- xorg-server-1.2.99.901/GL/mesa/X/xf86glx.c.jx 2007-03-07 14:15:25.000000000 -0500
++++ xorg-server-1.2.99.901/GL/mesa/X/xf86glx.c 2007-03-13 14:27:38.000000000 -0400
+@@ -281,12 +281,14 @@
+ __GLXMESAscreen *mesaScreen = (__GLXMESAscreen *) screen;
+ int i;
+
+- for (i = 0; i < mesaScreen->num_vis; i++) {
+- if (mesaScreen->xm_vis[i])
+- XMesaDestroyVisual(mesaScreen->xm_vis[i]);
+- }
++ if (mesaScreen->xm_vis) {
++ for (i = 0; i < mesaScreen->num_vis; i++) {
++ if (mesaScreen->xm_vis[i])
++ XMesaDestroyVisual(mesaScreen->xm_vis[i]);
++ }
+
+- xfree(mesaScreen->xm_vis);
++ xfree(mesaScreen->xm_vis);
++ }
+
+ __glXScreenDestroy(screen);
+
diff --git a/debian/patches/series b/debian/patches/series
index 1309328..40bbab7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,6 +20,7 @@
40_consolidate_portPriv_pDraw_assignments.diff
41_vbe_filter_less.diff
42_only_run_special_key_behaviours_on_non-XKB.diff
+43_xephyr_crash_at_exit.diff
44_fedora-xephyr-keysym-madness.diff
45_CVE-2007-2437.diff
46_export-ramdac-symbols.diff
commit 34e73b86a70c01a3c337056c3c099c43e626b734
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 2 21:22:38 2007 +0200
Add 42_only_run_special_key_behaviours_on_non-XKB.diff to fix special keys in Xephyr.
diff --git a/debian/changelog b/debian/changelog
index ea54560..8df548c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ xorg-server (2:1.3.0.0.dfsg-7) UNRELEASED; urgency=low
in xf86XVReputVideo (closes: #424899).
* Add 41_vbe_filter_less.diff to not reject VESA modes early since
xf86ValidateModes should handle them just fine (closes: #424684).
+ * Add 42_only_run_special_key_behaviours_on_non-XKB.diff to fix special
+ keys in Xephyr (closes: #415025).
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 02 Jul 2007 21:21:27 +0200
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 02 Jul 2007 21:22:19 +0200
xorg-server (2:1.3.0.0.dfsg-6) unstable; urgency=low
diff --git a/debian/patches/42_only_run_special_key_behaviours_on_non-XKB.diff b/debian/patches/42_only_run_special_key_behaviours_on_non-XKB.diff
new file mode 100644
index 0000000..23bb39b
--- /dev/null
+++ b/debian/patches/42_only_run_special_key_behaviours_on_non-XKB.diff
@@ -0,0 +1,34 @@
+Backport to 7.2 of commit 47c1c948e69cfba950ad37a3133fa2db0bd0ff2c
+Original Author: Daniel Stone <daniel@fooishbar.org>
+Date: Tue Aug 15 15:25:16 2006 +0300
+
+ kdrive/input: only run special key behaviours on non-XKB
+ Only attempt to manually deal with special key behaviours (e.g. terminating
+ the server) when not using XKB, and leave locking behaviour up to GKVE.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=10313
+Debian bug #415025
+
+--- xorg-server-1.2.0/hw/kdrive/src/kinput.c 2007-01-22 21:39:15.000000000 -0800
++++ xorg-server-1.2.0/hw/kdrive/src/kinput.c 2007-04-09 18:58:43.562841000 -0700
+@@ -1303,20 +1303,6 @@
+ xE.u.u.type = KeyPress;
+ xE.u.u.detail = key_code;
+
+- switch (KEYCOL1(key_code))
+- {
+- case XK_Num_Lock:
+- case XK_Scroll_Lock:
+- case XK_Shift_Lock:
+- case XK_Caps_Lock:
+- if (xE.u.u.type == KeyRelease)
+- return;
+- if (IsKeyDown (key_code))
+- xE.u.u.type = KeyRelease;
+- else
+- xE.u.u.type = KeyPress;
+- }
+-
+ /*
+ * Check pressed keys which are already down
+ */
diff --git a/debian/patches/series b/debian/patches/series
index 1a50d7f..1309328 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,6 +19,7 @@
39_alpha_build_flags.patch -p0
40_consolidate_portPriv_pDraw_assignments.diff
41_vbe_filter_less.diff
+42_only_run_special_key_behaviours_on_non-XKB.diff
44_fedora-xephyr-keysym-madness.diff
45_CVE-2007-2437.diff
46_export-ramdac-symbols.diff
commit fce44aebd17d04b9f41e7357461626dc55ddc77f
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 2 21:21:54 2007 +0200
Add 41_vbe_filter_less.diff to not reject VESA modes early.
diff --git a/debian/changelog b/debian/changelog
index 1d46be8..ea54560 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ xorg-server (2:1.3.0.0.dfsg-7) UNRELEASED; urgency=low
* Add 40_consolidate_portPriv_pDraw_assignments.diff to avoid a crash
in xf86XVReputVideo (closes: #424899).
+ * Add 41_vbe_filter_less.diff to not reject VESA modes early since
+ xf86ValidateModes should handle them just fine (closes: #424684).
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 02 Jul 2007 21:18:45 +0200
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 02 Jul 2007 21:21:27 +0200
xorg-server (2:1.3.0.0.dfsg-6) unstable; urgency=low
diff --git a/debian/patches/41_vbe_filter_less.diff b/debian/patches/41_vbe_filter_less.diff
new file mode 100644
index 0000000..2f19ce9
--- /dev/null
+++ b/debian/patches/41_vbe_filter_less.diff
@@ -0,0 +1,44 @@
+* Fri Sep 22 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-41.fc6
+- xorg-x11-server-1.1.1-vbe-filter-less.patch: Be gentler about rejecting
+ VESA modes early, since xf86ValidateModes should handle them just fine.
+
+http://cvs.fedora.redhat.com/viewcvs/devel/xorg-x11-server/xorg-x11-server-1.1.1-vbe-filter-less.patch?rev=1.1&view=auto
+Debian bug #424684 (and maybe #428711)
+
+--- xorg-server-1.1.1/hw/xfree86/vbe/vbeModes.c.jx 2006-07-05 14:31:42.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/vbe/vbeModes.c 2006-09-22 15:29:34.000000000 -0400
+@@ -153,34 +153,6 @@
+ xf86ErrorFVerb(DEBUG_VERB, "*");
+ }
+
+- /*
+- * Check if there's a valid monitor mode that this one can be matched
+- * up with. The actual matching is done later.
+- */
+- if (modeOK) {
+- Bool sizeMatch = FALSE;
+- modeOK = FALSE;
+- for (p = pScrn->monitor->Modes; p != NULL; p = p->next) {
+- if ((p->HDisplay != mode->XResolution) ||
+- (p->VDisplay != mode->YResolution) ||
+- (p->Flags & (V_INTERLACE | V_DBLSCAN | V_CLKDIV2)))
+- continue;
+- sizeMatch = TRUE;
+- /* XXX could support the various V_ flags */
+- status = xf86CheckModeForMonitor(p, pScrn->monitor);
+- if (status == MODE_OK) {
+- modeOK = TRUE;
+- break;
+- }
+- }
+- if (sizeMatch && !modeOK) {
+- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+- "Not using built-in mode \"%dx%d\" (%s)\n",
+- mode->XResolution, mode->YResolution,
+- xf86ModeStatusToString(status));
+- }
+- }
+-
+ xf86ErrorFVerb(DEBUG_VERB,
+ "Mode: %x (%dx%d)\n", id, mode->XResolution, mode->YResolution);
+ xf86ErrorFVerb(DEBUG_VERB,
diff --git a/debian/patches/series b/debian/patches/series
index ca34d77..1a50d7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,6 +18,7 @@
34_xorg.conf_man_typos.patch
39_alpha_build_flags.patch -p0
40_consolidate_portPriv_pDraw_assignments.diff
+41_vbe_filter_less.diff
44_fedora-xephyr-keysym-madness.diff
45_CVE-2007-2437.diff
46_export-ramdac-symbols.diff
commit e908887e958ccce127766ab8c5fc2f9bdb559052
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 2 21:20:58 2007 +0200
Add 40_consolidate_portPriv_pDraw_assignments.diff to avoid a crash in xf86XVReputVideo.
diff --git a/debian/changelog b/debian/changelog
index 146980e..1d46be8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.3.0.0.dfsg-7) UNRELEASED; urgency=low
+
+ * Add 40_consolidate_portPriv_pDraw_assignments.diff to avoid a crash
+ in xf86XVReputVideo (closes: #424899).
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 02 Jul 2007 21:18:45 +0200
+
xorg-server (2:1.3.0.0.dfsg-6) unstable; urgency=low
* Change fglrx conflict to << 8.37.6 (closes: #424975).
diff --git a/debian/patches/40_consolidate_portPriv_pDraw_assignments.diff b/debian/patches/40_consolidate_portPriv_pDraw_assignments.diff
new file mode 100644
index 0000000..078b0a8
--- /dev/null
+++ b/debian/patches/40_consolidate_portPriv_pDraw_assignments.diff
@@ -0,0 +1,56 @@
+commit 649e7f82d8d4333443493056b81eb20d6cf022bc
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date: Thu May 24 12:10:05 2007 +0200
+
+ Consolidate portPriv->pDraw assignments into xf86XVEnlistPortInWindow.
+
+ This avoids a crash in xf86XVReputVideo and also cleans up the code slightly.
+
+ Debian bug#424899
+
+diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
+index 2b097d2..02fcde6 100644
+--- a/hw/xfree86/common/xf86xv.c
++++ b/hw/xfree86/common/xf86xv.c
+@@ -979,6 +979,9 @@ xf86XVEnlistPortInWindow(WindowPtr pWin, XvPortRecPrivatePtr portPriv)
+ winPriv->next = PrivRoot;
+ pWin->devPrivates[XF86XVWindowIndex].ptr = (pointer)winPriv;
+ }
++
++ portPriv->pDraw = (DrawablePtr)pWin;
++
+ return Success;
+ }
+
+@@ -1375,7 +1378,6 @@ xf86XVPutVideo(
+ result = xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
+ if(result != Success) return result;
+
+- portPriv->pDraw = pDraw;
+ portPriv->type = XvInputMask;
+
+ /* save a copy of these parameters */
+@@ -1479,7 +1481,6 @@ xf86XVPutStill(
+
+ xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
+ portPriv->isOn = XV_ON;
+- portPriv->pDraw = pDraw;
+ portPriv->drw_x = drw_x; portPriv->drw_y = drw_y;
+ portPriv->drw_w = drw_w; portPriv->drw_h = drw_h;
+ portPriv->type = 0; /* no mask means it's transient and should
+@@ -1529,7 +1530,6 @@ xf86XVGetVideo(
+ result = xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
+ if(result != Success) return result;
+
+- portPriv->pDraw = pDraw;
+ portPriv->type = XvOutputMask;
+
+ /* save a copy of these parameters */
+@@ -1784,7 +1784,6 @@ xf86XVPutImage(
+ (portPriv->AdaptorRec->flags & VIDEO_OVERLAID_IMAGES)) {
+
+ portPriv->isOn = XV_ON;
+- portPriv->pDraw = pDraw;
+ portPriv->drw_x = drw_x; portPriv->drw_y = drw_y;
+ portPriv->drw_w = drw_w; portPriv->drw_h = drw_h;
+ portPriv->type = 0; /* no mask means it's transient and should
diff --git a/debian/patches/series b/debian/patches/series
index 7c5be43..ca34d77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,6 +17,7 @@
32_disable_sparc_pci_bridge.diff
34_xorg.conf_man_typos.patch
39_alpha_build_flags.patch -p0
+40_consolidate_portPriv_pDraw_assignments.diff
44_fedora-xephyr-keysym-madness.diff
45_CVE-2007-2437.diff
46_export-ramdac-symbols.diff
Reply to: