lp:~chasedouglas/ubuntu/maverick/xorg-server/multitouch
- Get this branch:
- bzr branch lp:~chasedouglas/ubuntu/maverick/xorg-server/multitouch
Branch merges
Branch information
- Owner:
- Chase Douglas
- Status:
- Development
Recent revisions
- 191. By Chase Douglas
-
* Fix set_valuators and set_raw_valuators for ranged input
* Fix EventToXI for events with no valuators - 190. By Chase Douglas
-
* Add support for mixed mode valuators
* Fixes for previous additinos
* Add masked valuator input event API
* Add support for direct input devices
* Add ABS_MT_SLOT atom name - 189. By Chris Halse Rogers
-
* debian/rules:
- Drop the upstream changelog harder. We're scrabbling for CD space
and this is an easy 1MB saving. - 188. By Chris Halse Rogers
-
* Merge from (unreleased) Debian experimental. Remaining changes:
- rules, control:
+ Disable SELinux, libaudit-dev is not in main yet (LP 406226).
Drop libaudit-dev from build-deps.
- rules: Enable xcsecurity (LP 247537).
- local/xvfb-run*: Add correct docs about error codes (LP 328205)
- rules: Add --with-extra-module- dir to support GL alternatives.
- control: Xvfb depends on xauth, x11-xkb-utils. (LP 500102)
- rules, local/64-xorg-xkb. rules: Don't use keyboard- configuration
until it's available.
- control: Update some versioned Breaks for Ubuntu versions.
- debian/patches:
+ 100_rethrow_signals. patch:
When aborting, re-raise signals for apport
+ 109_fix-swcursor- crash.patch:
Avoid dereferencing null pointer while reloading cursors during
resume. (LP 371405)
+ 111_armel-drv-fallbacks. patch:
Add support for armel driver fallbacks.
+ 121_only_switch_ vt_when_ active. diff:
Add a check to prevent the X server from changing the VT when killing
GDM from the console.
+ 122_xext_fix_card32_ overflow_ in_xauth. patch:
Fix server crash when “xauth generate” is called with large timeout.
+ 157_check_null_modes. patch, 162_null_ crtc_in_ rotation. patch,
166_nullptr_ xinerama_ keyrepeat. patch, 167_nullptr_ xisbread. patch
169_mipointer_ nullptr_ checks. patch,
172_cwgetbackingpic ture_nullptr_ check.patch:
Fix various segfaults in xserver by checking pointers for NULL
values before dereferencing them.
+ 165_man_xorg_conf_ no_device_ ident.patch
Correct man page
+ 168_glibc_trace_to_ stderr. patch:
Report abort traces to stderr instead of terminal
+ 184_virtual_devices_ autodetect. patch:
Use vesa for qemu device, which is not supported by cirrus
+ 187_edid_quirk_hp_ nc8430. patch:
Quirk for another LPL monitor (LP 380009)
+ 188_default_primary_ to_first_ busid.patch:
Pick the first device and carry on (LP 459512)
+ 189_xserver_1.5.0_bg_ none_root. patch:
Create a root window with no background.
+ 190_cache-xkbcomp_ output_ for_fast_ start_up. patch:
Cache keyboard settings.
+ 191-Xorg-add-an- extra-module- path.patch:
Add support for the alternatives module path.
+ 196_xvfb-fbscreeninit- handling. patch, 197_xvfb- randr.patch:
Adds xrandr support to xvfb. (LP 516123)
+ 198_nohwaccess.patch:
Adds a -nohwaccess argument to make X not access the hardware
ports directly.
+ 200_randr-null.patch:
Clarify a pointer initialization.
* Update changelog entries for previously unreleased Debian 1.8.1.901-1 - 187. By Bryce Harrington
-
[ Timo Aaltonen ]
* Merged from Debian experimental, remaining changes:
- rules, control:
+ Disable SELinux, libaudit-dev is not in main yet (LP 406226).
Drop libaudit-dev from build-deps.
- rules: Enable xcsecurity (LP 247537).
- local/xvfb-run*: Add correct docs about error codes (LP 328205)
- rules: Add --with-extra-module- dir to support GL alternatives.
- control: Xvfb depends on xauth, x11-xkb-utils, recommends
libgl1-mesa-dri. (LP 500102)
- rules, local/64-xorg-xkb. rules: Don't use keyboard- configuration
until it's available.
- debian/patches:
+ 100_rethrow_signals. patch:
When aborting, re-raise signals for apport
+ 109_fix-swcursor- crash.patch:
Avoid dereferencing null pointer while reloading cursors during
resume. (LP 371405)
+ 111_armel-drv-fallbacks. patch:
Add support for armel driver fallbacks.
+ 121_only_switch_ vt_when_ active. diff:
Add a check to prevent the X server from changing the VT when killing
GDM from the console.
+ 122_xext_fix_card32_ overflow_ in_xauth. patch:
+ 157_check_null_modes. patch, 162_null_ crtc_in_ rotation. patch,
166_nullptr_ xinerama_ keyrepeat. patch, 167_nullptr_ xisbread. patch
169_mipointer_ nullptr_ checks. patch,
172_cwgetbackingpic ture_nullptr_ check.patch:
Fix various segfaults in xserver by checking pointers for NULL
values before dereferencing them.
+ 165_man_xorg_conf_ no_device_ ident.patch
Correct man page
+ 168_glibc_trace_to_ stderr. patch:
Report abort traces to stderr instead of terminal
+ 184_virtual_devices_ autodetect. patch:
Use vesa for qemu device, which is not supported by cirrus
+ 187_edid_quirk_hp_ nc8430. patch:
Quirk for another LPL monitor (LP 380009)
+ 188_default_primary_ to_first_ busid.patch:
Pick the first device and carry on (LP 459512)
+ 189_xserver_1.5.0_bg_ none_root. patch:
Create a root window with no background.
+ 190_cache-xkbcomp_ output_ for_fast_ start_up. patch:
Cache keyboard settings.
+ 191-Xorg-add-an- extra-module- path.patch:
Add support for the alternatives module path.
+ 196_xvfb-fbscreeninit- handling. patch, 197_xvfb- randr.patch:
Adds xrandr support to xvfb. (LP 516123)
+ 198_nohwaccess.patch:
Adds a -nohwaccess argument to make X not access the hardware
ports directly.
+ 200_randr-null.patch:
Clarify a pointer initialization.
* Dropped patches:
- 106_nouveau_autodetect. patch: obsoleted by 15-nouveau.diff
- 112_xaa-fbcomposite- fix-negative- size.patch: adopted by Debian
- 113_quell_nouveau_ aiglx.patch: obsoleted by 15-nouveau.diff
- 115_xext_fix_cursor_ ref_counting. patch: merged upstream
- 116_fix_typos_in_ swap_functions. patch: merged upstream
- 118_xkb_fix_garbage_ init.patch: merged upstream
- 123_exa_sys_ptr_ nullpointer_ check.patch: merged upstream
- 199_xfvb-help-typo. patch: merged upstream
* debian/xserver- xorg-core. preinst. in: Drop the removal of the wrong
alternative, obsolete by now.
* debian/control: Build the udeb and bump the relaxed build-deps.
* debian/local/xvfb- run: Don't disable composite, seems to run fine
with it nowadays.[ Robert Hooker ]
* Fix 190_cache-xkbcomp_ output_ for_fast_ start_up. patch so it works.
* Drop 164_trap-aspect- ratios. patch: obsolete.
* debian/rules: Adjust confflag targets so xcsecurity isn't enabled for udeb
with disabled xace.
* Drop 184_virtual_devices_ autodetect. patch: It's a noop with todays autoconfig. [ Bryce Harrington ]
* debian/rules: Don't reference the package uploader for support; instead point
users to the standard Ubuntu support page.
(LP: #589811)[ Christopher James Halse Rogers ]
* Add debian/gbp.conf pointing at ubuntu branch.
* Drop 109_fix-swcursor- crash.patch; merged upstream in 3a3edb2c.
* 122_xext_fix_card32_ overflow_ in_xauth. patch: Update to most recent patch
on patchwork. This patch actually works! (tested with
“xauth generate :0 . trusted timeout 99999999) (LP: #519049) - 186. By Bryce Harrington
-
* Drop 117_fix_
crash_with_ createglyphset. patch
- Dupe of patch 110
* Drop 03_fedora_glx_versioning. diff, 04_fedora_ glx14-swrast. diff
- These patches were brought in by Debian to provide glx 1.4 support
which Fedora backported from xserver 1.8, however testing in
Ubuntu showed they caused a crash when closing Clutter apps (#550218),
and graphics corruption when opening windows. Dropping these patches
returns us to GLX 1.2, which has been found to be stable; Debian has
also dropped these two patches.
(Fixes #565903).
* Drop 114_dri2_make_sure_ x_drawable_ exists. patch
- This was an early attempt by upstream which fixed the aforementioned
Clutter crash, but which introduced a memory leak.
(Fixes #565981) - 184. By Bryce Harrington
-
* Add several cherrypicks of fixes from upstream git tree which fix various
issues and that look safe with low or no risk of regression.
+ 115_xext_fix_cursor_ ref_counting. patch: Xext: Fix cursor reference
counting hazard.
+ 116_fix_typos_in_ swap_functions. patch: Fixes typos in several of the
glxcmdsswap routines.
+ 117_fix_crash_with_ createglyphset. patch: Fixes crash introduced in
FindGlyphsByHash() if one client disconnects while a second is in
the middle of doing certain Glyph operations.
+ 118_xkb_fix_garbage_ init.patch: Fixes typo that can cause garbage
bits to get appended on the xkbControlsNotify changedControls mask
because it was uninitialized on the stack.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/maverick/xorg-server