~vcs-imports/xorg-server/master : changes

~vcs-imports/xorg-server/master » Changes from revision 6345

From Revision 6345 to 6326

Rev	Summary	Authors	Tags	Date
6345	Merge remote-tracking branch 'kibi/master' Merge remote-tracking branch 'kibi/master'	Keith Packard		12 years ago
6344	Merge remote-tracking branch 'whot/for-keith' Merge remote-tracking branch 'whot/for-keith'	Keith Packard		12 years ago
6343	randr: void function cannot return value randr: void function cannot return value Providing an argument to return in a function with void return type is not allowed by the C standard, and makes the Sun compilers unhappy. Signed-off-by: Nicolas Kaiser <nikai@nikai.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Keith Packard <keithp@keithp.com>	Nicolas Kaiser		12 years ago
6342	XQuartz: AIGLX: Remove unnecessary includes in indirect.c XQuartz: AIGLX: Remove unnecessary includes in indirect.c Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>	Jeremy Huddleston		12 years ago
6341	XQuartz: AIGLX: Setup dispatch table based on runtime capabi... XQuartz: AIGLX: Setup dispatch table based on runtime capabilities rather than buildtime This will allow XQuartz built on older systems to pickup capabilities on newer systems and prevent runtime failures when building on newer systems and running on older ones. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>	Jeremy Huddleston		12 years ago
6340	XQuartz: Remove explicit link against libGL XQuartz: Remove explicit link against libGL This was indented to force a link against OpenGL.framework's libGL, but it actually resulted in linking against mesa's libGL due to the ordering of -L Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>	Jeremy Huddleston		12 years ago
6339	Xephyr: Mention Xserver's options are also accepted. Xephyr: Mention Xserver's options are also accepted. Originally reported in the Debian BTS: http://bugs.debian.org/582650 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Cyril Brulebois <kibi@debian.org>	Cyril Brulebois		12 years ago
6338	xkb: Fix case checks for Latin 8. xkb: Fix case checks for Latin 8. Spotted by -Wlogical-op: \| CC xkbfmisc.lo \| xkbfmisc.c: In function '_XkbKSCheckCase': \| xkbfmisc.c:104:3: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op] \| xkbfmisc.c:118:3: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op] A quick look at the keysymdef.h file (from xproto) suggests the implementor chose to use interval checks to determine the case, but since lines weren't sorted by codepoints, checks were quite wrong. Implement _XkbKSUpper/_XkbKSLower checks based on a grep for CAPITAL/SMALL (respectively) on the Latin 8 part of the said file. Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Cyril Brulebois <kibi@debian.org>	Cyril Brulebois		12 years ago
6337	test: fix memset size for WindowRec (#37801) test: fix memset size for WindowRec (#37801) X.Org Bug 37801 <http://bugs.freedesktop.org/show_bug.cgi?id=37801> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Cyril Brulebois <kibi@debian.org> Signed-off-by: Keith Packard <keithp@keithp.com>	Peter Hutterer		12 years ago
6336	XQuartz: xpbproxy: Correct NSUInteger format strings XQuartz: xpbproxy: Correct NSUInteger format strings Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>	Jeremy Huddleston		12 years ago
6335	XQuartz: ASL: Use xpbproxy subsystem for logging xpbproxy me... XQuartz: ASL: Use xpbproxy subsystem for logging xpbproxy messages Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>	Jeremy Huddleston		12 years ago
6334	XQuartz: ASL: Use GLXAqua subsystem for logging GLXAqua mess... XQuartz: ASL: Use GLXAqua subsystem for logging GLXAqua messages Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>	Jeremy Huddleston		12 years ago
6333	XQuartz: ASL: Use xpr subsystem for logging xpr messages XQuartz: ASL: Use xpr subsystem for logging xpr messages Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>	Jeremy Huddleston		12 years ago
6332	XQuartz: ASL: Update logging to support differnet levels and... XQuartz: ASL: Update logging to support differnet levels and subsystems Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>	Jeremy Huddleston		12 years ago
6331	XQuartz: Add a semicolon after DEBUG_LOG XQuartz: Add a semicolon after DEBUG_LOG Don't rely on the macro to provide it Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>	Jeremy Huddleston		12 years ago
6330	XQuartz: Move -lXplugin to LDFLAGS from LDADD XQuartz: Move -lXplugin to LDFLAGS from LDADD Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>	Jeremy Huddleston		12 years ago
6329	XQuartz: GLX: Create a new dispatch table rather than modify... XQuartz: GLX: Create a new dispatch table rather than modifying the existing one Fixes regression introduced by b0c665ac0fe6840dda581e4d0d0b76c703d62a7b 0 X11.bin 0x0000000100118293 __glXAquaScreenCreateContext + 684 1 X11.bin 0x00000001001315b0 DoCreateContext + 163 2 X11.bin 0x000000010013509f __glXDispatch + 211 3 X11.bin 0x00000001000c7dad Dispatch + 785 4 X11.bin 0x00000001000b97e5 dix_main + 1022 5 X11.bin 0x00000001000122bc server_thread + 50 6 libSystem.B.dylib 0x00007fff836554f6 _pthread_start + 331 7 libSystem.B.dylib 0x00007fff836553a9 thread_start + 13 http://lists.apple.com/archives/X11-users/2011/May/msg00045.html Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Adam Jackson <ajax@redhat.com>	Jeremy Huddleston		12 years ago
6328	DIX: Set backgroundState correctly for root window DIX: Set backgroundState correctly for root window When we change the root window's background to None, and we've run with -wr or -br for a forced solid background, make sure we also change the background state to BackgroundPixel, so we don't try to lookup either pScreen->whitePixel or pScreen->blackPixel as a pixmap. Signed-off-by: Marko Macek <Marko.Macek@gmx.net> Reviewed-by: Walter Harms <wharms@bfs.de> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Keith Packard <keithp@keithp.com>	Marko Macek		12 years ago
6327	Version bumped to 1.10.99.901 (1.11 RC1) Version bumped to 1.10.99.901 (1.11 RC1) Signed-off-by: Keith Packard <keithp@keithp.com>	Keith Packard	xorg-server-1.10.99.901	12 years ago
6326	Merge remote-tracking branch 'ajax/xserver-next' Merge remote-tracking branch 'ajax/xserver-next'	Keith Packard		12 years ago

Older »