, argc=4, argv=0x7fffffffeb18, init=, fini=, rtld_fini=, stack_end=0x7fffffffeb08) at ../csu/libc-start.c:291 #6 0x000055555559316a in _start () Fixes: 8e83eacb9e2d ("loader: Remove unused path and name from ModuleDescPtr") Signed-off-by: Michel Dänzer Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer Commit: bb9128fdc86decd6f6e3b0e145011a8c08b1d2b5 https://github.com/XQuartz/xorg-server/commit/bb9128fdc86decd6f6e3b0e145011a8c08b1d2b5 Author: Qiang Yu Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M present/present.c Log Message: ----------- present: disable page flip only when a slave crtc is active This prevents the tearing of moving window in a composite WM desktop when output slave is attached but none of its crtc is really active. Signed-off-by: Qiang Yu Reviewed-by: Michel Dänzer Commit: 7198a6d4e74f684cb383b3e0f70dd2bae405e6e7 https://github.com/XQuartz/xorg-server/commit/7198a6d4e74f684cb383b3e0f70dd2bae405e6e7 Author: Chris Wilson Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M hw/xfree86/ramdac/xf86HWCurs.c Log Message: ----------- xfree86: Take the input lock for xf86RecolorCursor xf86RecolorCursor() may be called directly from XRecolorCursor as well as from xf86ScreenSetCursor(). In the latter case, the input lock is already held, but not for the former and so we need to add a wrapper function that acquires the input lock before performing xf86RecolorCursor() References: https://bugs.freedesktop.org/show_bug.cgi?id=99358 Commit: cfddd919cce4178baba07959e5e862d02e166522 https://github.com/XQuartz/xorg-server/commit/cfddd919cce4178baba07959e5e862d02e166522 Author: Chris Wilson Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M hw/xfree86/ramdac/xf86HWCurs.c Log Message: ----------- xfree86: Take input lock for xf86TransparentCursor Commit: 3eb964e25243056dd998f52d3b00171b71c89189 https://github.com/XQuartz/xorg-server/commit/3eb964e25243056dd998f52d3b00171b71c89189 Author: Chris Wilson Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M hw/xfree86/ramdac/xf86HWCurs.c Log Message: ----------- xfree86: Take input_lock() for xf86ScreenCheckHWCursor Commit: 0702f2e840370be53d129fc5e3c243dac47ee720 https://github.com/XQuartz/xorg-server/commit/0702f2e840370be53d129fc5e3c243dac47ee720 Author: Peter Hutterer Date: 2017-02-08 (Wed, 08 Feb 2017) Changed paths: M hw/xwayland/xwayland-input.c M hw/xwayland/xwayland-output.c Log Message: ----------- xwayland: replace hardcoded function name with __func__ in error msg Signed-off-by: Peter Hutterer Reviewed-by: Pekka Paalanen Reviewed-by: Olivier Fourdan Commit: e50da50118408a195d4d2e1b39817fe7c4447c56 https://github.com/XQuartz/xorg-server/commit/e50da50118408a195d4d2e1b39817fe7c4447c56 Author: Adam Jackson Date: 2017-02-08 (Wed, 08 Feb 2017) Changed paths: M hw/xfree86/dri/xf86dri.c Log Message: ----------- dri1: Remove some dead event code Signed-off-by: Adam Jackson Reviewed-by: Michel Dänzer Commit: 3ef16dfb9830bd6b41ae428f4f213ae0c35c1056 https://github.com/XQuartz/xorg-server/commit/3ef16dfb9830bd6b41ae428f4f213ae0c35c1056 Author: Mihail Konev Date: 2017-02-08 (Wed, 08 Feb 2017) Changed paths: M hw/dmx/Makefile.am Log Message: ----------- dmx: fix linking Reviewed-by: Adam Jackson Commit: c02f6a687c3d6bd0727322b055ee788f8fefa005 https://github.com/XQuartz/xorg-server/commit/c02f6a687c3d6bd0727322b055ee788f8fefa005 Author: Michael Thayer Date: 2017-02-08 (Wed, 08 Feb 2017) Changed paths: M hw/xfree86/modes/xf86Crtc.h M hw/xfree86/modes/xf86Cursors.c M hw/xfree86/ramdac/xf86Cursor.h M hw/xfree86/ramdac/xf86HWCurs.c Log Message: ----------- xfree86: Immediately handle failure to set HW cursor, v5 Based on v4 by Alexandre Courbot There is currently no reliable way to report failure to set a HW cursor. Still such failures can happen if e.g. the MODE_CURSOR DRM ioctl fails (which currently happens at least with modesetting on Tegra for format incompatibility reasons). As failures are currently handled by setting the HW cursor size to (0,0), the fallback to SW cursor will not happen until the next time the cursor changes and xf86CursorSetCursor() is called again. In the meantime, the cursor will be invisible to the user. This patch addresses that by adding _xf86CrtcFuncs::set_cursor_check and _xf86CursorInfoRec::ShowCursorCheck hook variants that return booleans. This allows to propagate errors up to xf86CursorSetCursor(), which can then fall back to using the SW cursor immediately. v5: Updated the patch to apply to current git HEAD, split up into two patches (server and modesetting driver) and adjusted the code slightly to match surrounding code. I also removed the new exported function ShowCursorCheck(), as instead just changing ShowCursor() to return Bool should not affect its current callers. Reviewed-by: Adam Jackson Signed-off-by: Michael Thayer Commit: ecd0a62323f26b333c49bddd7237dd5118482a35 https://github.com/XQuartz/xorg-server/commit/ecd0a62323f26b333c49bddd7237dd5118482a35 Author: Michael Thayer Date: 2017-02-08 (Wed, 08 Feb 2017) Changed paths: M hw/xfree86/drivers/modesetting/drmmode_display.c M hw/xfree86/drivers/modesetting/drmmode_display.h Log Message: ----------- modesetting: Immediately handle failure to set HW cursor, v5 Based on v4 by Alexandre Courbot There is currently no reliable way to report failure to set a HW cursor. Still such failures can happen if e.g. the MODE_CURSOR DRM ioctl fails (which currently happens at least with modesetting on Tegra for format incompatibility reasons). As failures are currently handled by setting the HW cursor size to (0,0), the fallback to SW cursor will not happen until the next time the cursor changes and xf86CursorSetCursor() is called again. In the meantime, the cursor will be invisible to the user. This patch addresses that by adding _xf86CrtcFuncs::set_cursor_check and _xf86CursorInfoRec::ShowCursorCheck hook variants that return booleans. This allows to propagate errors up to xf86CursorSetCursor(), which can then fall back to using the SW cursor immediately. v5: - Removed parts of patch already committed as part of 14c21ea1. - Adjusted code slightly to match surrounding code. - Effectively reverted af916477 which is made unnecessary by this patch. Reviewed-by: Adam Jackson Signed-off-by: Michael Thayer Commit: eb04b20160d706d4e0e67122d0adb1e723c0da92 https://github.com/XQuartz/xorg-server/commit/eb04b20160d706d4e0e67122d0adb1e723c0da92 Author: Michael Thayer Date: 2017-02-08 (Wed, 08 Feb 2017) Changed paths: M hw/xfree86/drivers/modesetting/drmmode_display.c M hw/xfree86/drivers/modesetting/drmmode_display.h Log Message: ----------- modesetting: allow switching from software to hardware cursors (v5). Currently if modesetting ever fails to set a hardware cursor it will switch to using a software cursor and never go back. Change this to only permanently switch to a software cursor if -ENXIO is returned (which means hardware cursors not supported), and to otherwise still try a hardware cursor first every time a new one is set. This is needed because hardware may be able to handle some cursors in hardware and others not, or virtual hardware may be able to handle hardware cursors at some times and not others. Changes since v1, v2 and v3: * take into account the switch to load_cursor_argb_check * keep the permanent software cursor fall-back if -ENXIO is returned * move parts of v3 into separate patches Reviewed-by: Adam Jackson Signed-off-by: Michael Thayer Commit: b5b292896f647c85f03f53b20b2f03c0e94de428 https://github.com/XQuartz/xorg-server/commit/b5b292896f647c85f03f53b20b2f03c0e94de428 Author: Michel Dänzer Date: 2017-02-08 (Wed, 08 Feb 2017) Changed paths: M dix/pixmap.c Log Message: ----------- prime: Sync shared pixmap from root window instead of screen pixmap The screen pixmap doesn't receive updates while there's a Present flip window. Reviewed-by: Alex Deucher Signed-off-by: Michel Dänzer Commit: 542d9f6807ac06b70f564ccab10af69fa21a1221 https://github.com/XQuartz/xorg-server/commit/542d9f6807ac06b70f564ccab10af69fa21a1221 Author: Michel Dänzer Date: 2017-02-08 (Wed, 08 Feb 2017) Changed paths: M present/present.c Log Message: ----------- present: Allow flipping with PRIME slave outputs Works fine now. Reviewed-by: Alex Deucher Signed-off-by: Michel Dänzer Commit: 1c78bec9ca3cd1975a38bf5ebdba7dea65b309ab https://github.com/XQuartz/xorg-server/commit/1c78bec9ca3cd1975a38bf5ebdba7dea65b309ab Author: Svitozar Cherepii Date: 2017-02-08 (Wed, 08 Feb 2017) Changed paths: M hw/xwayland/xwayland-cvt.c Log Message: ----------- xwayland: Add hack for FWXGA resolution #99574 For some applications (like fullscreen games) it matters for XRandr resolution to be correctly set and equal to root window resolution. In XServer there is already hack for this, adapted it for XWayland. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=99574 Signed-off-by: Svitozar Cherepii Tested-by: Svitozar Cherepii Acked-by: Olivier Fourdan Commit: 38696ea56854e055c31bd2730adfc7c39aa115b0 https://github.com/XQuartz/xorg-server/commit/38696ea56854e055c31bd2730adfc7c39aa115b0 Author: Michel Dänzer Date: 2017-02-08 (Wed, 08 Feb 2017) Changed paths: M configure.ac M miext/damage/damage.c Log Message: ----------- damage: Validate source pictures bound to windows before unwrapping The lower layers also do this, but no damage may be reported there, since we unwrap before calling down. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99220 Signed-off-by: Michel Dänzer Reviewed-by: Alex Deucher Commit: afeace27d3818274b75d59375771dc964d2f56bb https://github.com/XQuartz/xorg-server/commit/afeace27d3818274b75d59375771dc964d2f56bb Author: Olivier Fourdan Date: 2017-02-08 (Wed, 08 Feb 2017) Changed paths: M hw/xwayland/xwayland-output.c Log Message: ----------- xwayland: CRTC should support all rotations If the Wayland compositor sets a rotation on the output, Xwayland translates the transformation as an xrandr rotation for the given output. However, if the rotation is not supported by the CRTC, this is not a valid setup and xrandr queries will fail. Pretend we support all rotations and reflections so that the configuration remains a valid xrandr setup. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99663 Signed-off-by: Olivier Fourdan Reviewed-by: Adam Jackson Commit: 058809c43ec578a407cf40d4c3e54a42503e3562 https://github.com/XQuartz/xorg-server/commit/058809c43ec578a407cf40d4c3e54a42503e3562 Author: Olivier Fourdan Date: 2017-02-08 (Wed, 08 Feb 2017) Changed paths: M hw/xwayland/xwayland-output.c Log Message: ----------- xwayland: Apply output rotation for screen size Previously, we would swap the width/height of the Xwayland output based on the output rotation, so that the overall screen size would match the actual rotation of each output. Problem is the RandR's ConstrainCursorHarder() handler will also apply the output rotation, meaning that when the output is rotated, the pointer will be constrained within the wrong dimension. Moreover, XRandR assumes the original output width/height are unchanged when the output is rotated, so by changing the Xwayland output width and height based on rotation, Xwayland causes XRandr to report the wrong output sizes (an output of size 1024x768 rotated left or right should remain 1024x768, not 768x1024). So to avoid this issue and keep things consistent between Wayland and Xwayland outputs, leave the actual width/height unchanged but apply the rotation when computing the screen size. This fixes both the output size being wrong in "xrandr -q" and the pointer being constrained in the wrong dimension with rotated with weston. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99663 Signed-off-by: Olivier Fourdan Reviewed-by: Adam Jackson Commit: 3f9507ed2f7246b2c8cf2bbc430cc99c5f35c92a https://github.com/XQuartz/xorg-server/commit/3f9507ed2f7246b2c8cf2bbc430cc99c5f35c92a Author: Adam Jackson Date: 2017-02-09 (Thu, 09 Feb 2017) Changed paths: M hw/xfree86/common/xf86Module.h Log Message: ----------- xfree86: Bump video ABI to 24.0 c02f6a68 changed the layout of xf86CrtcFuncs. Signed-off-by: Adam Jackson Commit: 4c00609c370dab130b69207cb2684c2b92bd3084 https://github.com/XQuartz/xorg-server/commit/4c00609c370dab130b69207cb2684c2b92bd3084 Author: Alan Coopersmith Date: 2017-02-14 (Tue, 14 Feb 2017) Changed paths: M os/client.c Log Message: ----------- DetermineClientCmd: try using /proc/pid/cmdline on Solaris too Solaris 11.3.5 introduced support for /proc/pid/cmdline, so try it first, and if we can't open it, then fallback to /proc/pid/psinfo as we did before. Reviewed-by: Adam Jackson Signed-off-by: Alan Coopersmith Commit: 3e1a23281dd64ee7457f36208cac77c01846a28f https://github.com/XQuartz/xorg-server/commit/3e1a23281dd64ee7457f36208cac77c01846a28f Author: Adam Jackson Date: 2017-02-16 (Thu, 16 Feb 2017) Changed paths: M hw/xfree86/common/xf86str.h Log Message: ----------- xfree86: Fix a comment about ScrnInfoRec We don't actually need (or intend) to keep this struct the same across revisions. Reviewed-by: Alex Deucher Reviewed-by: Aaron Plattner Acked-by: Keith Packard Signed-off-by: Adam Jackson Commit: 5a945f54e738f6e9c5a489febdd8b87cd8a41210 https://github.com/XQuartz/xorg-server/commit/5a945f54e738f6e9c5a489febdd8b87cd8a41210 Author: Adam Jackson Date: 2017-02-16 (Thu, 16 Feb 2017) Changed paths: M hw/xfree86/common/xf86Mode.c M hw/xfree86/common/xf86str.h M hw/xfree86/doc/ddxDesign.xml Log Message: ----------- xfree86: Remove max[HV]Value from ScrnInfoRec Only mach64 and rendition actually use this feature. Everyone else just checks it in their ValidMode hook, they can too. Reviewed-by: Alex Deucher Reviewed-by: Aaron Plattner Acked-by: Keith Packard Signed-off-by: Adam Jackson Commit: 76ef102be3b47d23ebfaaaa04fb5cfc0511d43f1 https://github.com/XQuartz/xorg-server/commit/76ef102be3b47d23ebfaaaa04fb5cfc0511d43f1 Author: Adam Jackson Date: 2017-02-16 (Thu, 16 Feb 2017) Changed paths: M hw/xfree86/common/xf86Mode.c M hw/xfree86/common/xf86str.h M hw/xfree86/doc/ddxDesign.xml Log Message: ----------- xfree86: Drop virtualFrom from ScrnInfoRec Seriously not worth the effort of tracking this, especially now that competent drivers don't have a limit. The sis driver does inspect this member, but hilariously does so only so it can print the same information as the core does. Reviewed-by: Alex Deucher Reviewed-by: Aaron Plattner Acked-by: Keith Packard Signed-off-by: Adam Jackson Commit: 0b6f2806029493afa246b4472ee88fc173976c5a https://github.com/XQuartz/xorg-server/commit/0b6f2806029493afa246b4472ee88fc173976c5a Author: Adam Jackson Date: 2017-02-16 (Thu, 16 Feb 2017) Changed paths: M hw/xfree86/common/xf86Config.c M hw/xfree86/common/xf86Configure.c M hw/xfree86/common/xf86str.h M hw/xfree86/doc/ddxDesign.xml M hw/xfree86/man/xorg.conf.man M hw/xfree86/parser/Device.c M hw/xfree86/parser/xf86Parser.h Log Message: ----------- xfree86: Remove Option "BiosBase" (v2) Just no. The ddxDesign chunk removes the whole para about xf86FixPciResource, since it turns out that function doesn't exist at all anymore. The only drivers that reference this at all are i128 and mga, and even then only in the non-pciaccess path. v2: - Update commentary about i128/mga - Don't remove the BiosBase keyword from the config parser since that would turn a no-op into a fatal error (Aaron Plattner) Reviewed-by: Alex Deucher Reviewed-by: Aaron Plattner Acked-by: Keith Packard Signed-off-by: Adam Jackson Commit: 4dcf68e41857cdf78387a6232160cba5cb467fb0 https://github.com/XQuartz/xorg-server/commit/4dcf68e41857cdf78387a6232160cba5cb467fb0 Author: Adam Jackson Date: 2017-02-16 (Thu, 16 Feb 2017) Changed paths: M hw/xfree86/common/xf86str.h M hw/xfree86/doc/ddxDesign.xml Log Message: ----------- xfree86: Remove memClk from ScrnInfoRec Never set by the core, not used in any modern driver. Reviewed-by: Alex Deucher Reviewed-by: Aaron Plattner Acked-by: Keith Packard Signed-off-by: Adam Jackson Commit: 47db92473f7da2b7d6775ff681ec747009f8cf3f https://github.com/XQuartz/xorg-server/commit/47db92473f7da2b7d6775ff681ec747009f8cf3f Author: Adam Jackson Date: 2017-02-16 (Thu, 16 Feb 2017) Changed paths: M hw/xfree86/common/xf86str.h Log Message: ----------- xfree86: Remove unused chipID/Rev from ScrnInfoRec Reviewed-by: Alex Deucher Reviewed-by: Aaron Plattner Acked-by: Keith Packard Signed-off-by: Adam Jackson Commit: 5d29b493666f728eccd8dd91992ea020bd4be9f9 https://github.com/XQuartz/xorg-server/commit/5d29b493666f728eccd8dd91992ea020bd4be9f9 Author: Adam Jackson Date: 2017-02-16 (Thu, 16 Feb 2017) Changed paths: M hw/xfree86/common/xf86str.h Log Message: ----------- xfree86: Reorganize the reserved ScrnInfoRec slots First, move them to the end of the struct, for marginally better cache locality for the struct members that actually have meaning; move the existing slots at the end of the struct up near some others with similar meanings. Second, only keep four slots each of integer, data pointer, and function pointer; we've rarely used this escape hatch so this is still plenty. Reviewed-by: Alex Deucher Reviewed-by: Aaron Plattner Acked-by: Keith Packard Signed-off-by: Adam Jackson Commit: 371ff0c969a38a0013688391bbd7375bc7b6f933 https://github.com/XQuartz/xorg-server/commit/371ff0c969a38a0013688391bbd7375bc7b6f933 Author: Olivier Fourdan Date: 2017-02-16 (Thu, 16 Feb 2017) Changed paths: M configure.ac Log Message: ----------- xwayland: bump wayland-protocols version to 1.7 Xwayland support for pointer locking in confinement requires wayland-protocols version 1.7 or later. Update the required version in configure.ac to match the minimal required version of wayland-protocols. Reviewed-by: Adam Jackson Signed-off-by: Olivier Fourdan Commit: a6566f9e4dbf9ea9568a14e22cb5d004e10dbd4d https://github.com/XQuartz/xorg-server/commit/a6566f9e4dbf9ea9568a14e22cb5d004e10dbd4d Author: Michel Dänzer Date: 2017-02-16 (Thu, 16 Feb 2017) Changed paths: M dix/pixmap.c Log Message: ----------- prime: Clear PixmapDirtyUpdateRec::damage when it's destroyed The root window, and by extension any damage records referencing it, may be destroyed before shared pixmaps referencing it, which resulted in use-after-free / double-free in PixmapStopDirtyTracking. Fixes: b5b292896f64 ("prime: Sync shared pixmap from root window instead of screen pixmap") Reviewed-by: Adam Jackson Signed-off-by: Michel Dänzer Commit: 790c1c0b10968776440a962e1fc6d1d3157b1559 https://github.com/XQuartz/xorg-server/commit/790c1c0b10968776440a962e1fc6d1d3157b1559 Author: Adam Jackson Date: 2017-02-16 (Thu, 16 Feb 2017) Changed paths: M fb/wfbrename.h Log Message: ----------- wfb: Add missing rename for fbGlyphs Reviewed-by: Alex Deucher Signed-off-by: Adam Jackson Commit: 706e6d9cd074da606016ed4ecff51e9c2a822087 https://github.com/XQuartz/xorg-server/commit/706e6d9cd074da606016ed4ecff51e9c2a822087 Author: Adam Jackson Date: 2017-02-16 (Thu, 16 Feb 2017) Changed paths: M fb/fb.h Log Message: ----------- wfb: Hide init function decls behind FB_ACCESS_WRAPPER Reviewed-by: Alex Deucher Signed-off-by: Adam Jackson Commit: 4c7d229582a97e07014091909745ac7dc4d5e93e https://github.com/XQuartz/xorg-server/commit/4c7d229582a97e07014091909745ac7dc4d5e93e Author: Adam Jackson Date: 2017-02-16 (Thu, 16 Feb 2017) Changed paths: M fb/fb.h Log Message: ----------- fb: Remove unused fbGetFreeCompClip macro Reviewed-by: Alex Deucher Signed-off-by: Adam Jackson Commit: e161853f380a0b176c81284024066cb2776136c3 https://github.com/XQuartz/xorg-server/commit/e161853f380a0b176c81284024066cb2776136c3 Author: Adam Jackson Date: 2017-02-16 (Thu, 16 Feb 2017) Changed paths: M fb/fb.h M fb/wfbrename.h Log Message: ----------- fb: Remove stray references to fbHasVisualTypes Removed in 84e8de12. Reviewed-by: Alex Deucher Signed-off-by: Adam Jackson Commit: 8b170c4447868c8d4656cf2143f009db20885f3a https://github.com/XQuartz/xorg-server/commit/8b170c4447868c8d4656cf2143f009db20885f3a Author: Adam Jackson Date: 2017-02-16 (Thu, 16 Feb 2017) Changed paths: M mi/migc.h Log Message: ----------- mi: Add include guards to migc.h Reviewed-by: Alex Deucher Signed-off-by: Adam Jackson Commit: 23d85c54421ebdd12460566918fcb7f309d2ee30 https://github.com/XQuartz/xorg-server/commit/23d85c54421ebdd12460566918fcb7f309d2ee30 Author: Olivier Fourdan Date: 2017-02-20 (Mon, 20 Feb 2017) Changed paths: M os/io.c Log Message: ----------- os: remove unused define MAX_TIMES_PER Remove leftover from commit e10ba9e, MAX_TIMES_PER is not used anymore. Signed-off-by: Olivier Fourdan Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer Commit: dcb63deb1b6337781943a7bea5bb2b04c6d76b55 https://github.com/XQuartz/xorg-server/commit/dcb63deb1b6337781943a7bea5bb2b04c6d76b55 Author: Chris Wilson Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M os/inputthread.c Log Message: ----------- inputthread: Initialise inputThreadInfo->changed before use ==8734== Thread 2 InputThread: ==8734== Conditional jump or move depends on uninitialised value(s) ==8734== at 0x2FDB05: InputThreadDoWork (inputthread.c:333) ==8734== by 0x6924423: start_thread (pthread_create.c:333) ==8734== by 0x6C229BE: clone (clone.S:105) Signed-off-by: Chris Wilson Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer Commit: acdb5bf2de57c0080d2a6e730c788a0a428e13dc https://github.com/XQuartz/xorg-server/commit/acdb5bf2de57c0080d2a6e730c788a0a428e13dc Author: Chris Wilson Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M os/busfault.c Log Message: ----------- os: Fix iteration over busfaults Fixes a regression from commit 41da295eb50fa08eaacd0ecde99f43a716fcb41a Author: Keith Packard Date: Sun Nov 3 13:12:40 2013 -0800 Trap SIGBUS to handle truncated shared memory segments that causes the SIGBUS handler to fail to chain up correctly and corrupts nearby memory instead. Signed-off-by: Chris Wilson Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer Commit: d8161aeb50891ae10c5656487ce8f982deed5f9f https://github.com/XQuartz/xorg-server/commit/d8161aeb50891ae10c5656487ce8f982deed5f9f Author: Dr.-Ing. Dieter Jurzitza Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M glamor/glamor_dash.c Log Message: ----------- glamor: Fix missing declaration in dash vertex shader Fixes a GLSL compilation error: Failed to compile VS: 0:13(43): error: `pos' undeclared 0:13(14): error: operands to arithmetic operators must be numeric 0:13(13): error: operands to arithmetic operators must be numeric Tested-by: Stefan Dirsch Reviewed-by: Adam Jackson Commit: fde5cd78488f3370c92397868ca78929296f7ad1 https://github.com/XQuartz/xorg-server/commit/fde5cd78488f3370c92397868ca78929296f7ad1 Author: Mihail Konev Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M test/Makefile.am M test/tests.c Log Message: ----------- tests: Fix guards for ld -wrap Fixes XQuartz build. Regressed-in: 23f6dbc96e47be6cbeed78cc9ef303987c3e29a9 Reviewed-by: Adam Jackson Signed-off-by: Mihail Konev Commit: 50bcea8be337ea983e464f2b5b8b2dc6d1024532 https://github.com/XQuartz/xorg-server/commit/50bcea8be337ea983e464f2b5b8b2dc6d1024532 Author: Adam Jackson Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M dix/property.c Log Message: ----------- dix: Pass the whole property into deliverPropertyNotifyEvent Instead of just the atom. No functional change. Signed-off-by: Adam Jackson Signed-off-by: Pekka Paalanen Commit: 8e3f9ce6c06e7605832c55dfd180396f66ec8b66 https://github.com/XQuartz/xorg-server/commit/8e3f9ce6c06e7605832c55dfd180396f66ec8b66 Author: Adam Jackson Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M dix/property.c M include/property.h Log Message: ----------- dix: Add a callback chain for window property state change This will be used by in-server features that need to react to property changes. The first one will be _XWAYLAND_ALLOW_COMMITS. Signed-off-by: Adam Jackson [Pekka: add commit message body] Signed-off-by: Pekka Paalanen Commit: f7b8560f23ac5582e2f97dc9f6de32a42e61e520 https://github.com/XQuartz/xorg-server/commit/f7b8560f23ac5582e2f97dc9f6de32a42e61e520 Author: Pekka Paalanen Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M hw/xwayland/xwayland.c Log Message: ----------- xwayland: refactor into xwl_window_post_damage() Refactor xwl_screen_post_damage() and split the window specific code into a new function xwl_window_post_damage(). This is a pure refactoring, there are no behavioral changes. An assert is added to xwl_window_post_damage() to ensure frame callbacks are not leaked if a future patch changes the call. Signed-off-by: Pekka Paalanen Reviewed-by: Olivier Fourdan Commit: a6308cea602f688ac653e3466cd57767e02093a9 https://github.com/XQuartz/xorg-server/commit/a6308cea602f688ac653e3466cd57767e02093a9 Author: Pekka Paalanen Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M hw/xwayland/xwayland.c Log Message: ----------- xwayland: fix 'buffer' may be used uninitialized warning Fix the following warning due to --disable-glamor: CC Xwayland-xwayland.o In file included from /home/pq/local/include/wayland-client.h:40:0, from xwayland.h:35, from xwayland.c:26: xwayland.c: In function ‘block_handler’: /home/pq/local/include/wayland-client-protocol.h:3446:2: warning: ‘buffer’ may be used uninitialized in this function [-Wmaybe-uninitialized] wl_proxy_marshal((struct wl_proxy *) wl_surface, ^ xwayland.c:466:23: note: ‘buffer’ was declared here struct wl_buffer *buffer; ^ Signed-off-by: Pekka Paalanen Reviewed-by: Olivier Fourdan Commit: 9f4d308cdad957a354912f17febe5bcad7f44812 https://github.com/XQuartz/xorg-server/commit/9f4d308cdad957a354912f17febe5bcad7f44812 Author: Pekka Paalanen Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M hw/xwayland/xwayland.c M hw/xwayland/xwayland.h Log Message: ----------- xwayland: use _XWAYLAND_ALLOW_COMMITS property The X11 window manager (XWM) of a Wayland compositor can use the _XWAYLAND_ALLOW_COMMITS property to control when Xwayland sends wl_surface.commit requests. If the property is not set, the behaviour remains what it was. XWM uses the property to inhibit commits until the window is ready to be shown. This gives XWM time to set up the window decorations and internal state before Xwayland does the first commit. XWM can use this to ensure the first commit carries fully drawn decorations and the window management state is correct when the window becomes visible. Setting the property to zero inhibits further commits, and setting it to non-zero allows commits. Deleting the property allows commits. When the property is changed from zero to non-zero, there will be a commit on next block_handler() call provided that some damage has been recorded. Without this patch (i.e. with the old behaviour) Xwayland can and will commit the surface very soon as the application window has been realized and drawn into. This races with XWM and may cause visible glitches. v3: - introduced a simple setter for xwl_window::allow_commits - split xwl_window_property_allow_commits() out of xwl_property_callback() - check MakeAtom(_XWAYLAND_ALLOW_COMMITS) v2: - use PropertyStateCallback instead of XACE, based on the patch "xwayland: Track per-window support for netwm frame sync" by Adam Jackson - check property type is XA_CARDINAL - drop a useless memcpy() Weston Bug: https://phabricator.freedesktop.org/T7622 Reviewed-by: Adam Jackson Signed-off-by: Pekka Paalanen Commit: 7d7788e0f2fbbf5d05cb918df11a5e1b7e047e48 https://github.com/XQuartz/xorg-server/commit/7d7788e0f2fbbf5d05cb918df11a5e1b7e047e48 Author: Olivier Fourdan Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M configure.ac Log Message: ----------- Revert "xwayland: bump wayland-protocols version to 1.7" This reverts commit 371ff0c969a38a0013688391bbd7375bc7b6f933. Reviewed-by: Adam Jackson Commit: 1b12249fd6d4d3b566043d556503f3f625b9b4ba https://github.com/XQuartz/xorg-server/commit/1b12249fd6d4d3b566043d556503f3f625b9b4ba Author: Peter Hutterer Date: 2017-02-27 (Mon, 27 Feb 2017) Changed paths: M include/input.h M os/inputthread.c M os/io.c Log Message: ----------- os: log a bug whenever WriteToClient is called from the input thread The input thread should generate events, not send them. Make it easier to find the instances where it's doing so. Signed-off-by: Peter Hutterer Tested-by: Olivier Fourdan Reviewed-by: Olivier Fourdan Commit: d7ac755f0b618eb1259d93c8a16ec6e39a18627c https://github.com/XQuartz/xorg-server/commit/d7ac755f0b618eb1259d93c8a16ec6e39a18627c Author: Matthieu Herrb Date: 2017-02-28 (Tue, 28 Feb 2017) Changed paths: M configure.ac M include/dix-config.h.in M include/os.h M os/mitauth.c A os/timingsafe_memcmp.c Log Message: ----------- Use timingsafe_memcmp() to compare MIT-MAGIC-COOKIES CVE-2017-2624 Provide the function definition for systems that don't have it. Signed-off-by: Matthieu Herrb Reviewed-by: Alan Coopersmith Commit: 957e8db38f27932d353e86e9aa69cf16778b18f1 https://github.com/XQuartz/xorg-server/commit/957e8db38f27932d353e86e9aa69cf16778b18f1 Author: Matthieu Herrb Date: 2017-02-28 (Tue, 28 Feb 2017) Changed paths: M configure.ac M include/dix-config.h.in M os/auth.c Log Message: ----------- Use arc4random_buf(3) if available to generate cookies. Reviewed-by: Adam Jackson Signed-off-by: Matthieu Herrb Commit: 2855f759b1e7bf7f5e57cac36c1f0d0e5ac1a683 https://github.com/XQuartz/xorg-server/commit/2855f759b1e7bf7f5e57cac36c1f0d0e5ac1a683 Author: Matthieu Herrb Date: 2017-02-28 (Tue, 28 Feb 2017) Changed paths: M os/auth.c M os/mitauth.c M os/osdep.h M os/rpcauth.c M os/xdmauth.c Log Message: ----------- auth: remove AuthToIDFunc and associated functions. Not used anymore. And the current code for MitToId has a use-after-free() issue. [Also remove the actual implementations - ajax] Signed-off-by: Matthieu Herrb Reviewed-by: Alan Coopersmith Commit: c9cbdada755f1d00d164bef7833f1aef139ffeb0 https://github.com/XQuartz/xorg-server/commit/c9cbdada755f1d00d164bef7833f1aef139ffeb0 Author: Adam Jackson Date: 2017-02-28 (Tue, 28 Feb 2017) Changed paths: M hw/vfb/InitOutput.c Log Message: ----------- vfb: Bump default depth to 24 Signed-off-by: Adam Jackson Acked-by: Keith Packard Reviewed-by: Eric Anholt Commit: 8c9909a99292b2fb4a86de694bb0029f61e35662 https://github.com/XQuartz/xorg-server/commit/8c9909a99292b2fb4a86de694bb0029f61e35662 Author: Olivier Fourdan Date: 2017-03-01 (Wed, 01 Mar 2017) Changed paths: M hw/xwayland/xwayland-input.c Log Message: ----------- xwayland: Make sure we have a focus window During the InitInput() phase, the wayland events get dequeued so we can possibly end up calling dispatch_pointer_motion_event(). If this occurs before xwl_seat->focus_window is set, it leads to a NULL pointer derefence and a segfault. Check for xwl_seat->focus_window in both pointer_handle_frame() and relative_pointer_handle_relative_motion() prior to calling dispatch_pointer_motion_event() like it's done in pointer_handle_motion(). Bugzilla: https://bugzilla.redhat.com/1410804 Signed-off-by: Olivier Fourdan Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer Commit: dc7ceda90fdedb2212f105095fe8d449bfdb0eb4 https://github.com/XQuartz/xorg-server/commit/dc7ceda90fdedb2212f105095fe8d449bfdb0eb4 Author: Adam Jackson Date: 2017-03-01 (Wed, 01 Mar 2017) Changed paths: M Xext/dpms.c M Xext/geext.c M Xext/panoramiXSwap.c M Xext/saver.c M Xext/security.c M Xext/shape.c M Xext/shm.c M Xext/sync.c M Xext/vidmode.c M Xext/xcmisc.c M Xext/xf86bigfont.c M Xext/xres.c M Xext/xselinux_ext.c M Xext/xtest.c M Xext/xvdisp.c M Xext/xvmain.c M Xext/xvmc.c M Xi/allowev.c M Xi/chgdctl.c M Xi/chgfctl.c M Xi/chgkbd.c M Xi/chgkmap.c M Xi/chgprop.c M Xi/chgptr.c M Xi/closedev.c M Xi/devbell.c M Xi/extinit.c M Xi/getbmap.c M Xi/getdctl.c M Xi/getfctl.c M Xi/getfocus.c M Xi/getkmap.c M Xi/getmmap.c M Xi/getprop.c M Xi/getselev.c M Xi/getvers.c M Xi/grabdev.c M Xi/grabdevb.c M Xi/grabdevk.c M Xi/gtmotion.c M Xi/listdev.c M Xi/opendev.c M Xi/queryst.c M Xi/selectev.c M Xi/sendexev.c M Xi/setbmap.c M Xi/setdval.c M Xi/setfocus.c M Xi/setmmap.c M Xi/setmode.c M Xi/ungrdev.c M Xi/ungrdevb.c M Xi/ungrdevk.c M Xi/xiallowev.c M Xi/xibarriers.c M Xi/xichangecursor.c M Xi/xichangehierarchy.c M Xi/xigetclientpointer.c M Xi/xigrabdev.c M Xi/xipassivegrab.c M Xi/xiproperty.c M Xi/xiquerydevice.c M Xi/xiquerypointer.c M Xi/xiqueryversion.c M Xi/xiselectev.c M Xi/xisetclientpointer.c M Xi/xisetdevfocus.c M Xi/xiwarppointer.c M composite/compext.c M damageext/damageext.c M dbe/dbe.c M dix/swaprep.c M dix/swapreq.c M dri3/dri3_request.c M hw/dmx/dmx.c M hw/xfree86/common/xf86DGA.c M hw/xfree86/dri/xf86dri.c M hw/xfree86/dri2/dri2ext.c M present/present_request.c M randr/randr.c M randr/rrsdispatch.c M randr/rrxinerama.c M record/record.c M render/render.c M xfixes/cursor.c M xfixes/region.c M xfixes/saveset.c M xfixes/select.c M xfixes/xfixes.c M xkb/xkbSwap.c Log Message: ----------- dispatch: Mark swapped dispatch as _X_COLD This touches everything that ends up in the Xorg binary; the big missing part is GLX since that's all generated code. Cuts about 14k from the binary on amd64. Signed-off-by: Adam Jackson Reviewed-by: Eric Anholt Commit: 386fbbe410a1168b724136e54cf3bd37fb64ad4e https://github.com/XQuartz/xorg-server/commit/386fbbe410a1168b724136e54cf3bd37fb64ad4e Author: Matthieu Herrb Date: 2017-03-01 (Wed, 01 Mar 2017) Changed paths: M configure.ac M os/auth.c Log Message: ----------- Brown bag commit to fix 957e8d (arc4random_buf() support) - typo in #ifdef check - also need to add AC_CHECK_FUNCS([arc4random_buf]) Reported-by Eric Engestrom. Thanks Reviewed-by: Adam Jackson Signed-off-by: Matthieu Herrb Commit: 3dad57b121fdf001e75fffa7e3007a9a0a154f67 https://github.com/XQuartz/xorg-server/commit/3dad57b121fdf001e75fffa7e3007a9a0a154f67 Author: Adam Jackson Date: 2017-03-01 (Wed, 01 Mar 2017) Changed paths: M hw/xfree86/sdksyms.sh Log Message: ----------- sdksyms: Tighten up the symbols we add to the magic table The code as written would match anything declared extern. _X_EXPORT is what we really mean here. That's a macro, so check for what it expands to and skip if not found. Signed-off-by: Adam Jackson Reviewed-by: Peter Hutterer Commit: 35fbcb3f9987758bc26a87d5d7c033f4367cbd39 https://github.com/XQuartz/xorg-server/commit/35fbcb3f9987758bc26a87d5d7c033f4367cbd39 Author: Adam Jackson Date: 2017-03-01 (Wed, 01 Mar 2017) Changed paths: M configure.ac M hw/kdrive/Makefile.am R hw/kdrive/fake/.gitignore R hw/kdrive/fake/Makefile.am R hw/kdrive/fake/fake.c R hw/kdrive/fake/fake.h R hw/kdrive/fake/fakeinit.c R hw/kdrive/fake/kbd.c R hw/kdrive/fake/mouse.c R hw/kdrive/fake/os.c Log Message: ----------- xfake: Remove We already have Xvfb for a dummy DDX. Signed-off-by: Adam Jackson Acked-by: Alex Deucher Commit: feed7e3f982a7ac14f6fe85ed2e1ec4a83700841 https://github.com/XQuartz/xorg-server/commit/feed7e3f982a7ac14f6fe85ed2e1ec4a83700841 Author: Adam Jackson Date: 2017-03-01 (Wed, 01 Mar 2017) Changed paths: M configure.ac M hw/kdrive/Makefile.am R hw/kdrive/fbdev/.gitignore R hw/kdrive/fbdev/Makefile.am R hw/kdrive/fbdev/Xfbdev.man R hw/kdrive/fbdev/fbdev.c R hw/kdrive/fbdev/fbdev.h R hw/kdrive/fbdev/fbinit.c Log Message: ----------- xfbdev: Remove With the shadow framebuffer overallocation bug fixed (ref below), Xorg + fbdev has tens to hundreds of kilobytes more baseline memory usage than Xfbdev. That's not nothing, but it's little enough that we should focus our efforts on the server that actually gets development attention. https://cgit.freedesktop.org/xorg/driver/xf86-video-fbdev/commit/?id=2c5eba8 Signed-off-by: Adam Jackson Acked-by: Alex Deucher Commit: 27819950e4158326e0f83a30f2e8968b932625ef https://github.com/XQuartz/xorg-server/commit/27819950e4158326e0f83a30f2e8968b932625ef Author: Adam Jackson Date: 2017-03-01 (Wed, 01 Mar 2017) Changed paths: M configure.ac M hw/kdrive/Makefile.am R hw/kdrive/linux/Makefile.am R hw/kdrive/linux/evdev.c R hw/kdrive/linux/linux.c R hw/kdrive/linux/tslib.c Log Message: ----------- kdrive: Remove now-unused linux backend With Xfbdev gone this has no consumers. Signed-off-by: Adam Jackson Acked-by: Alex Deucher Commit: fe5c340046c8cf755b92763a49b2dc475e856a76 https://github.com/XQuartz/xorg-server/commit/fe5c340046c8cf755b92763a49b2dc475e856a76 Author: Olivier Fourdan Date: 2017-03-02 (Thu, 02 Mar 2017) Changed paths: M hw/xwayland/xwayland-input.c Log Message: ----------- xwayland: do not set checkRepeat on master kbd keyboard_check_repeat() fetches the XWayland seat from the dev->public.devicePrivate do do its thing. If a key event is sent programmatically through Xtest, our device is the virtual core keyboard and that has a dev->public.devicePrivate of NULL, leading to a segfault in keyboard_check_repeat(). This is the case with "antimicro" which sends key events based on the joystick buttons. Don't set the checkRepeat handler on the VCK since it cannot possibly work anyway and it has no effect on the actual checkRepeat intended functionality. Bugzilla: https://bugzilla.redhat.com/1416244 Signed-off-by: Olivier Fourdan Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer Commit: 9426c5500b72e1fe004fef4c3b259023c4ec49f7 https://github.com/XQuartz/xorg-server/commit/9426c5500b72e1fe004fef4c3b259023c4ec49f7 Author: Adam Jackson Date: 2017-03-02 (Thu, 02 Mar 2017) Changed paths: M mi/miarc.c Log Message: ----------- miarc: Style cleanup for miWideArc Outdent, normalize comment formatting, and use 'goto out' idiom for error paths. No functional change. Reviewed-by: Keith Packard Signed-off-by: Adam Jackson Commit: 849c825855b82caf44d25edb8155bc9f17869256 https://github.com/XQuartz/xorg-server/commit/849c825855b82caf44d25edb8155bc9f17869256 Author: Adam Jackson Date: 2017-03-02 (Thu, 02 Mar 2017) Changed paths: M mi/miarc.c Log Message: ----------- miarc: Make the caller free the arc span data drawArc does some fairly expensive computation, but it's only sensitive to arc width/height. Thread the span data up through the call chain so it's at least possible for the caller to cache things. Reviewed-by: Keith Packard Signed-off-by: Adam Jackson Commit: 0d7f05ed99b71a4641415c9f26e245c3bb24a9a0 https://github.com/XQuartz/xorg-server/commit/0d7f05ed99b71a4641415c9f26e245c3bb24a9a0 Author: Adam Jackson Date: 2017-03-02 (Thu, 02 Mar 2017) Changed paths: M mi/miarc.c Log Message: ----------- miarc: "Cache" arc span data for dashed arcs This avoids recomputing the span data for every dash. x11perf thinks this is a pretty modest speedup: 832919.4 840471.1 ( 1.009) 100-pixel dashed ellipse 672353.1 680652.2 ( 1.012) 100-pixel double-dashed ellipse 13748.9 24287.9 ( 1.767) 100-pixel wide dashed ellipse 9236.3 21298.2 ( 2.306) 100-pixel wide double-dashed ellipse But part of the reason it's so modest there is that the arcs are relatively small (100 pixel diameter at line width 10, so ~6000 pixels) and the dashes relatively large (30 on 20 off so ~6 dashes per quadrant). With larger arcs and finer dashes this is much more impressive. A fairly trivial testcase of a single 15000x13000 arc with the default {2, 2} dash pattern drops from ~3500 milliseconds to 10 milliseconds. Reviewed-by: Keith Packard Signed-off-by: Adam Jackson Commit: 5c44169caed811e59a65ba346de1cadb46d266ec https://github.com/XQuartz/xorg-server/commit/5c44169caed811e59a65ba346de1cadb46d266ec Author: Adam Jackson Date: 2017-03-02 (Thu, 02 Mar 2017) Changed paths: M os/timingsafe_memcmp.c Log Message: ----------- os: Squash missing declaration warning for timingsafe_memcmp timingsafe_memcmp.c:21:1: warning: no previous prototype for ‘timingsafe_memcmp’ [-Wmissing-prototypes] timingsafe_memcmp(const void *b1, const void *b2, size_t len) Signed-off-by: Adam Jackson Commit: 64ca14b85e45b13628396f21d1903e311f92a9e1 https://github.com/XQuartz/xorg-server/commit/64ca14b85e45b13628396f21d1903e311f92a9e1 Author: Olivier Fourdan Date: 2017-03-06 (Mon, 06 Mar 2017) Changed paths: M hw/xwayland/xwayland-glamor.c Log Message: ----------- xwayland: make sure client is not gone in sync callback in XWayland, dri3_send_open_reply() is called from a sync callback, so there is a possibility that the client might be gone when we get to the callback eventually, which leads to a crash in _XSERVTransSendFd() from WriteFdToClient() . Check if clientGone has been set in the sync callback handler to avoid this. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99149 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100040 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1416553 Reviewed-by: Adam Jackson Signed-off-by: Olivier Fourdan Tested-by: Mark B Commit: d4b7e0eaa4b2e97ce1dec653a2ae7d9621fe1431 https://github.com/XQuartz/xorg-server/commit/d4b7e0eaa4b2e97ce1dec653a2ae7d9621fe1431 Author: Olivier Fourdan Date: 2017-03-07 (Tue, 07 Mar 2017) Changed paths: M hw/xwayland/xwayland-cursor.c Log Message: ----------- xwayland: clear cursor frame callback After an X cursor is unrealized, the seat's corresponding x_cursor is cleared, but if a frame callback was pending at the time, it will remain and thus prevent any further cursor update, leaving the window with no cursor. Make sure to destroy the frame callback, if any, when that occurs, so that next time a cursor needs to be set, it won't be ignored for a frame callback that will never be triggered. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1389327 Signed-off-by: Olivier Fourdan Reviewed-by: Pekka Paalanen Reviewed-by: Rui Matos Commit: 9232835bd16b6948442f7a4588fb9376782cb814 https://github.com/XQuartz/xorg-server/commit/9232835bd16b6948442f7a4588fb9376782cb814 Author: Qiang Yu Date: 2017-03-07 (Tue, 07 Mar 2017) Changed paths: M configure.ac M glamor/glamor_egl.c M include/dix-config.h.in Log Message: ----------- glamor: use drmGetDeviceNameFromFD2 when available This is for glamor can support fd from DRM render node which is useful for a render only DDX. Reviewed-by: Adam Jackson Signed-off-by: Qiang Yu Commit: 669eb0a65430678fe97de9405e4e42dcb4417ed2 https://github.com/XQuartz/xorg-server/commit/669eb0a65430678fe97de9405e4e42dcb4417ed2 Author: Jon Turney Date: 2017-03-09 (Thu, 09 Mar 2017) Changed paths: M test/xi2/protocol-common.h M test/xi2/protocol-xiselectevents.c Log Message: ----------- test: Use correct signature for XISetEventMask wrapper This looks like it's always been wrong, but didn't matter before the single test binary changes as the wrapper was only in place for tests which didn't care about it's effects, so didn't forward to the real implementation. (see the changes to protocol-xiselectevents.c in 773fc07e) This fixes the protocol_xigetselectedevents_test for me. I'm a bit surprised that passes for anyone at the moment. Signed-off-by: Jon Turney Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer Commit: 937527f9798d573ec82c2c508821899c229c018f https://github.com/XQuartz/xorg-server/commit/937527f9798d573ec82c2c508821899c229c018f Author: Olivier Fourdan Date: 2017-03-09 (Thu, 09 Mar 2017) Changed paths: M hw/xwayland/xwayland-glamor.c Log Message: ----------- xwayland: Monitor client states to destroy callbacks Client resources can survive the client itself, in which case we may end up in our sync callback trying to access client's data after it's been freed/reclaimed. Add a ClientStateCallback handler to monitor the client state changes and clear the sync callback set up by the glamor drm code if any. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=100040 Tested-by: Mark B Signed-off-by: Olivier Fourdan Reviewed-by: Michel Dänzer Commit: 0c1574d9882a91b2c1a046bf4ac5a9b138a37965 https://github.com/XQuartz/xorg-server/commit/0c1574d9882a91b2c1a046bf4ac5a9b138a37965 Author: Michel Dänzer Date: 2017-03-09 (Thu, 09 Mar 2017) Changed paths: M glamor/glamor_dash.c Log Message: ----------- glamor: Fix typo: "vec2_pos" -> "vec2 pos" Fixes crash when trying to use dashed lines: Failed to compile VS: 0:8(2): error: `vec2_pos' undeclared Trivial. Fixes: d8161aeb5089 ("glamor: Fix missing declaration in dash vertex shader") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99943 Commit: ac15d4cecca377c5c31ab852c39bbd554ca48fe2 https://github.com/XQuartz/xorg-server/commit/ac15d4cecca377c5c31ab852c39bbd554ca48fe2 Author: Tobias Stoeckmann Date: 2017-03-13 (Mon, 13 Mar 2017) Changed paths: M render/render.c Log Message: ----------- render: Fix out of boundary heap access ProcRenderCreateRadialGradient and ProcRenderCreateConicalGradient must be protected against an integer overflow during length check. This is already included in ProcRenderCreateLinearGradient since the fix for CVE-2008-2362. This can only be successfully exploited on a 32 bit system for an out of boundary read later on. Validated by using ASAN. Reviewed-by: Adam Jackson Commit: bca221609004aecbcc8928382ad29ce319d2eb6f https://github.com/XQuartz/xorg-server/commit/bca221609004aecbcc8928382ad29ce319d2eb6f Author: Jon TURNEY Date: 2017-03-14 (Tue, 14 Mar 2017) Changed paths: M hw/xfree86/sdksyms.sh Log Message: ----------- xfree86: work around a sdksyms problem with gcc5 on Cygwin The linemarkers in the preprocessor output from gcc5 on Cygwin have canonicalized paths to included files (e.g. xserver/build/../include/misc.h is canonicalized to xserver/build/include/misc.h). (see gcc svn rev 210264, which causes the transformation performed by -fcanonical-system-headers to be applied to all include pathnames) These canonicalized paths won't match $topdir, so sdksyms doesn't look at the contents of those headers for sdk exported symbols. Workaround this by canonicalizing all the paths we consider, using readlink. v2: Keep a cache of readlink results so it isn't quite so dreadfully slow. Reviewed-by: Adam Jackson Commit: 646bc74cded8b77d57312ae858a2ed01b0d17c21 https://github.com/XQuartz/xorg-server/commit/646bc74cded8b77d57312ae858a2ed01b0d17c21 Author: Adam Jackson Date: 2017-03-14 (Tue, 14 Mar 2017) Changed paths: M test/Makefile.am Log Message: ----------- test: Fix distcheck failures Signed-off-by: Adam Jackson Commit: f40ff18c96e02ff18a367bf53feeb4bd8ee952a0 https://github.com/XQuartz/xorg-server/commit/f40ff18c96e02ff18a367bf53feeb4bd8ee952a0 Author: Olivier Fourdan Date: 2017-03-15 (Wed, 15 Mar 2017) Changed paths: M glamor/glamor.c Log Message: ----------- glamor: Check for NULL pixmap in glamor_get_pixmap_texture() glamor_create_pixmap() would return a NullPixmap if the given size is larger than the maximum size of a pixmap. But glamor_get_pixmap_texture() won't check if the given pixmap is non-null, leading to a segfault if glamor_create_pixmap() failed. This can be reproduced by passing Xephyr a very large screen width, e.g.: $ Xephyr -glamor -screen 32768x1024 :10 (EE) (EE) Backtrace: (EE) 0: Xephyr (OsSigHandler+0x29) (EE) 1: /lib64/libpthread.so.0 (__restore_rt+0x0) (EE) 2: Xephyr (glamor_get_pixmap_texture+0x30) (EE) 3: Xephyr (ephyr_glamor_create_screen_resources+0xc6) (EE) 4: Xephyr (ephyrCreateResources+0x98) (EE) 5: Xephyr (dix_main+0x275) (EE) 6: /lib64/libc.so.6 (__libc_start_main+0xf1) (EE) 7: Xephyr (_start+0x2a) (EE) 8: ? (?+0x2a) [0x2a] (EE) (EE) Segmentation fault at address 0x0 (EE) Fatal server error: (EE) Caught signal 11 (Segmentation fault). Server aborting (EE) Aborted (core dumped) Bugzilla: https://bugzilla.redhat.com/1431633 Reviewed-by: Michel Dänzer Signed-off-by: Olivier Fourdan Commit: b0ce1d088a863492f5de11e4dbde10af4261d892 https://github.com/XQuartz/xorg-server/commit/b0ce1d088a863492f5de11e4dbde10af4261d892 Author: Olivier Fourdan Date: 2017-03-15 (Wed, 15 Mar 2017) Changed paths: M hw/kdrive/ephyr/ephyr.c M hw/kdrive/ephyr/hostx.c Log Message: ----------- Xephyr: Check screen resources creation success If the screen pixmap or the corresponding texture creation with glamor fails, exit cleanly with an error message instead of segfaulting. Fixes: https://bugzilla.redhat.com/1431633 Reviewed-by: Michel Dänzer Signed-off-by: Olivier Fourdan Commit: 04b4bad7c048fd077fe839f10634c99ef1e488af https://github.com/XQuartz/xorg-server/commit/04b4bad7c048fd077fe839f10634c99ef1e488af Author: Olivier Fourdan Date: 2017-03-15 (Wed, 15 Mar 2017) Changed paths: M glamor/glamor_transform.c M glamor/glamor_transform.h Log Message: ----------- glamor: glamor_set_destination_drawable() can fail The fbo_array of a given glamor pixmap can be NULL in some cases, as glamor_create_fbo_array() can fail to allocate the FBO array. If this is the case, glamor_pixmap_fbo_at() will return NULL even though the box index is valid, and glamor_set_destination_drawable() simply assumes glamor_pixmap_fbo_at() will return an FBO prior to pass the value to glamor_set_destination_pixmap_fbo(), which will segfault. We need a way for glamor_set_destination_drawable() to fail safely and let the caller know about the failure. Add a boolean return value to glamor_set_destination_drawable() for that purpose. Bugzilla: https://bugzilla.redhat.com/1417575 Signed-off-by: Olivier Fourdan Commit: 455051a0f1d2bc84f605c325f647bd64d414c47d https://github.com/XQuartz/xorg-server/commit/455051a0f1d2bc84f605c325f647bd64d414c47d Author: Olivier Fourdan Date: 2017-03-15 (Wed, 15 Mar 2017) Changed paths: M glamor/glamor_copy.c M glamor/glamor_glyphblt.c M glamor/glamor_lines.c M glamor/glamor_points.c M glamor/glamor_rects.c M glamor/glamor_segs.c M glamor/glamor_spans.c Log Message: ----------- glamor: Check glamor_set_destination_drawable() return value Check the value returned by glamor_set_destination_drawable() and use the fallback code path where possible. Bugzilla: https://bugzilla.redhat.com/1417575 Signed-off-by: Olivier Fourdan Commit: f1f865e909090406841a9b9416ea6259a75c2086 https://github.com/XQuartz/xorg-server/commit/f1f865e909090406841a9b9416ea6259a75c2086 Author: Adam Jackson Date: 2017-03-15 (Wed, 15 Mar 2017) Changed paths: M hw/xfree86/parser/scan.c Log Message: ----------- parser: Fix crash when xf86nameCompare(s1 = x, s2 = NULL) Signed-off-by: Adam Jackson Commit: e337de2d488a124e5fee0fdcb882567b68f1767d https://github.com/XQuartz/xorg-server/commit/e337de2d488a124e5fee0fdcb882567b68f1767d Author: Adam Jackson Date: 2017-03-15 (Wed, 15 Mar 2017) Changed paths: M Xext/panoramiXprocs.c Log Message: ----------- xinerama: Implement graphics exposures for window->pixmap copies (v4) This code is using GetImage to accumulate a logical view of the window image (since the windows will be clipped to their containing screen), and then PutImage to load that back into the pixmap. What it wasn't doing was constructing a region for the obscured areas of the window and emitting graphics exposures for same. v2: Fix coordinate translation when the source is the root window v3: Create sourceBox with the right coordinates initially instead of translating (Keith Packard) v4: Clamp the region to 15 bits to avoid overflow (Keith Packard) Signed-off-by: Adam Jackson Commit: 5b5ba7dc3d544868035b7088e9aac62eb2511e10 https://github.com/XQuartz/xorg-server/commit/5b5ba7dc3d544868035b7088e9aac62eb2511e10 Author: Adam Jackson Date: 2017-03-16 (Thu, 16 Mar 2017) Changed paths: M hw/xfree86/sdksyms.sh Log Message: ----------- Revert "sdksyms: Tighten up the symbols we add to the magic table" Enough people are reporting build issues pointing at this commit that it's not worth the benefit. This reverts commit 3dad57b121fdf001e75fffa7e3007a9a0a154f67. Commit: fe0b297420fc1de8a7fab28457d0864b3182e967 https://github.com/XQuartz/xorg-server/commit/fe0b297420fc1de8a7fab28457d0864b3182e967 Author: Eric Anholt Date: 2017-03-16 (Thu, 16 Mar 2017) Changed paths: M glamor/glamor_dash.c Log Message: ----------- glamor: Fix dashed line rendering. We were binding the screen pixmap as the dash and sampling its alpha, which is usually just 1.0 (no dashing at all). Please cherry-pick this to active stable branches. Signed-off-by: Eric Anholt Reviewed-by: Keith Packard Reviewed-by: Michel Dänzer Commit: 83c4297d2c4fd501a9d36bc0cb7d357a8d22394c https://github.com/XQuartz/xorg-server/commit/83c4297d2c4fd501a9d36bc0cb7d357a8d22394c Author: Adam Jackson Date: 2017-03-17 (Fri, 17 Mar 2017) Changed paths: M hw/kdrive/ephyr/hostx.c Log Message: ----------- ephyr: Don't clobber bitsPerPixel when using glamor This ends up passing 0 as the bpp argument to fb screen setup, which is not really the best plan. Reviewed-by: Eric Anholt Signed-off-by: Adam Jackson Commit: e33be78e2ab63abc84aa0baddff90bcefa9c183a https://github.com/XQuartz/xorg-server/commit/e33be78e2ab63abc84aa0baddff90bcefa9c183a Author: Adam Jackson Date: 2017-03-17 (Fri, 17 Mar 2017) Changed paths: M hw/xfree86/common/xf86.h M hw/xfree86/common/xf86Config.c M hw/xfree86/common/xf86Globals.c M hw/xfree86/common/xf86Helper.c M hw/xfree86/common/xf86Init.c M hw/xfree86/common/xf86Priv.h M hw/xfree86/common/xf86Privstr.h M hw/xfree86/common/xf86str.h M hw/xfree86/man/Xorg.man M hw/xfree86/man/xorg.conf.man Log Message: ----------- xfree86: Remove 24bpp pixmap format support (v2) There's really no reason to pretend to support this, apps hate it, all we're doing is giving people a way to injure themselves. It doesn't work anyway with any Radeon, any NVIDIA chip, or any Intel chip since i810. Rip out all the logic for handling 24bpp pixmaps and framebuffers, and silently ignore the old options that would ask for it. The cirrus alpine driver has been updated to default to 16bpp, and both it and the i810 driver can now use the 32->24 conversion code in shadow if they want. All other drivers support 32bpp. Configurations that explicitly request 24bpp in order to fit in VRAM will be broken now though. v2: Fix command line options to silently ignore 24bpp rather than fail Reviewed-by: Eric Anholt Signed-off-by: Adam Jackson Commit: 0803918e64262482035f042e5e1f2a571d3dea1b https://github.com/XQuartz/xorg-server/commit/0803918e64262482035f042e5e1f2a571d3dea1b Author: Adam Jackson Date: 2017-03-17 (Fri, 17 Mar 2017) Changed paths: M exa/exa.c M fb/Makefile.am M fb/fb.h R fb/fb24_32.c R fb/fb24_32.h M fb/fbarc.c M fb/fbbits.c M fb/fbbits.h M fb/fbblt.c M fb/fbbltone.c M fb/fbcopy.c M fb/fbgc.c M fb/fbgetsp.c M fb/fbglyph.c M fb/fbimage.c M fb/fbline.c M fb/fboverlay.c M fb/fbpixmap.c M fb/fbpoint.c M fb/fbscreen.c M fb/fbseg.c M fb/fbsetsp.c M fb/fbsolid.c M fb/fbwindow.c M fb/wfbrename.h M glamor/glamor_core.c M include/gcstruct.h M mi/migc.c Log Message: ----------- fb: Remove 24bpp support (v3) v2: - Require power-of-two bpp in ScreenInit - Eliminate fbCreatePixmapBpp v3 - Squash in the exa and glamor changes so we can remove pRotatedPixmap in the same stroke. Reviewed-by: Eric Anholt Signed-off-by: Adam Jackson Commit: 8805a48ed35afb2ca66315656c1575ae5a01c639 https://github.com/XQuartz/xorg-server/commit/8805a48ed35afb2ca66315656c1575ae5a01c639 Author: Olivier Fourdan Date: 2017-03-17 (Fri, 17 Mar 2017) Changed paths: M glamor/glamor_fbo.c Log Message: ----------- glamor: avoid a crash if texture allocation failed Texture creation in _glamor_create_tex() can fail if a GL_OUT_OF_MEMORY is raised, in which case the texture returned is zero. But the texture value is not checked in glamor_create_fbo() and glamor will abort in glamor_pixmap_ensure_fb() because the fbo->tex is 0: Truncated backtrace: Thread no. 1 (10 frames) #4 glamor_pixmap_ensure_fb at glamor_fbo.c:57 #5 glamor_create_fbo_from_tex at glamor_fbo.c:112 #6 glamor_create_fbo at glamor_fbo.c:159 #7 glamor_create_fbo_array at glamor_fbo.c:210 #8 glamor_create_pixmap at glamor.c:226 #9 compNewPixmap at compalloc.c:536 #10 compAllocPixmap at compalloc.c:605 #11 compCheckRedirect at compwindow.c:167 #12 compRealizeWindow at compwindow.c:267 #13 RealizeTree at window.c:2617 Check the value returned by _glamor_create_tex() in glamor_create_fbo() and return NULL in the texture is zero. All callers of glamor_create_fbo() actually check the returned value and will use a fallback code path if it's NULL. Please cherry-pick this to active stable branches. Bugzilla: https://bugzilla.redhat.com/1433305 Signed-off-by: Olivier Fourdan Reviewed-by: Eric Anholt Commit: 368f60d461421fe5e2bbd90652d6ac858dbff8fe https://github.com/XQuartz/xorg-server/commit/368f60d461421fe5e2bbd90652d6ac858dbff8fe Author: Kenneth Graunke Date: 2017-03-20 (Mon, 20 Mar 2017) Changed paths: M hw/xfree86/dri2/pci_ids/i965_pci_ids.h Log Message: ----------- dri2: Sync i965_pci_ids.h from Mesa. Copied from Mesa with no modifications. Gives us Geminilake PCI IDs. Signed-off-by: Kenneth Graunke Acked-by: Eric Anholt Commit: 4aa35c46dab72bc945981f6fd29e494133bc2b0a https://github.com/XQuartz/xorg-server/commit/4aa35c46dab72bc945981f6fd29e494133bc2b0a Author: Adam Jackson Date: 2017-03-20 (Mon, 20 Mar 2017) Changed paths: M fb/fbimage.c Log Message: ----------- fb: Handle ZPixmap planemask in GetImage the other way around Formerly we'd zero the image data and then pull out a plane at a time. It's faster to apply the planemask after the fact, since that turns the GetImage into a memcpy: 100000.0 101000.0 (1.010) (copy 0xaaaaaaaa) ShmGetImage 10x10 square 42400.0 59400.0 (1.401) (copy 0xaaaaaaaa) ShmGetImage 100x100 square 3040.0 5280.0 (1.737) (copy 0xaaaaaaaa) ShmGetImage 500x500 square 96100.0 95200.0 (0.991) (0xaaaaaaaa) GetImage 10x10 square 29600.0 36800.0 (1.243) (0xaaaaaaaa) GetImage 100x100 square 1850.0 2620.0 (1.416) (0xaaaaaaaa) GetImage 500x500 square Measured with Xvfb at depth 24 on Skylake i7-6560U. Reviewed-by: Eric Anholt Signed-off-by: Adam Jackson Commit: 1ad230682338a9d2fc6eca6966a5bebb007df32c https://github.com/XQuartz/xorg-server/commit/1ad230682338a9d2fc6eca6966a5bebb007df32c Author: Adam Jackson Date: 2017-03-20 (Mon, 20 Mar 2017) Changed paths: M glamor/glamor_image.c Log Message: ----------- glamor: Avoid software fallback for planemasked ZPixmap GetImage Same trick as in fb: just do a normal GetImage and deal with the planemask on the CPU if you have to. Since the software fallback hit for glamor is pretty brutal, this is a much more impressive win for glamor than it was for fb: 11100.0 87700.0 (7.901) (copy 0xaaaaaaaa) ShmGetImage 10x10 square 9840.0 47800.0 (4.858) (copy 0xaaaaaaaa) ShmGetImage 100x100 square 1550.0 4240.0 (2.735) (copy 0xaaaaaaaa) ShmGetImage 500x500 square 9450.0 78900.0 (8.349) (0xaaaaaaaa) GetImage 10x10 square 6910.0 30900.0 (4.472) (0xaaaaaaaa) GetImage 100x100 square 431.0 2020.0 (4.687) (0xaaaaaaaa) GetImage 500x500 square Measured with Xephyr -glamor on Skylake GT3e. Reviewed-by: Eric Anholt Signed-off-by: Adam Jackson Commit: 40c12a76c2ae57adefd3b1d412387ebbfe2fb784 https://github.com/XQuartz/xorg-server/commit/40c12a76c2ae57adefd3b1d412387ebbfe2fb784 Author: Tobias Stoeckmann Date: 2017-03-20 (Mon, 20 Mar 2017) Changed paths: M record/record.c Log Message: ----------- record: Fix OOB access in ProcRecordUnregisterClients If a client sends a RecordUnregisterClients request with an nClients field larger than INT_MAX / 4, an integer overflow leads to an out of boundary access in RecordSanityCheckClientSpecifiers. An example line with libXtst would be: XRecordUnregisterClients(dpy, rc, clients, 0x40000001); Reviewed-by: Adam Jackson Commit: 4e76c2711740b775242170d8e5ee56c7e6829cce https://github.com/XQuartz/xorg-server/commit/4e76c2711740b775242170d8e5ee56c7e6829cce Author: Adam Jackson Date: 2017-03-21 (Tue, 21 Mar 2017) Changed paths: M dix/privates.c M include/privates.h M miext/damage/damage.c M miext/damage/damagestr.h Log Message: ----------- dix: Remove PRIVATE_DAMAGE None of this is actually wired up to anything, so we can also remove the devPrivates from the DamageRec. The DamageExtRec is what would need devPrivates for selinux labeling, in principle. Signed-off-by: Adam Jackson Reviewed-by: Eric Anholt Commit: fdc79fe72bc0b97776df2c3a664076c60e08a87c https://github.com/XQuartz/xorg-server/commit/fdc79fe72bc0b97776df2c3a664076c60e08a87c Author: Michel Dänzer Date: 2017-03-21 (Tue, 21 Mar 2017) Changed paths: M hw/xfree86/modes/xf86EdidModes.c Log Message: ----------- edid: Prune duplicates after adding modes from DDC Multiple calls to xf86EdidMonitorSet (which can be triggered e.g. by running xrandr) would potentially keep adding the same modes, causing the Monitor->Modes list to keep growing larger and using up more memory. Fix this by calling xf86PruneDuplicateModes after adding the modes returned by xf86DDCGetModes. This makes sure there's only one instance of each unique mode in the list. v2: * Replace semicolon with {} for empty for loop (Emil Velikov) * Slightly tweak commit log to avoid minor inaccuracy about what xf86PruneDuplicateModes does Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99521 Signed-off-by: Michel Dänzer Reviewed-by: Emil Velikov Commit: eb2cf11724df5cbe0be3cce1ad4c61ba61e8ec6b https://github.com/XQuartz/xorg-server/commit/eb2cf11724df5cbe0be3cce1ad4c61ba61e8ec6b Author: Michel Dänzer Date: 2017-03-23 (Thu, 23 Mar 2017) Changed paths: M hw/kdrive/ephyr/ephyr_draw.c Log Message: ----------- Xephyr: Handle source-only pictures in ephyrPrepare/DoneComposite There is no pixmap associated with source-only pictures. Fixes Xephyr -fakexa crashing on startup. Signed-off-by: Michel Dänzer Reviewed-by: Alex Deucher Signed-off-by: Peter Hutterer Commit: ad6689b7db0a4b0d22716acedae98462a68ea1ae https://github.com/XQuartz/xorg-server/commit/ad6689b7db0a4b0d22716acedae98462a68ea1ae Author: Mariusz Bialonczyk Date: 2017-03-23 (Thu, 23 Mar 2017) Changed paths: M configure.ac Log Message: ----------- configure.ac: fix checking for libdrm version after 9232835bd No matter what libdrm version was installed, it always set the GLAMOR_HAS_DRM_NAME_FROM_FD_2 conditional to 1. This obviously leads to compilation problems. Fixes: 9232835bd16b ("glamor: use drmGetDeviceNameFromFD2 when available") Signed-off-by: Mariusz Bialonczyk Reviewed-and-Tested-by: Qiang Yu Commit: 1b1a8c481773e15142202a7b761d614b33f12577 https://github.com/XQuartz/xorg-server/commit/1b1a8c481773e15142202a7b761d614b33f12577 Author: Eric Anholt Date: 2017-03-23 (Thu, 23 Mar 2017) Changed paths: M hw/kdrive/ephyr/ephyrinit.c M hw/kdrive/src/kinput.c M include/kdrive-config.h.in Log Message: ----------- kdrive: Unifdef KDRIVE_EVDEV. ajax deleted the evdev driver in the removal of fbdev and the linux backend. Reviewed-by: Peter Hutterer Reviewed-by: Daniel Stone Signed-off-by: Eric Anholt Commit: 5c7ed785e3bdb9f0fbf8fbfdc93b5fdd2b2c7dbf https://github.com/XQuartz/xorg-server/commit/5c7ed785e3bdb9f0fbf8fbfdc93b5fdd2b2c7dbf Author: Eric Anholt Date: 2017-03-23 (Thu, 23 Mar 2017) Changed paths: M configure.ac M include/dix-config.h.in M include/kdrive-config.h.in M include/xorg-server.h.in Log Message: ----------- kdrive: Remove vestiges of TSLIB support. The actual code was gone in 27819950e4158326e0f83a30f2e8968b932625ef, but some checks remained. Reviewed-by: Peter Hutterer Reviewed-by: Daniel Stone Signed-off-by: Eric Anholt Commit: 190c2adf4a237a4c0dc13d7566ca91662271d3e4 https://github.com/XQuartz/xorg-server/commit/190c2adf4a237a4c0dc13d7566ca91662271d3e4 Author: Eric Anholt Date: 2017-03-23 (Thu, 23 Mar 2017) Changed paths: M configure.ac M hw/kdrive/ephyr/Makefile.am M hw/kdrive/ephyr/ephyr.c M hw/kdrive/ephyr/ephyr_draw.c M hw/kdrive/ephyr/ephyr_glamor_xv.c M hw/kdrive/ephyr/ephyrcursor.c M hw/kdrive/ephyr/ephyrinit.c M hw/kdrive/ephyr/ephyrvideo.c M hw/kdrive/ephyr/hostx.c M hw/kdrive/ephyr/os.c M hw/kdrive/src/kcmap.c M hw/kdrive/src/kdrive.c M hw/kdrive/src/kinfo.c M hw/kdrive/src/kinput.c M hw/kdrive/src/kmode.c M hw/kdrive/src/kshadow.c M hw/kdrive/src/kxv.c R include/kdrive-config.h.in M mi/miinitext.c Log Message: ----------- kdrive: Drop kdrive-config.h. It had nothing left in it that was used but wasn't in dix-config.h. Reviewed-by: Peter Hutterer Reviewed-by: Daniel Stone Signed-off-by: Eric Anholt Commit: 2da405759fbabd4b918838a0de728c1911b4a2fa https://github.com/XQuartz/xorg-server/commit/2da405759fbabd4b918838a0de728c1911b4a2fa Author: Eric Anholt Date: 2017-03-23 (Thu, 23 Mar 2017) Changed paths: M hw/xfree86/exa/examodule.c M hw/xwayland/xwayland-shm.c Log Message: ----------- xserver: Check the right HAVE_*_CONFIG_H. Reviewed-by: Peter Hutterer Reviewed-by: Daniel Stone Signed-off-by: Eric Anholt Commit: 266af991c8e41e62f054ac9870468a9ba2aaa9f2 https://github.com/XQuartz/xorg-server/commit/266af991c8e41e62f054ac9870468a9ba2aaa9f2 Author: Eric Anholt Date: 2017-03-23 (Thu, 23 Mar 2017) Changed paths: M glamor/glamor_priv.h Log Message: ----------- glamor: Fix some formatting that confused the unifdef command. Reviewed-by: Peter Hutterer Reviewed-by: Daniel Stone Signed-off-by: Eric Anholt Commit: e2e50c509718ea8c7f4684dc18f5ce66e526792b https://github.com/XQuartz/xorg-server/commit/e2e50c509718ea8c7f4684dc18f5ce66e526792b Author: Eric Anholt Date: 2017-03-23 (Thu, 23 Mar 2017) Changed paths: M hw/xfree86/modes/xf86Crtc.c M hw/xfree86/modes/xf86Cursors.c M hw/xfree86/modes/xf86DiDGA.c M hw/xfree86/modes/xf86EdidModes.c M hw/xfree86/modes/xf86Modes.c M hw/xfree86/modes/xf86RandR12.c M hw/xfree86/modes/xf86Rotate.c M hw/xfree86/modes/xf86cvt.c M hw/xfree86/modes/xf86gtf.c M xkb/XKBMAlloc.c M xkb/XKBMisc.c Log Message: ----------- xserver: Unifdef HAVE_CONFIG_H The X Server never generates a global config.h, and instead all these paths are including dix-config.h or xorg-config.h. Reviewed-by: Peter Hutterer Reviewed-by: Daniel Stone Signed-off-by: Eric Anholt Commit: f4b78286ea8d4c94a913a02a3579cbe55e8f1f6b https://github.com/XQuartz/xorg-server/commit/f4b78286ea8d4c94a913a02a3579cbe55e8f1f6b Author: Adam Jackson Date: 2017-03-24 (Fri, 24 Mar 2017) Changed paths: M glx/glxcmds.c Log Message: ----------- glx: Fix MakeCurrent with no drawables GLX_ARB_create_context, which we aspire to support, allows making GL 3.0 or newer contexts current with null current drawables. Strictly this might not be legal for pre-3.0 contexts, but there's no harm in allowing it anyway. Signed-off-by: Adam Jackson Commit: 5cdfcdef819efa6406807254cb3c7aba6ba5475e https://github.com/XQuartz/xorg-server/commit/5cdfcdef819efa6406807254cb3c7aba6ba5475e Author: Matt Turner Date: 2017-03-27 (Mon, 27 Mar 2017) Changed paths: M xkb/xkbInit.c Log Message: ----------- xkb: Correct type of XkbDfltAccessXOptions. Declared as unsigned short in xkb/xkbAccessX.c. Signed-off-by: Matt Turner Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer Commit: 21eda7464d0e13ac6558edaf6531c3d3251e05df https://github.com/XQuartz/xorg-server/commit/21eda7464d0e13ac6558edaf6531c3d3251e05df Author: Tobias Stoeckmann Date: 2017-03-27 (Mon, 27 Mar 2017) Changed paths: M hw/dmx/dmxsync.c Log Message: ----------- dmx: Fix null pointer dereference A null pointer dereference can occur in dmxSync, because TimerForce does not handle a null pointer. dmxSyncTimer is set to NULL a few lines above on a certain condition, which happened on my machine. The explicit NULL check allowed me to start Xdmx again without a segmentation fault. Reviewed-by: Adam Jackson Commit: 8ed0b00fceb34cdb54a0ea113c3cdff3b4c9e7e1 https://github.com/XQuartz/xorg-server/commit/8ed0b00fceb34cdb54a0ea113c3cdff3b4c9e7e1 Author: Adam Jackson Date: 2017-03-27 (Mon, 27 Mar 2017) Changed paths: M Xext/dpms.c M hw/xfree86/common/xf86DPMS.c M hw/xfree86/common/xf86Privstr.h Log Message: ----------- xfree86: Clean up DPMS support Rather than setting up a per-screen private, just conditionally initialize ScrnInfoRec::DPMSSet based on the config options, and inspect that to determine whether DPMS is supported. We also move the "turn the screen back on at CloseScreen" logic into the DPMS extension's (new) reset hook. This would be a behavior change for the non-xfree86 servers, if any of them had non-stub DPMS support. Signed-off-by: Adam Jackson Reviewed-by: Eric Anholt Commit: 7f1ef9289d974fc2bacc968ae0b5d7714382cb9e https://github.com/XQuartz/xorg-server/commit/7f1ef9289d974fc2bacc968ae0b5d7714382cb9e Author: Adam Jackson Date: 2017-03-27 (Mon, 27 Mar 2017) Changed paths: M Xext/Makefile.am M Xext/dpms.c R Xext/dpmsstubs.c M hw/dmx/dmxdpms.c M hw/dmx/dmxdpms.h M hw/dmx/dmxscrinit.c M hw/kdrive/src/kdrive.c M hw/vfb/Makefile.am M hw/xfree86/common/xf86DPMS.c M hw/xnest/Makefile.am M hw/xwayland/Makefile.am M hw/xwin/Makefile.am M include/scrnintstr.h Log Message: ----------- dix: Lift DPMS to a screen hook Following on from the previous change, this adds a DPMS hook to the ScreenRec and uses that to infer DPMS support. As a result we can drop the dpms stub code from Xext. Signed-off-by: Adam Jackson Reviewed-by: Eric Anholt Commit: 33604187674ec78b2c0bf7f67af250acc80cf23a https://github.com/XQuartz/xorg-server/commit/33604187674ec78b2c0bf7f67af250acc80cf23a Author: Adam Jackson Date: 2017-03-27 (Mon, 27 Mar 2017) Changed paths: M Xext/dpms.c M Xext/dpmsproc.h M Xext/saver.c M dix/globals.c M dix/main.c M hw/xfree86/common/xf86Config.c M include/globals.h M os/utils.c Log Message: ----------- dpms: Consolidate a bunch of stuff into Xext/dpms.c Most of this is a legacy of the old "extmod" design where you could load _some_ extensions dynamically but only if the server had been built with support for them in the first place. Note that since we now only initialize the DPMS extension if at least one screen supports it, we no longer need DPMSCapableFlag: if it would be false, we would never read its value. Signed-off-by: Adam Jackson Reviewed-by: Eric Anholt Commit: e4d0757fc2620fd3182448c5e4b5a55a509594d3 https://github.com/XQuartz/xorg-server/commit/e4d0757fc2620fd3182448c5e4b5a55a509594d3 Author: Adam Jackson Date: 2017-03-30 (Thu, 30 Mar 2017) Changed paths: M hw/xfree86/common/xf86.h M hw/xfree86/common/xf86Bus.c M hw/xfree86/common/xf86Bus.h M hw/xfree86/common/xf86Events.c M hw/xfree86/common/xf86Helper.c M hw/xfree86/common/xf86Init.c M hw/xfree86/common/xf86PM.c M hw/xfree86/common/xf86Priv.h M hw/xfree86/common/xf86pciBus.c M hw/xfree86/doc/ddxDesign.xml Log Message: ----------- xfree86: Remove driver entity hooks and private No driver is using these, as far as I know. v2: Tripwire the entity hook arguments to xf86Config*Entity, fix documentation (Eric Anholt) Signed-off-by: Adam Jackson Reviewed-by: Eric Anholt Commit: 0c8e6ed85810e96d84173a52d628863802a78d82 https://github.com/XQuartz/xorg-server/commit/0c8e6ed85810e96d84173a52d628863802a78d82 Author: Daniel Stone Date: 2017-04-07 (Fri, 07 Apr 2017) Changed paths: M hw/xfree86/drivers/modesetting/vblank.c Log Message: ----------- modesetting: Set correct DRM event context version DRM_EVENT_CONTEXT_VERSION is the latest context version supported by whatever version of libdrm is present. modesetting was blindly asserting it supported whatever version that may be, even if it actually didn't. With libdrm 2.4.78, setting a higher context version than 2 will attempt to call the page_flip_handler2 vfunc if it was non-NULL, which being a random chunk of stack memory, it might well have been. Set the version as 2, which should be bumped only with the appropriate version checks. Reviewed-by: Adam Jackson Signed-off-by: Daniel Stone Commit: 7dfb9608d080b46a7b21b57dc8aa2f52670addce https://github.com/XQuartz/xorg-server/commit/7dfb9608d080b46a7b21b57dc8aa2f52670addce Author: Adam Jackson Date: 2017-04-10 (Mon, 10 Apr 2017) Changed paths: M glx/glxcmds.c M glx/glxext.c M glx/glxserver.h Log Message: ----------- glx: Remove enter/leave server API Dead code since: commit 8aacf47e1778d8b72811b025a82452b933d3c1f2 Author: Adam Jackson Date: Fri Oct 4 12:58:19 2013 -0400 glx: Remove DRI1 AIGLX (v2) Signed-off-by: Adam Jackson Commit: 14d2fe74f4e51c5b37eab4b7475c804a0340b530 https://github.com/XQuartz/xorg-server/commit/14d2fe74f4e51c5b37eab4b7475c804a0340b530 Author: Adam Jackson Date: 2017-04-10 (Mon, 10 Apr 2017) Changed paths: M hw/kdrive/ephyr/ephyrvideo.c Log Message: ----------- xephyr: Check for host XVideo support before trying to use it Otherwise xcb will treat our attempt to send xv requests as a connection error (quite reasonably: we're asking it to emit a request for which there is no defined major opcode), and we'll die quietly the first time we hit KdBlockhandler. Signed-off-by: Adam Jackson Reviewed-by: Eric Anholt Commit: 8bdf340e478524262c85fb81687d7f02b14ad71c https://github.com/XQuartz/xorg-server/commit/8bdf340e478524262c85fb81687d7f02b14ad71c Author: Daniel Stone Date: 2017-04-11 (Tue, 11 Apr 2017) Changed paths: M README Log Message: ----------- README: HTTPS everywhere All fd.o HTTP services are now HTTPS-only (with redirects, but still). Reviewed-by: Adam Jackson Signed-off-by: Daniel Stone Commit: ea91996a9c2081d0692f5c2f79a9fda9effba358 https://github.com/XQuartz/xorg-server/commit/ea91996a9c2081d0692f5c2f79a9fda9effba358 Author: Daniel Stone Date: 2017-04-11 (Tue, 11 Apr 2017) Changed paths: M README Log Message: ----------- README: Add link to fd.o CoC The Contributor Covenant applies to all fd.o-hosted resources, including lists and Bugzilla. Add a note to the README, reminding people to act like human beings. Reviewed-by: Adam Jackson Signed-off-by: Daniel Stone Commit: bcee1b76aa0db8525b491485e90b8740763d7de6 https://github.com/XQuartz/xorg-server/commit/bcee1b76aa0db8525b491485e90b8740763d7de6 Author: Martin Peres Date: 2017-04-12 (Wed, 12 Apr 2017) Changed paths: M hw/xfree86/drivers/modesetting/drmmode_display.c Log Message: ----------- modesetting: re-set the crtc's mode when link-status goes BAD Despite all the careful planning of the kernel, a link may become insufficient to handle the currently-set mode. At this point, the kernel should mark this particular configuration as being broken and potentially prune the mode before setting the offending connector's link-status to BAD and send the userspace a hotplug event. This may happen right after a modeset or later on. Upon receiving a hot-plug event, we iterate through the connectors to re-apply the currently-set mode on all the connectors that have a link-status property set to BAD. The kernel may be able to get the link to work by dropping to using a lower link bpp (with the same display bpp). However, the modeset may fail if the kernel has pruned the mode, so to make users aware of this problem a warning is outputed in the logs to warn about having a potentially-black display. This patch does not modify the current behaviour of always propagating the events to the randr clients. This allows desktop environments to re-probe the connectors and select a new resolution based on the new (currated) mode list if a mode disapeared. This behaviour is expected in order to pass the Display Port compliance tests. Signed-off-by: Martin Peres Reviewed-by: Eric Anholt Commit: 41dafcc2a2942fc4c94ce3cbafc4a1b413c460c3 https://github.com/XQuartz/xorg-server/commit/41dafcc2a2942fc4c94ce3cbafc4a1b413c460c3 Author: Michel Dänzer Date: 2017-04-17 (Mon, 17 Apr 2017) Changed paths: M hw/xfree86/modes/xf86RandR12.c Log Message: ----------- xfree86/modes: Make colormap/gamma glue code work with RandR disabled E.g. because Xinerama is enabled. Fixes crash on startup and wrong colours in that case. Bugzilla: https://bugs.freedesktop.org/100293 Bugzilla: https://bugs.freedesktop.org/100294 Fixes: 62f44052573b ("xfree86/modes: Move gamma initialization to xf86RandR12Init12 v2") Tested-by: Mariusz Bialonczyk Reviewed-by: Alex Deucher Commit: cc882af336c8963a2cba0c93e29869ef59b19818 https://github.com/XQuartz/xorg-server/commit/cc882af336c8963a2cba0c93e29869ef59b19818 Author: Roman Gilg Date: 2017-04-18 (Tue, 18 Apr 2017) Changed paths: M hw/xwayland/xwayland-output.c Log Message: ----------- xwayland: Small comment edit Be more precise in describing the return value. Signed-off-by: Roman Gilg Reviewed-by: Daniel Stone Signed-off-by: Peter Hutterer Commit: dae97e1bb4d4f86db118c22dfeea0eef0d3f8bdd https://github.com/XQuartz/xorg-server/commit/dae97e1bb4d4f86db118c22dfeea0eef0d3f8bdd Author: Eric Anholt Date: 2017-04-21 (Fri, 21 Apr 2017) Changed paths: M configure.ac Log Message: ----------- configure: Stop checking for XdmcpWrap As far back as the initial import, it seems to have been exposed, and there's no explanation why the test happened in the initial xserver import. Signed-off-by: Eric Anholt Reviewed-by: Keith Packard Commit: be80a3cb48a7860b9ed985b123f4d8a3b4ae3c89 https://github.com/XQuartz/xorg-server/commit/be80a3cb48a7860b9ed985b123f4d8a3b4ae3c89 Author: Eric Anholt Date: 2017-04-21 (Fri, 21 Apr 2017) Changed paths: M configure.ac M glx/glxbyteorder.h M include/dix-config.h.in Log Message: ----------- glx: Use the same endian swapping as the rest of the server. This dumps a ton of configure-time checks for system endian macros. Given that we're marking the mixed-endian fixup code as cold, getting at the system macros is a waste of code. Signed-off-by: Eric Anholt Reviewed-by: Keith Packard Commit: 7bfb87a2137853295ecc9e544a15626cfd773a02 https://github.com/XQuartz/xorg-server/commit/7bfb87a2137853295ecc9e544a15626cfd773a02 Author: Olivier Fourdan Date: 2017-04-21 (Fri, 21 Apr 2017) Changed paths: M glamor/glamor_xv.c Log Message: ----------- glamor: an FBO is not needed for Xv pixmaps It appears that on some hardware/diver combo such as nv30/nouveau, using GL_ALPHA as format for 8-bit depth will cause an incomplete attachment error (GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT) when trying to bind the texture. As a result, the FBO is NULL and glamor segfaults when trying to access the FBO width/height in pixmap_priv_get_scale() in glamor_xv_render(). This happens with glamor-xv which uses 8-bit pixmaps, meaning that on such hardware/driver, trying to play a video using Xv will lead to a crash of the Xserver. This affects Xwayland, Xephyr, modesetting driver with glamor accel. But the use of an FBO is not actually needed for glamox-xv, so by disabling FBO at pixmap creation, we can avoid the issue entirely. Fix suggested by Eric Anholt Signed-off-by: Olivier Fourdan Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=100710 Fixes: https://bugzilla.redhat.com/1412814 Reviewed-by: Eric Anholt Commit: f81343dd2fff49c70f53e3efdd40f8f89a38e460 https://github.com/XQuartz/xorg-server/commit/f81343dd2fff49c70f53e3efdd40f8f89a38e460 Author: Alan Coopersmith Date: 2017-04-24 (Mon, 24 Apr 2017) Changed paths: M test/xi2/protocol-xigetclientpointer.c M test/xi2/protocol-xigetselectedevents.c M test/xi2/protocol-xipassivegrabdevice.c Log Message: ----------- Mark test_data static in Xinput protocol tests to avoid clashes Fixes warning from Solaris linker: ld: warning: symbol 'test_data' has differing sizes: (file tests-protocol-xigetselectedevents.o value=0x418; file tests-protocol-xigetclientpointer.o value=0x18); tests-protocol-xigetselectedevents.o definition taken Signed-off-by: Alan Coopersmith Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer Commit: da27ca84b4324b68037d6ec19a73b9e0a5ef10bc https://github.com/XQuartz/xorg-server/commit/da27ca84b4324b68037d6ec19a73b9e0a5ef10bc Author: Eric Anholt Date: 2017-04-25 (Tue, 25 Apr 2017) Changed paths: M configure.ac M hw/xfree86/common/xf86Init.c M include/xorg-config.h.in M include/xorg-server.h.in M manpages.am Log Message: ----------- xorg: Change __XCONFIGFILE__ to XCONFIGFILE (and DIR) to fix scan.c. parser/scan.c was checking for #ifdef XCONFIGFILE and XCONFIGDIR and defaulting to "xorg.conf", and "xorg.conf.d", so if you had changed __XCONFIGFILE__ to anything else, it would have got out of sync. Settle on the name without gratuitous underscores. Signed-off-by: Eric Anholt Reviewed-by: Keith Packard Commit: 5ef4e785131bb30e774a8175099c0432537533fa https://github.com/XQuartz/xorg-server/commit/5ef4e785131bb30e774a8175099c0432537533fa Author: Eric Anholt Date: 2017-04-25 (Tue, 25 Apr 2017) Changed paths: M hw/xfree86/parser/Makefile.am M hw/xfree86/parser/scan.c M xkb/ddxLoad.c Log Message: ----------- Remove default defines of some directories. The build defines these, so having the defaults is just a way for the build system's configuration to get out of sync with the code. v2: Drop #ifndefs around the other two defines. Signed-off-by: Eric Anholt Reviewed-by: Keith Packard Commit: 563b6ee873b898c0f3e3671cf6adaf91def5d92a https://github.com/XQuartz/xorg-server/commit/563b6ee873b898c0f3e3671cf6adaf91def5d92a Author: Eric Anholt Date: 2017-04-25 (Tue, 25 Apr 2017) Changed paths: M doc/Xserver-spec.xml M glx/glxbyteorder.h M include/misc.h M os/io.c Log Message: ----------- Rewrite the byte swapping macros. The clever pointer tricks were actually not working, and we were doing the byte-by-byte moves in general. By just doing the memcpy and obvious byte swap code, we end up generating actual byte swap instructions, thanks to optimizing compilers. text data bss dec hex filename before: 2240807 51552 132016 2424375 24fe37 hw/xfree86/Xorg after: 2215167 51552 132016 2398735 249a0f hw/xfree86/Xorg Signed-off-by: Eric Anholt Reviewed-by: Keith Packard Commit: 4552238960fc05ff885bcabbc24d1489370fbd89 https://github.com/XQuartz/xorg-server/commit/4552238960fc05ff885bcabbc24d1489370fbd89 Author: Eric Anholt Date: 2017-04-25 (Tue, 25 Apr 2017) Changed paths: M test/misc.c Log Message: ----------- Add unit tests for the byte swapping macros. Peter noted a weirdness in my new bswap code, which could use some tests to justify it. Signed-off-by: Eric Anholt Reviewed-by: Peter Hutterer Commit: fec9607c8e0a84dc86466c638d00b502f21ec622 https://github.com/XQuartz/xorg-server/commit/fec9607c8e0a84dc86466c638d00b502f21ec622 Author: Eric Anholt Date: 2017-04-25 (Tue, 25 Apr 2017) Changed paths: M include/misc.h M test/misc.c Log Message: ----------- Remove support for unaligned swaps. The previous misc.h code went out of its way to allow swapping of unaligned pointers to values. However, the members of an X request/response are always naturally aligned within the struct, and the buffers containing a request/response will also be aligned to at least 8 bytes, so we can just drop it. text data bss dec hex filename before: 2215167 51552 132016 2398735 249a0f hw/xfree86/Xorg after: 2214919 51552 132016 2398487 249917 hw/xfree86/Xorg Signed-off-by: Eric Anholt Reviewed-by: Keith Packard Commit: 23f2f1932a1d3f36468eaf735ae34934d246567b https://github.com/XQuartz/xorg-server/commit/23f2f1932a1d3f36468eaf735ae34934d246567b Author: Eric Anholt Date: 2017-04-25 (Tue, 25 Apr 2017) Changed paths: M hw/xfree86/drivers/modesetting/drmmode_display.c Log Message: ----------- modesetting: Add the "DPI" connector type. The number for it was merged to drm_mode.h in kernel 4.7, and the output_names[] array just requires that we slot in new strings in order. Signed-off-by: Eric Anholt Reviewed-by: Alex Deucher Commit: 27a6b9f7c84c914d0f5909ec1069d72f5035bc04 https://github.com/XQuartz/xorg-server/commit/27a6b9f7c84c914d0f5909ec1069d72f5035bc04 Author: Michel Dänzer Date: 2017-04-26 (Wed, 26 Apr 2017) Changed paths: M hw/xfree86/common/xf86Init.c M hw/xquartz/quartz.c M os/osinit.c M os/utils.c Log Message: ----------- os: Handle SIGABRT Without this, assertion failures can make life hard for users and those trying to help them. v2: * Change commit log wording slightly to "can make life hard", since apparently e.g. logind can alleviate that somewhat. * Set default handler for SIGABRT in hw/xfree86/common/xf86Init.c:InstallSignalHandlers() and hw/xquartz/quartz.c:QuartzInitOutput() (Eric Anholt) Reviewed-by: Eric Anholt Signed-off-by: Michel Dänzer Commit: ace6bfd5901e19045371f9bd18b997b37f55b589 https://github.com/XQuartz/xorg-server/commit/ace6bfd5901e19045371f9bd18b997b37f55b589 Author: Eric Anholt Date: 2017-04-26 (Wed, 26 Apr 2017) Changed paths: M dix/dispatch.c Log Message: ----------- dix: Remove a redundant #define Found when the meson conversion set the symbol to defined, instead of defined to 1. Reviewed-by: Peter Hutterer Reviewed-by: Keith Packard Reviewed-by: Adam Jackson Signed-off-by: Eric Anholt Commit: c7be7a688a78a34f61b90c0d95914e14b90b0cdc https://github.com/XQuartz/xorg-server/commit/c7be7a688a78a34f61b90c0d95914e14b90b0cdc Author: Eric Anholt Date: 2017-04-26 (Wed, 26 Apr 2017) Changed paths: M glamor/glamor_priv.h M hw/xfree86/common/xf86.h M hw/xfree86/drivers/modesetting/driver.c M hw/xfree86/loader/loadmod.c M hw/xfree86/sdksyms.sh M hw/xwayland/xwayland.c M include/dixstruct.h M include/os.h M include/xserver_poll.h M os/utils.c Log Message: ----------- Use #ifdef instead of #if for features to make Meson easier. We mostly use #ifdef throughout the tree, and this lets the generated config.h files just be #define TOKEN instead of #define TOKEN 1. Reviewed-by: Peter Hutterer Reviewed-by: Keith Packard Reviewed-by: Adam Jackson Signed-off-by: Eric Anholt Commit: 1549e30372756cfdb85379fd8d93c769297ab6e6 https://github.com/XQuartz/xorg-server/commit/1549e30372756cfdb85379fd8d93c769297ab6e6 Author: Eric Anholt Date: 2017-04-26 (Wed, 26 Apr 2017) Changed paths: A Xext/meson.build A Xi/meson.build A composite/meson.build A config/meson.build A damageext/meson.build A dbe/meson.build A dix/meson.build A dri3/meson.build A exa/meson.build A fb/meson.build A glamor/meson.build A glx/meson.build A hw/dmx/config/meson.build A hw/dmx/examples/meson.build A hw/dmx/glxProxy/meson.build A hw/dmx/input/meson.build A hw/dmx/meson.build A hw/kdrive/ephyr/meson.build A hw/kdrive/meson.build A hw/kdrive/src/meson.build A hw/meson.build A hw/vfb/meson.build A hw/xfree86/common/meson.build A hw/xfree86/common/xf86Build.sh A hw/xfree86/ddc/meson.build A hw/xfree86/dixmods/meson.build A hw/xfree86/dri/meson.build A hw/xfree86/dri2/meson.build A hw/xfree86/drivers/modesetting/meson.build A hw/xfree86/exa/meson.build A hw/xfree86/glamor_egl/meson.build A hw/xfree86/i2c/meson.build A hw/xfree86/int10/meson.build M hw/xfree86/loader/loader.c A hw/xfree86/loader/meson.build A hw/xfree86/loader/symbol-test.c A hw/xfree86/meson.build A hw/xfree86/modes/meson.build A hw/xfree86/os-support/meson.build A hw/xfree86/parser/meson.build A hw/xfree86/ramdac/meson.build A hw/xfree86/x86emu/meson.build A hw/xnest/meson.build A hw/xquartz/meson.build A hw/xwayland/meson.build A include/meson.build A include/xorg-config.h.meson.in A meson.build A meson_options.txt A mi/meson.build A miext/damage/meson.build A miext/shadow/meson.build A miext/sync/meson.build A os/meson.build A present/meson.build A pseudoramiX/meson.build A randr/meson.build A record/meson.build A render/meson.build A xfixes/meson.build A xkb/meson.build Log Message: ----------- Add a Meson build system alongside autotools. This is a work in progress that builds Xvfb, Xephyr, Xwayland, Xnest, and Xdmx so far. The outline of Xquartz/Xwin support is in tree, but hasn't been built yet. The unit tests are also not done. The intent is to build this as a complete replacement for the autotools system, then eventually replace autotools. meson is faster to generate the build, faster to run the bulid, shorter to write the build files in, and less error-prone than autotools. v2: Fix indentation nits, move version declaration to project(), use existing meson_options for version-config.h's vendor name/web. Signed-off-by: Eric Anholt Acked-by: Keith Packard Reviewed-by: Peter Hutterer