xorg-server: Changes to 'upstream-unstable'
.gitignore | 1
ChangeLog |28152 +++++++
GL/Makefile.in | 681
GL/apple/Makefile.in | 683
GL/glx/Makefile.in | 746
GL/glx/glxutil.h | 2
GL/mesa/Makefile.in | 749
GL/mesa/X/Makefile.in | 667
GL/mesa/glapi/Makefile.in | 638
GL/mesa/main/Makefile.in | 776
GL/mesa/math/Makefile.in | 654
GL/mesa/shader/Makefile.in | 788
GL/mesa/shader/grammar/Makefile.in | 637
GL/mesa/shader/slang/Makefile.in | 686
GL/mesa/swrast/Makefile.in | 702
GL/mesa/swrast_setup/Makefile.in | 638
GL/mesa/tnl/Makefile.in | 675
GL/mesa/vbo/Makefile.in | 670
Makefile.in | 934
XTrap/Makefile.in | 625
Xext/Makefile.in | 905
Xi/Makefile.in | 739
aclocal.m4 | 8266 ++
afb/Makefile.in | 741
cfb/Makefile.in | 1055
cfb32/Makefile.in | 1008
compile | 142
composite/Makefile.in | 631
config.guess | 1516
config.sub | 1626
config/Makefile.in | 667
configure |39803 ++++++++++
damageext/Makefile.in | 625
dbe/Makefile.in | 661
debian/README.printing-problems | 162
debian/changelog | 1185
debian/compat | 1
debian/control | 260
debian/copyright | 1108
debian/inputabiver | 1
debian/local/xvfb-run | 183
debian/local/xvfb-run.1 | 282
debian/patches/001_ubuntu_add_extra_modelines_from_xorg.patch | 63
debian/patches/02_libvgahw_gcc4_volatile_fix.diff | 70
debian/patches/03_auto_load_driver.diff | 335
debian/patches/04_auto_load_driver_no_conf.diff | 28
debian/patches/05_kill_type1.diff | 160
debian/patches/06_use_proc_instead_of_sysfs_for_pci_domains.diff | 36
debian/patches/07_autoconfig_screen_with_device_section.diff | 27
debian/patches/08_xkb_infinite_loop.diff | 34
debian/patches/09_debian_xserver_rtff.diff | 52
debian/patches/10_dont_look_in_home_for_config.diff | 12
debian/patches/13_debian_add_xkbpath_env_variable.diff | 31
debian/patches/14_default_screen_section.diff | 61
debian/patches/21_glx_align_fixes.patch | 63
debian/patches/41_vbe_filter_less.diff | 46
debian/patches/43_allow_override_BIOS_EDID_preferred_mode.diff | 131
debian/patches/44_preferredmode_infinite_loop.diff | 31
debian/patches/47_fbdevhw_magic_numbers.diff | 17
debian/patches/51_xkb-and-loathing.diff | 46
debian/patches/91_ttf2pt1 |22165 +++++
debian/patches/91_ttf2pt1_updates | 39
debian/patches/92_xprint-security-holes-fix.patch | 158
debian/patches/93_spooltodir_check_file_exists | 52
debian/patches/93_xprint_fonts_fix | 12
debian/patches/series | 22
debian/po/POTFILES.in | 1
debian/po/bg.po | 50
debian/po/cs.po | 56
debian/po/da.po | 60
debian/po/de.po | 58
debian/po/es.po | 61
debian/po/eu.po | 50
debian/po/fi.po | 46
debian/po/fr.po | 61
debian/po/gl.po | 47
debian/po/he.po | 48
debian/po/hu.po | 44
debian/po/it.po | 49
debian/po/ja.po | 71
debian/po/nl.po | 72
debian/po/pt.po | 48
debian/po/pt_BR.po | 85
debian/po/ru.po | 60
debian/po/sk.po | 43
debian/po/sv.po | 55
debian/po/ta.po | 49
debian/po/templates.pot | 42
debian/po/th.po | 47
debian/po/vi.po | 49
debian/prune/non-free | 1
debian/rules | 212
debian/serverminver | 1
debian/videoabiver | 1
debian/watch | 2
debian/xdmx-tools.install | 7
debian/xdmx.install | 2
debian/xnest.install | 2
debian/xprint-common-overrides | 2
debian/xprint-common.README.Debian | 82
debian/xprint-common.default | 10
debian/xprint-common.dirs | 4
debian/xprint-common.docs | 2
debian/xprint-common.install | 2
debian/xprint-common.links | 5
debian/xprint-common.templates | 21
debian/xprint-common.xprint.init | 1246
debian/xprint-overrides | 2
debian/xprint.changelog.Debian | 810
debian/xprint.dirs | 3
debian/xprint.install | 1
debian/xprint.links | 1
debian/xprint.manpages | 1
debian/xserver-xephyr.docs | 1
debian/xserver-xephyr.install | 1
debian/xserver-xfbdev.install | 1
debian/xserver-xorg-core.NEWS | 62
debian/xserver-xorg-core.bug.script | 122
debian/xserver-xorg-core.install | 17
debian/xserver-xorg-dev.install | 3
debian/xsfbs/xsfbs-autoreconf.mk | 150
debian/xsfbs/xsfbs.mk | 365
debian/xsfbs/xsfbs.sh | 900
debian/xvfb.install | 4
depcomp | 584
dix/Makefile.in | 734
doc/Makefile.in | 637
exa/Makefile.in | 677
fb/Makefile.in | 1233
fb/fb.h | 118
fb/fb24_32.c | 74
fb/fballpriv.c | 5
fb/fbarc.c | 1
fb/fbbits.c | 16
fb/fbbits.h | 35
fb/fbblt.c | 138
fb/fbbltone.c | 96
fb/fbcopy.c | 10
fb/fbgc.c | 13
fb/fbgetsp.c | 2
fb/fbglyph.c | 18
fb/fbimage.c | 6
fb/fbpixmap.c | 12
fb/fbpoint.c | 7
fb/fbpseudocolor.c | 6
fb/fbpush.c | 7
fb/fbseg.c | 28
fb/fbsetsp.c | 1
fb/fbsolid.c | 42
fb/fbstipple.c | 6
hw/Makefile.in | 694
hw/darwin/Makefile.in | 2092
hw/darwin/bundle/Dutch.lproj/Makefile.in | 639
hw/darwin/bundle/English.lproj/Makefile.in | 640
hw/darwin/bundle/French.lproj/Makefile.in | 640
hw/darwin/bundle/German.lproj/Makefile.in | 640
hw/darwin/bundle/Japanese.lproj/Makefile.in | 642
hw/darwin/bundle/Makefile.in | 828
hw/darwin/bundle/Portuguese.lproj/Makefile.in | 642
hw/darwin/bundle/Spanish.lproj/Makefile.in | 640
hw/darwin/bundle/Swedish.lproj/Makefile.in | 640
hw/darwin/bundle/ko.lproj/Makefile.in | 639
hw/darwin/iokit/Makefile.in | 632
hw/darwin/quartz/Makefile.in | 803
hw/darwin/utils/Makefile.in | 705
hw/dmx/Makefile.in | 976
hw/dmx/config/Makefile.in | 854
hw/dmx/doc/Makefile.in | 816
hw/dmx/examples/Makefile.in | 1067
hw/dmx/glxProxy/Makefile.in | 681
hw/dmx/input/Makefile.in | 717
hw/kdrive/Makefile.in | 693
hw/kdrive/ati/Makefile.am | 3
hw/kdrive/ati/Makefile.in | 733
hw/kdrive/chips/Makefile.in | 693
hw/kdrive/ephyr/Makefile.in | 709
hw/kdrive/epson/Makefile.in | 692
hw/kdrive/fake/Makefile.in | 690
hw/kdrive/fbdev/Makefile.in | 684
hw/kdrive/i810/Makefile.in | 697
hw/kdrive/linux/Makefile.in | 658
hw/kdrive/mach64/Makefile.in | 695
hw/kdrive/mga/Makefile.in | 696
hw/kdrive/neomagic/Makefile.in | 699
hw/kdrive/nvidia/Makefile.in | 696
hw/kdrive/pm2/Makefile.in | 693
hw/kdrive/r128/Makefile.in | 693
hw/kdrive/sdl/Makefile.in | 658
hw/kdrive/sis300/Makefile.in | 700
hw/kdrive/smi/Makefile.in | 699
hw/kdrive/src/Makefile.in | 719
hw/kdrive/vesa/Makefile.in | 693
hw/kdrive/via/Makefile.in | 692
hw/vfb/Makefile.in | 840
hw/xfree86/Makefile.in | 948
hw/xfree86/common/Makefile.am | 2
hw/xfree86/common/Makefile.in | 817
hw/xfree86/ddc/Makefile.in | 662
hw/xfree86/dixmods/Makefile.in | 1102
hw/xfree86/dixmods/extmod/Makefile.in | 712
hw/xfree86/dixmods/fbmodule.c | 6
hw/xfree86/doc/Makefile.in | 675
hw/xfree86/doc/README.DRI | 1256
hw/xfree86/doc/devel/Makefile.in | 520
hw/xfree86/doc/man/Makefile.in | 624
hw/xfree86/doc/sgml/Makefile.in | 559
hw/xfree86/dri/Makefile.in | 721
hw/xfree86/dummylib/Makefile.in | 736
hw/xfree86/exa/Makefile.in | 740
hw/xfree86/fbdevhw/Makefile.in | 761
hw/xfree86/i2c/Makefile.in | 789
hw/xfree86/int10/Makefile.in | 743
hw/xfree86/loader/Makefile.in | 693
hw/xfree86/modes/Makefile.in | 685
hw/xfree86/modes/xf86EdidModes.c | 3
hw/xfree86/os-support/Makefile.in | 789
hw/xfree86/os-support/bsd/Makefile.am | 1
hw/xfree86/os-support/bsd/Makefile.in | 820
hw/xfree86/os-support/bus/Makefile.in | 711
hw/xfree86/os-support/hurd/Makefile.in | 712
hw/xfree86/os-support/hurd/hurd_io.c | 131
hw/xfree86/os-support/hurd/hurd_kbd.c | 176
hw/xfree86/os-support/linux/Makefile.in | 794
hw/xfree86/os-support/lynxos/Makefile.in | 518
hw/xfree86/os-support/misc/Makefile.in | 642
hw/xfree86/os-support/sco/Makefile.in | 516
hw/xfree86/os-support/solaris/Makefile.in | 815
hw/xfree86/os-support/sysv/Makefile.in | 510
hw/xfree86/os-support/usl/Makefile.in | 516
hw/xfree86/parser/Makefile.in | 738
hw/xfree86/rac/Makefile.in | 653
hw/xfree86/ramdac/Makefile.in | 676
hw/xfree86/scanpci/Makefile.in | 691
hw/xfree86/shadowfb/Makefile.in | 680
hw/xfree86/utils/Makefile.in | 678
hw/xfree86/utils/cvt/Makefile.in | 812
hw/xfree86/utils/gtf/Makefile.in | 779
hw/xfree86/utils/ioport/Makefile.in | 717
hw/xfree86/utils/kbd_mode/Makefile.in | 808
hw/xfree86/utils/pcitweak/Makefile.in | 790
hw/xfree86/utils/scanpci/Makefile.in | 793
hw/xfree86/utils/xorgcfg/Makefile.in | 1303
hw/xfree86/utils/xorgconfig/Makefile.in | 836
hw/xfree86/vbe/Makefile.in | 683
hw/xfree86/vgahw/Makefile.in | 681
hw/xfree86/x86emu/Makefile.in | 648
hw/xfree86/xaa/Makefile.in | 815
hw/xfree86/xf1bpp/Makefile.in | 912
hw/xfree86/xf4bpp/Makefile.in | 774
hw/xfree86/xf8_16bpp/Makefile.in | 679
hw/xfree86/xf8_32bpp/Makefile.in | 720
hw/xgl/Makefile.in | 944
hw/xgl/egl/Makefile.in | 883
hw/xgl/egl/module/Makefile.in | 666
hw/xgl/glx/Makefile.in | 776
hw/xgl/glx/module/Makefile.in | 667
hw/xgl/glxext/Makefile.in | 752
hw/xgl/glxext/module/Makefile.in | 679
hw/xnest/Makefile.in | 899
hw/xprint/Makefile.in | 973
hw/xprint/config/C/Makefile.in | 669
hw/xprint/config/C/print/Makefile.in | 728
hw/xprint/config/C/print/attributes/Makefile.in | 543
hw/xprint/config/C/print/ddx-config/Makefile.in | 669
hw/xprint/config/C/print/ddx-config/raster/Makefile.in | 543
hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in | 543
hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in | 703
hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in | 566
hw/xprint/config/C/print/models/GSdefault/Makefile.in | 543
hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in | 703
hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in | 591
hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in | 703
hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in | 566
hw/xprint/config/C/print/models/HPLJ4family/Makefile.in | 703
hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in | 591
hw/xprint/config/C/print/models/Makefile.in | 680
hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in | 567
hw/xprint/config/C/print/models/PSdefault/Makefile.in | 703
hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in | 588
hw/xprint/config/C/print/models/PSspooldir/Makefile.in | 567
hw/xprint/config/C/print/models/SPSPARC2/Makefile.in | 703
hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in | 549
hw/xprint/config/Makefile.in | 1406
hw/xprint/config/en_US/Makefile.in | 669
hw/xprint/config/en_US/print/Makefile.in | 669
hw/xprint/config/en_US/print/attributes/Makefile.in | 543
hw/xprint/doc/Makefile.in | 602
hw/xprint/etc/Makefile.in | 669
hw/xprint/etc/Xsession.d/Makefile.in | 543
hw/xprint/etc/init.d/Makefile.in | 568
hw/xprint/etc/profile.d/Makefile.in | 510
hw/xprint/pcl-mono/Makefile.in | 793
hw/xprint/pcl/Makefile.in | 793
hw/xprint/ps/Makefile.in | 693
hw/xprint/raster/Makefile.in | 627
hw/xwin/Makefile.in | 1061
include/Makefile.in | 738
include/dix.h | 3
include/do-not-use-config.h.in | 728
install-sh | 507
ltmain.sh | 6938 +
mfb/Makefile.in | 837
mi/Makefile.in | 761
miext/Makefile.in | 671
miext/cw/Makefile.in | 629
miext/damage/Makefile.in | 660
miext/rootless/Makefile.in | 758
miext/rootless/accel/Makefile.in | 642
miext/rootless/safeAlpha/Makefile.in | 629
miext/shadow/Makefile.in | 704
missing | 367
os/Makefile.in | 727
randr/Makefile.in | 677
record/Makefile.in | 623
render/Makefile.in | 682
xfixes/Makefile.in | 634
xkb/Makefile.in | 748
ylwrap | 223
318 files changed, 254676 insertions(+), 1805 deletions(-)
New commits:
commit 31f75db5794a614cf5c9bac3c6ae984968a3e3d3
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Jan 5 17:46:46 2008 -0500
* Don't reference non-existent bug-report.txt file in xvfb-run.1
diff --git a/debian/changelog b/debian/changelog
index 0b1ce76..99d9531 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.4.1~git20071212-3) UNRELEASED; urgency=low
+
+ * Don't reference non-existent bug-report.txt file in xvfb-run.1
+
+ -- David Nusinow <dnusinow@debian.org> Sat, 05 Jan 2008 17:46:20 -0500
+
xorg-server (2:1.4.1~git20071212-2) unstable; urgency=low
* Add patch 08_xkb_infinite_loop.diff from upstream bug#13511: papers over
diff --git a/debian/local/xvfb-run.1 b/debian/local/xvfb-run.1
index 08fc97f..3097ff3 100644
--- a/debian/local/xvfb-run.1
+++ b/debian/local/xvfb-run.1
@@ -269,9 +269,7 @@ See
.URL "http://bugs.debian.org/xvfb"; "the Debian Bug Tracking System" .
If you wish to report a bug in
.BR xvfb\-run ,
-please see
-.I /usr/share/doc/debian/bug\-reporting.txt
-or the
+please use the
.BR reportbug (1)
command.
.SH AUTHOR
commit 6161ea74f28935f6409b44f26b542fe722f28792
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Dec 22 01:47:56 2007 +0100
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 02d681a..0b1ce76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.4.1~git20071212-2) UNRELEASED; urgency=low
+xorg-server (2:1.4.1~git20071212-2) unstable; urgency=low
* Add patch 08_xkb_infinite_loop.diff from upstream bug#13511: papers over
an infinite loop in event processing (closes: #451989).
- -- Julien Cristau <jcristau@debian.org> Thu, 13 Dec 2007 10:07:34 +0100
+ -- Julien Cristau <jcristau@debian.org> Sat, 22 Dec 2007 00:02:01 +0100
xorg-server (2:1.4.1~git20071212-1) unstable; urgency=low
commit 49a73f0c697000fb2b9eabdf913ef1193256c9d1
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Dec 12 21:19:43 2007 -0500
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 9f91c4b..957419e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.4.1~git20071212-1) UNRELEASED; urgency=low
+xorg-server (2:1.4.1~git20071212-1) unstable; urgency=low
[ Julien Cristau ]
* debian/rules: Use lsb_release -i -s to get the vendor name, instead of
@@ -14,7 +14,7 @@ xorg-server (2:1.4.1~git20071212-1) UNRELEASED; urgency=low
This is primarily a bugfix release
+ Remove 12_bgPixel_fix_64bit_issue.diff. Applied upstream
- -- David Nusinow <dnusinow@debian.org> Wed, 12 Dec 2007 19:45:26 -0500
+ -- David Nusinow <dnusinow@debian.org> Wed, 12 Dec 2007 20:19:11 -0500
xorg-server (2:1.4.1~git20071119-1) unstable; urgency=low
commit 552c66c36526566353df563c817ebf3b3507bcf2
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Dec 12 20:19:08 2007 -0500
* New upstream version. This is based on the server-1.4-branch, and includes
all the changes in the 1.4.0.90 (pre-)release as well as additional fixes.
This is primarily a bugfix release
+ Remove 12_bgPixel_fix_64bit_issue.diff. Applied upstream
diff --git a/debian/changelog b/debian/changelog
index cb16609..9f91c4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xorg-server (2:1.4.1~git20071119-2) UNRELEASED; urgency=low
+xorg-server (2:1.4.1~git20071212-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* debian/rules: Use lsb_release -i -s to get the vendor name, instead of
hardcoding "Debian".
* debian/control: build-dep on lsb-release.
@@ -7,7 +8,13 @@ xorg-server (2:1.4.1~git20071119-2) UNRELEASED; urgency=low
* Add patch 44_preferredmode_infinite_loop.diff from upstream git: fixes an
infinite loop when PreferredMode is used in xorg.conf.
- -- Julien Cristau <jcristau@debian.org> Sun, 02 Dec 2007 00:56:53 +0100
+ [ David Nusinow ]
+ * New upstream version. This is based on the server-1.4-branch, and includes
+ all the changes in the 1.4.0.90 (pre-)release as well as additional fixes.
+ This is primarily a bugfix release
+ + Remove 12_bgPixel_fix_64bit_issue.diff. Applied upstream
+
+ -- David Nusinow <dnusinow@debian.org> Wed, 12 Dec 2007 19:45:26 -0500
xorg-server (2:1.4.1~git20071119-1) unstable; urgency=low
diff --git a/debian/patches/12_bgPixel_fix_64bit_issue.diff b/debian/patches/12_bgPixel_fix_64bit_issue.diff
deleted file mode 100644
index f80d4a4..0000000
--- a/debian/patches/12_bgPixel_fix_64bit_issue.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9adea807038b64292403ede982075fe1dcfd4c9a Mon Sep 17 00:00:00 2001
-From: Hong Liu <hong.liu@intel.com>
-Date: Tue, 4 Sep 2007 08:46:46 +0100
-Subject: [PATCH] bgPixel (unsigned long) is 64-bit on x86_64, so -1 != 0xffffffff
-
-This patch should fix bug 8080.
----
- hw/xfree86/xaa/xaaGC.c | 9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c
-index f3434c9..b3dc83a 100644
---- a/hw/xfree86/xaa/xaaGC.c
-+++ b/hw/xfree86/xaa/xaaGC.c
-@@ -80,10 +80,11 @@ XAAValidateGC(
- }
-
- if(pGC->depth != 32) {
-- if(pGC->bgPixel == -1) /* -1 is reserved for transparency */
-- pGC->bgPixel = 0x7fffffff;
-- if(pGC->fgPixel == -1) /* -1 is reserved for transparency */
-- pGC->fgPixel = 0x7fffffff;
-+ /* 0xffffffff is reserved for transparency */
-+ if(pGC->bgPixel == 0xffffffff)
-+ pGC->bgPixel = 0x7fffffff;
-+ if(pGC->fgPixel == 0xffffffff)
-+ pGC->fgPixel = 0x7fffffff;
- }
-
- if((pDraw->type == DRAWABLE_PIXMAP) && !IS_OFFSCREEN_PIXMAP(pDraw)){
---
-1.5.3.2
-
diff --git a/debian/patches/14_default_screen_section.diff b/debian/patches/14_default_screen_section.diff
index 3151f6e..a3b6061 100644
--- a/debian/patches/14_default_screen_section.diff
+++ b/debian/patches/14_default_screen_section.diff
@@ -1,8 +1,8 @@
Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-11-19 20:36:12.000000000 -0500
-+++ xorg-server/hw/xfree86/common/xf86Config.c 2007-11-19 20:36:13.000000000 -0500
-@@ -1800,11 +1800,6 @@
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-12-12 19:43:59.000000000 -0500
++++ xorg-server/hw/xfree86/common/xf86Config.c 2007-12-12 19:44:10.000000000 -0500
+@@ -1801,11 +1801,6 @@
if (!servlayoutp)
return FALSE;
@@ -14,7 +14,7 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
/*
* which screen section is the active one?
*
-@@ -1892,6 +1887,12 @@
+@@ -1893,6 +1888,12 @@
XF86ConfAdaptorLinkPtr conf_adaptor;
Bool defaultMonitor = FALSE;
@@ -29,8 +29,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
/*
Index: xorg-server/hw/xfree86/parser/Screen.c
===================================================================
---- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-11-19 20:36:47.000000000 -0500
-+++ xorg-server/hw/xfree86/parser/Screen.c 2007-11-19 20:36:57.000000000 -0500
+--- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-12-12 19:43:02.000000000 -0500
++++ xorg-server/hw/xfree86/parser/Screen.c 2007-12-12 19:44:10.000000000 -0500
@@ -498,12 +498,6 @@
XF86ConfDevicePtr device;
XF86ConfAdaptorLinkPtr adaptor;
diff --git a/debian/patches/series b/debian/patches/series
index 08a6b93..f9cca17 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@
06_use_proc_instead_of_sysfs_for_pci_domains.diff
07_autoconfig_screen_with_device_section.diff
10_dont_look_in_home_for_config.diff -p0
-12_bgPixel_fix_64bit_issue.diff
13_debian_add_xkbpath_env_variable.diff
14_default_screen_section.diff
21_glx_align_fixes.patch
commit e8e1a1e781d52ca3bbe804b0cb0c9b5d6d42b421
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Dec 7 21:12:40 2007 +0100
Add patch 08_xkb_infinite_loop.diff from upstream bug#13511
Papers over an infinite loop in event processing (closes: #451989).
diff --git a/debian/changelog b/debian/changelog
index cb16609..251daca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ xorg-server (2:1.4.1~git20071119-2) UNRELEASED; urgency=low
* Cherry-pick commit f30abe30 from master: edid quirk for MAX 0x77e monitor.
* Add patch 44_preferredmode_infinite_loop.diff from upstream git: fixes an
infinite loop when PreferredMode is used in xorg.conf.
+ * Add patch 08_xkb_infinite_loop.diff from upstream bug#13511: papers over
+ an infinite loop in event processing (closes: #451989).
- -- Julien Cristau <jcristau@debian.org> Sun, 02 Dec 2007 00:56:53 +0100
+ -- Julien Cristau <jcristau@debian.org> Fri, 07 Dec 2007 21:09:24 +0100
xorg-server (2:1.4.1~git20071119-1) unstable; urgency=low
diff --git a/debian/patches/08_xkb_infinite_loop.diff b/debian/patches/08_xkb_infinite_loop.diff
new file mode 100644
index 0000000..efe3f28
--- /dev/null
+++ b/debian/patches/08_xkb_infinite_loop.diff
@@ -0,0 +1,34 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=451989
+https://bugs.freedesktop.org/show_bug.cgi?id=13511
+------ Comment #1 From Peter Hutterer 2007-12-04 22:45:39 PST [reply] -------
+
+(In reply to comment #0)
+> When some window is opened by some grabbed key, grabbing all keys and they
+> destroyed (like the window ratpoison opened uppon C-t :, or the window icewm
+> shows when doing Alt-Tab), the xserver is caught in an endless loop within
+> PlayReleasedEvents in dix/events.c.
+
+interesting bug... tricky to track down.
+
+The bug only occurs if Xkb triggers an autorepeat. In this case,
+XkbHandleActions overwrites dev->public.realInputProc with EnqueueEvent. When
+the device is unfrozen, the realInputProc is written back to the
+processInputProc and the whole thing craps out.
+
+Here's a preliminary hack to fix it. It stops the loop occuring (tested with
+ratpoison) but I'm not sure what other implications it has. It most probably is
+not the correct solution.
+
+diff --git a/include/xkbsrv.h b/include/xkbsrv.h
+index 167dbec..9f7f0d6 100644
+--- a/include/xkbsrv.h
++++ b/include/xkbsrv.h
+@@ -258,7 +258,8 @@ typedef struct
+ device->public.processInputProc = proc; \
+ oldprocs->processInputProc = \
+ oldprocs->realInputProc = device->public.realInputProc; \
+- device->public.realInputProc = proc; \
++ if (proc != device->public.enqueueInputProc) \
++ device->public.realInputProc = proc; \
+ oldprocs->unwrapProc = device->unwrapProc; \
+ device->unwrapProc = unwrapproc;
diff --git a/debian/patches/series b/debian/patches/series
index 08a6b93..1e668fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,7 @@
05_kill_type1.diff
06_use_proc_instead_of_sysfs_for_pci_domains.diff
07_autoconfig_screen_with_device_section.diff
+08_xkb_infinite_loop.diff
10_dont_look_in_home_for_config.diff -p0
12_bgPixel_fix_64bit_issue.diff
13_debian_add_xkbpath_env_variable.diff
commit 826ddcc2a27e069d7ba644d3b10253b17068bfe8
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Dec 2 00:58:05 2007 +0100
Add patch 44_preferredmode_infinite_loop.diff from upstream git
fixes an infinite loop when PreferredMode is used in xorg.conf.
diff --git a/debian/changelog b/debian/changelog
index b600ad9..cb16609 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ xorg-server (2:1.4.1~git20071119-2) UNRELEASED; urgency=low
hardcoding "Debian".
* debian/control: build-dep on lsb-release.
* Cherry-pick commit f30abe30 from master: edid quirk for MAX 0x77e monitor.
+ * Add patch 44_preferredmode_infinite_loop.diff from upstream git: fixes an
+ infinite loop when PreferredMode is used in xorg.conf.
- -- Julien Cristau <jcristau@debian.org> Fri, 30 Nov 2007 14:00:16 +0100
+ -- Julien Cristau <jcristau@debian.org> Sun, 02 Dec 2007 00:56:53 +0100
xorg-server (2:1.4.1~git20071119-1) unstable; urgency=low
diff --git a/debian/patches/44_preferredmode_infinite_loop.diff b/debian/patches/44_preferredmode_infinite_loop.diff
new file mode 100644
index 0000000..9ab791d
--- /dev/null
+++ b/debian/patches/44_preferredmode_infinite_loop.diff
@@ -0,0 +1,31 @@
+From 29e0e180729a4f0cc020985a4de4c8bc4b9c7f5f Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp@koto.keithp.com>
+Date: Mon, 22 Oct 2007 13:38:16 -0700
+Subject: [PATCH] Leave hardware-specified preferred modes alone when user preference exists.
+
+Instead of removing the preference bit marking the hardware declared mode
+preference, leave it in place and just move the user preferred mode to the
+front of the list while marking it with the USERPREF bit which will cause it
+to be selected by the initial mode selection code.
+---
+ hw/xfree86/modes/xf86Crtc.c | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
+index 0a48d5b..bb416fd 100644
+--- a/hw/xfree86/modes/xf86Crtc.c
++++ b/hw/xfree86/modes/xf86Crtc.c
+@@ -1417,9 +1417,8 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
+ output->probed_modes = mode;
+ }
+ mode->type |= (M_T_PREFERRED|M_T_USERPREF);
++ break;
+ }
+- else
+- mode->type &= ~M_T_PREFERRED;
+ }
+ }
+
+--
+1.5.3.6
+
diff --git a/debian/patches/series b/debian/patches/series
index cd09885..08a6b93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,6 +12,7 @@
21_glx_align_fixes.patch
41_vbe_filter_less.diff
43_allow_override_BIOS_EDID_preferred_mode.diff
+44_preferredmode_infinite_loop.diff
#47_fbdevhw_magic_numbers.diff
#51_xkb-and-loathing.diff
91_ttf2pt1
commit 1ed6406e3b0a87cc9ba105d4b2cc00807115fa9d
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Nov 30 14:00:53 2007 +0100
* Cherry-pick commit f30abe30 from master: edid quirk for MAX 0x77e monitor.
diff --git a/debian/changelog b/debian/changelog
index 28337eb..b600ad9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ xorg-server (2:1.4.1~git20071119-2) UNRELEASED; urgency=low
* debian/rules: Use lsb_release -i -s to get the vendor name, instead of
hardcoding "Debian".
* debian/control: build-dep on lsb-release.
+ * Cherry-pick commit f30abe30 from master: edid quirk for MAX 0x77e monitor.
- -- Julien Cristau <jcristau@debian.org> Fri, 23 Nov 2007 22:14:06 +0100
+ -- Julien Cristau <jcristau@debian.org> Fri, 30 Nov 2007 14:00:16 +0100
xorg-server (2:1.4.1~git20071119-1) unstable; urgency=low
diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index 8b5e69d..44bff4d 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -60,7 +60,8 @@ static Bool quirk_prefer_large_60 (int scrnIndex, xf86MonPtr DDC)
{
/* Belinea 10 15 55 */
if (memcmp (DDC->vendor.name, "MAX", 4) == 0 &&
- DDC->vendor.prod_id == 1516)
+ ((DDC->vendor.prod_id == 1516) ||
+ (DDC->vendor.prod_id == 0x77e)))
return TRUE;
/* Acer AL1706 */
commit 73c32263aa7b5309092cec4b6e2e93fa71a387be
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Nov 23 22:15:02 2007 +0100
Don't hardcode "Debian" as the vendor name.
* debian/rules: Use lsb_release -i -s to get the vendor name, instead of
hardcoding "Debian".
* debian/control: build-dep on lsb-release.
diff --git a/debian/changelog b/debian/changelog
index 93abc92..28337eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.4.1~git20071119-2) UNRELEASED; urgency=low
+
+ * debian/rules: Use lsb_release -i -s to get the vendor name, instead of
+ hardcoding "Debian".
+ * debian/control: build-dep on lsb-release.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 23 Nov 2007 22:14:06 +0100
+
xorg-server (2:1.4.1~git20071119-1) unstable; urgency=low
* Ship a .orig.tar.gz that's been autoreconf'ed. Closes: #451891
diff --git a/debian/control b/debian/control
index eaf887c..8907850 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Steve Langasek <vorlon@debian.or
# x11proto-xf86dri-dev and libdrm-dev are for DRI support for the Xorg server.
# x11proto-print-dev and libfreetype6-dev are for Xprint
# everything on is for the DMX and Xnest servers.
-Build-Depends: debhelper (>= 4.0.0), pkg-config, bison, flex,
+Build-Depends: debhelper (>= 4.0.0), lsb-release, pkg-config, bison, flex,
x11proto-bigreqs-dev, x11proto-composite-dev (>= 1:0.4), x11proto-core-dev (>= 7.0.9),
x11proto-damage-dev (>= 1.1), x11proto-evie-dev, x11proto-fixes-dev (>= 4.0),
x11proto-kb-dev (>= 1.0.3), x11proto-xinerama-dev, x11proto-randr-dev (>= 1.2),
diff --git a/debian/rules b/debian/rules
index a474d4f..ab4e4f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,6 +44,8 @@ endif
INSTALL=/usr/bin/install
+VENDOR = $(shell lsb_release -i -s)
+
# disable-static is so we don't get libfoo.a for modules. now if only we could
# kill the .las.
confflags += --disable-static \
@@ -69,7 +71,7 @@ confflags += --disable-static \
--with-xkb-output=/var/lib/xkb \
--enable-xfree86-utils \
--with-os-name="$(shell uname)" \
- --with-os-vendor="Debian ($(SOURCE_NAME) $(SOURCE_VERSION))" \
+ --with-os-vendor="$(VENDOR) ($(SOURCE_NAME) $(SOURCE_VERSION))" \
--with-int10=x86emu \
--disable-type1
commit 789139ee3ce57258a294e2f1cf33d3e6a60f897b
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Nov 19 20:39:03 2007 -0500
* Re-enable validation of the screen section of xorg.conf
Modify 14_default_screen_section.diff. This also fixes a problem where the
server can't find the device section when it is specified in the screen
section. Closes: #451950
diff --git a/debian/changelog b/debian/changelog
index ac86ff1..93abc92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
xorg-server (2:1.4.1~git20071119-1) unstable; urgency=low
* Ship a .orig.tar.gz that's been autoreconf'ed. Closes: #451891
+ * Re-enable validation of the screen section of xorg.conf
+ Modify 14_default_screen_section.diff. This also fixes a problem where the
+ server can't find the device section when it is specified in the screen
+ section. Closes: #451950
- -- David Nusinow <dnusinow@debian.org> Mon, 19 Nov 2007 20:00:56 -0500
+ -- David Nusinow <dnusinow@debian.org> Mon, 19 Nov 2007 20:38:04 -0500
xorg-server (2:1.4.1~git20071117-1) unstable; urgency=low
diff --git a/debian/patches/14_default_screen_section.diff b/debian/patches/14_default_screen_section.diff
index 77e0637..3151f6e 100644
--- a/debian/patches/14_default_screen_section.diff
+++ b/debian/patches/14_default_screen_section.diff
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-09-30 19:55:22.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.c 2007-09-30 20:48:02.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-11-19 20:36:12.000000000 -0500
++++ xorg-server/hw/xfree86/common/xf86Config.c 2007-11-19 20:36:13.000000000 -0500
@@ -1800,11 +1800,6 @@
if (!servlayoutp)
return FALSE;
@@ -27,18 +27,35 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
xf86Msg(from, "|-->Screen \"%s\" (%d)\n", conf_screen->scrn_identifier,
scrnum);
/*
-Index: xorg-server/hw/xfree86/parser/read.c
+Index: xorg-server/hw/xfree86/parser/Screen.c
===================================================================
---- xorg-server.orig/hw/xfree86/parser/read.c 2007-09-30 19:55:22.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/read.c 2007-09-30 19:55:22.000000000 -0400
-@@ -82,8 +82,8 @@
- {
- /*if (!xf86validateDevice (p))
- return FALSE;*/
-- if (!xf86validateScreen (p))
-- return FALSE;
-+ /*if (!xf86validateScreen (p))
-+ return FALSE;*/
- if (!xf86validateInput (p))
- return FALSE;
- if (!xf86validateLayout (p))
+--- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-11-19 20:36:47.000000000 -0500
++++ xorg-server/hw/xfree86/parser/Screen.c 2007-11-19 20:36:57.000000000 -0500
+@@ -498,12 +498,6 @@
+ XF86ConfDevicePtr device;
+ XF86ConfAdaptorLinkPtr adaptor;
+
+- if (!screen)
+- {
+- xf86validationError ("At least one Screen section is required.");
+- return (FALSE);
+- }
+-
+ while (screen)
+ {
+ if (screen->scrn_obso_driver && !screen->scrn_identifier)
+@@ -512,13 +506,7 @@
+ monitor = xf86findMonitor (screen->scrn_monitor_str, p->conf_monitor_lst);
+ if (screen->scrn_monitor_str)
+ {
+- if (!monitor)
+- {
+- xf86validationError (UNDEFINED_MONITOR_MSG,
+- screen->scrn_monitor_str, screen->scrn_identifier);
+- return (FALSE);
+- }
+- else
++ if (monitor)
+ {
+ screen->scrn_monitor = monitor;
+ if (!xf86validateMonitor(p, screen))
commit d1870052e3b3456fc98e10dc8c6becd63c4e6daf
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Nov 19 20:02:44 2007 -0500
* Ship a .orig.tar.gz that's been autoreconf'ed. Closes: #451891
diff --git a/debian/changelog b/debian/changelog
index 9bca2f5..ac86ff1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.4.1~git20071119-1) unstable; urgency=low
+
+ * Ship a .orig.tar.gz that's been autoreconf'ed. Closes: #451891
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 19 Nov 2007 20:00:56 -0500
+
xorg-server (2:1.4.1~git20071117-1) unstable; urgency=low
[ Julien Cristau ]
commit 3053b8a4007c5bb3adaa0014864e6f642929310c
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Nov 19 20:00:19 2007 -0500
Revert "* chmod +x configure in debian/rules clean, to fix FTBFS."
This reverts commit 157dec6bee7741877e855cee9ab9374693f99292.
diff --git a/debian/changelog b/debian/changelog
index ce117a3..9bca2f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-xorg-server (2:1.4.1~git20071117-2) UNRELEASED; urgency=low
-
- * chmod +x configure in debian/rules clean, to fix FTBFS.
-
- -- Julien Cristau <jcristau@debian.org> Mon, 19 Nov 2007 00:52:54 +0100
-
xorg-server (2:1.4.1~git20071117-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/rules b/debian/rules
index ca30cbb..a474d4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,8 +103,6 @@ clean: xsfclean
rm -f include/dix-config.h include/do-not-use-config.h \
include/xorg-config.h include/xorg-server.h
- chmod +x configure
-
dh_clean
install: build
commit 157dec6bee7741877e855cee9ab9374693f99292
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Nov 19 00:53:39 2007 +0100
* chmod +x configure in debian/rules clean, to fix FTBFS.
diff --git a/debian/changelog b/debian/changelog
index 9bca2f5..ce117a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.4.1~git20071117-2) UNRELEASED; urgency=low
+
+ * chmod +x configure in debian/rules clean, to fix FTBFS.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 19 Nov 2007 00:52:54 +0100
+
xorg-server (2:1.4.1~git20071117-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/rules b/debian/rules
index a474d4f..ca30cbb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,6 +103,8 @@ clean: xsfclean
rm -f include/dix-config.h include/do-not-use-config.h \
include/xorg-config.h include/xorg-server.h
+ chmod +x configure
+
dh_clean
install: build
commit 9bb7e3ab24c13981c242d3d4def158ba907da02c
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Nov 17 20:20:20 2007 -0500
Autoreconf
diff --git a/configure b/configure
index 92882ef..3d22f07 100755
--- a/configure
+++ b/configure
@@ -922,6 +922,8 @@ KDRIVE_HW_TRUE
KDRIVE_HW_FALSE
INSTALL_SETUID_TRUE
INSTALL_SETUID_FALSE
+SECURE_RPC_TRUE
+SECURE_RPC_FALSE
INT10_VM86_TRUE
INT10_VM86_FALSE
INT10_X86EMU_TRUE
@@ -5276,7 +5278,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5279 "configure"' > conftest.$ac_ext
+ echo '#line 5281 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8308,11 +8310,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8311: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8313: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8315: \$? = $ac_status" >&5
Reply to: