Update to xorg-server 1.16.3.
Most of the 1.16.2->1.16.3 changes are the security patches that where already there. This adds some extra fixes plus a few unrelated bug fixes.
This commit is contained in:
matthieu
parent
d676506802
commit
7db4642f69
@ -1,3 +1,784 @@
|
|||||||
|
commit 16f157cbf6b9c3193b4e622b9c4552e83a343e9d
|
||||||
|
Author: Julien Cristau <jcristau@debian.org>
|
||||||
|
Date: Sat Dec 20 12:38:41 2014 +0100
|
||||||
|
|
||||||
|
Bump to 1.16.3
|
||||||
|
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 9b037af0410bb1f63d370d8b8be06135de7af600
|
||||||
|
Author: Julien Cristau <jcristau@debian.org>
|
||||||
|
Date: Tue Dec 9 20:55:02 2014 +0100
|
||||||
|
|
||||||
|
Bump to 1.16.2.901
|
||||||
|
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit f7ff55a374d91f8b513159809ed41c3e029a6074
|
||||||
|
Author: Keith Packard <keithp@keithp.com>
|
||||||
|
Date: Tue Dec 9 09:31:00 2014 -0800
|
||||||
|
|
||||||
|
dix: GetHosts bounds check using wrong pointer value [CVE-2014-8092 pt. 6]
|
||||||
|
|
||||||
|
GetHosts saves the pointer to allocated memory in *data, and then
|
||||||
|
wants to bounds-check writes to that region, but was mistakenly using
|
||||||
|
a bare 'data' instead of '*data'. Also, data is declared as void **,
|
||||||
|
so we need a cast to turn it into a byte pointer so we can actually do
|
||||||
|
pointer comparisons.
|
||||||
|
|
||||||
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||||
|
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit 1559a94395258fd73e369f1a2c98a44bfe21a486)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 8e7c4380a56ab05412f630e9b6e02580cb04a804
|
||||||
|
Author: Keith Packard <keithp@keithp.com>
|
||||||
|
Date: Tue Dec 9 09:30:59 2014 -0800
|
||||||
|
|
||||||
|
Missing parens in REQUEST_FIXED_SIZE macro [CVE-2014-8092 pt. 5]
|
||||||
|
|
||||||
|
The 'n' parameter must be surrounded by parens in both places to
|
||||||
|
prevent precedence from mis-computing things.
|
||||||
|
|
||||||
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||||
|
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit 9802a0162f738de03585ca3f3b8a8266494f7d45)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 1069ca99298bf1e85e001bfde90b00a42afdb5d8
|
||||||
|
Author: Keith Packard <keithp@keithp.com>
|
||||||
|
Date: Tue Dec 9 09:30:58 2014 -0800
|
||||||
|
|
||||||
|
glx: Can't mix declarations and code in X.org sources [CVE-2014-8098 pt. 9]
|
||||||
|
|
||||||
|
We're using compiler compatibility settings which generate warnings
|
||||||
|
when a variable is declared after the first statement.
|
||||||
|
|
||||||
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||||
|
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit 61b17c0f10307e25e51e30e6fb1d3e3127f82d86)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 044764b5c627d1a6e8ea1dd8cf741a26aeb4b2e7
|
||||||
|
Author: Keith Packard <keithp@keithp.com>
|
||||||
|
Date: Tue Dec 9 09:30:57 2014 -0800
|
||||||
|
|
||||||
|
dbe: Call to DDX SwapBuffers requires address of int, not unsigned int [CVE-2014-8097 pt. 2]
|
||||||
|
|
||||||
|
When the local types used to walk the DBE request were changed, this
|
||||||
|
changed the type of the parameter passed to the DDX SwapBuffers API,
|
||||||
|
but there wasn't a matching change in the API definition.
|
||||||
|
|
||||||
|
At this point, with the API frozen, I just stuck a new variable in
|
||||||
|
with the correct type. Because we've already bounds-checked nStuff to
|
||||||
|
be smaller than UINT32_MAX / sizeof(DbeSwapInfoRec), we know it will
|
||||||
|
fit in a signed int without overflow.
|
||||||
|
|
||||||
|
Signed-off-by: Keith Packard <keithp@keithp.com
|
||||||
|
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit b20912c3d45cbbde3c443e6c3d9e189092fe65e1)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 73b1880eb37bd8ffbc3e36739e94f9b56b8323b9
|
||||||
|
Author: Robert Morell <rmorell@nvidia.com>
|
||||||
|
Date: Wed Nov 12 18:51:43 2014 -0800
|
||||||
|
|
||||||
|
glx: Fix mask truncation in __glXGetAnswerBuffer [CVE-2014-8093 6/6]
|
||||||
|
|
||||||
|
On a system where sizeof(unsigned) != sizeof(intptr_t), the unary
|
||||||
|
bitwise not operation will result in a mask that clears all high bits
|
||||||
|
from temp_buf in the expression:
|
||||||
|
temp_buf = (temp_buf + mask) & ~mask;
|
||||||
|
|
||||||
|
Signed-off-by: Robert Morell <rmorell@nvidia.com>
|
||||||
|
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit 7e7630bbb775573eea2a2335adb9d190c3e1e971)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 912df16404b80ea143bd75cdacc0d0976bae4c96
|
||||||
|
Author: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Mon Nov 10 12:13:48 2014 -0500
|
||||||
|
|
||||||
|
glx: Pass remaining request length into ->varsize (v2) [CVE-2014-8098 8/8]
|
||||||
|
|
||||||
|
v2: Handle more multiplies in indirect_reqsize.c (Julien Cristau)
|
||||||
|
|
||||||
|
Reviewed-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
Reviewed-by: Michal Srb <msrb@suse.com>
|
||||||
|
Reviewed-by: Andy Ritger <aritger@nvidia.com>
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit e883c170c15493ab3637c0a01890f5a7ca4e16a5)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 92de7a90a1f48b7fd37b8c78f6a2b8dfa13714a6
|
||||||
|
Author: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Mon Nov 10 12:13:47 2014 -0500
|
||||||
|
|
||||||
|
glx: Length checking for non-generated single requests (v2) [CVE-2014-8098 7/8]
|
||||||
|
|
||||||
|
v2:
|
||||||
|
Fix single versus vendor-private length checking for ARB_imaging subset
|
||||||
|
extensions. (Julien Cristau)
|
||||||
|
|
||||||
|
v3:
|
||||||
|
Fix single versus vendor-private length checking for ARB_imaging subset
|
||||||
|
extensions. (Julien Cristau)
|
||||||
|
|
||||||
|
Reviewed-by: Michal Srb <msrb@suse.com>
|
||||||
|
Reviewed-by: Andy Ritger <aritger@nvidia.com>
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit 984583a497c813df5827ae22483133e704fee79c)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 44ed4a6547136a0945cd85f93b83392cf53f58f2
|
||||||
|
Author: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Mon Nov 10 12:13:46 2014 -0500
|
||||||
|
|
||||||
|
glx: Length-checking for non-generated vendor private requests [CVE-2014-8098 6/8]
|
||||||
|
|
||||||
|
Reviewed-by: Keith Packard <keithp@keithp.com>
|
||||||
|
Reviewed-by: Michal Srb <msrb@suse.com>
|
||||||
|
Reviewed-by: Andy Ritger <aritger@nvidia.com>
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit 44ba149f28ece93c2fbfc9cc980588de5322dd4b)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit fe9672204ad9edc09c4ae6ba1b9e9de09ec98287
|
||||||
|
Author: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Mon Nov 10 12:13:45 2014 -0500
|
||||||
|
|
||||||
|
glx: Request length checks for SetClientInfoARB [CVE-2014-8098 5/8]
|
||||||
|
|
||||||
|
Reviewed-by: Keith Packard <keithp@keithp.com>
|
||||||
|
Reviewed-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
Reviewed-by: Michal Srb <msrb@suse.com>
|
||||||
|
Reviewed-by: Andy Ritger <aritger@nvidia.com>
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit afe177020d1fb776c6163f21eddc82cb185b95ca)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 525db4433b042ad5a116ca0366498f5bc36e1640
|
||||||
|
Author: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Mon Nov 10 12:13:44 2014 -0500
|
||||||
|
|
||||||
|
glx: Top-level length checking for swapped VendorPrivate requests [CVE-2014-8098 4/8]
|
||||||
|
|
||||||
|
Reviewed-by: Keith Packard <keithp@keithp.com>
|
||||||
|
Reviewed-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
Reviewed-by: Michal Srb <msrb@suse.com>
|
||||||
|
Reviewed-by: Andy Ritger <aritger@nvidia.com>
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit c91e4abc3b892f42802efa20fef7ada442c2d3f5)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit cbf197e1c97ae0402abfc35514ef62120baee3a6
|
||||||
|
Author: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Mon Nov 10 12:13:43 2014 -0500
|
||||||
|
|
||||||
|
glx: Length checking for RenderLarge requests (v2) [CVE-2014-8098 3/8]
|
||||||
|
|
||||||
|
This is a half-measure until we start passing request length into the
|
||||||
|
varsize function, but it's better than the nothing we had before.
|
||||||
|
|
||||||
|
v2: Verify that there's at least a large render header's worth of
|
||||||
|
dataBytes (Julien Cristau)
|
||||||
|
|
||||||
|
Reviewed-by: Michal Srb <msrb@suse.com>
|
||||||
|
Reviewed-by: Andy Ritger <aritger@nvidia.com>
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit a33a939e6abb255b14d8dbc85fcbd2c55b958bae)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
Conflicts:
|
||||||
|
glx/glxcmds.c
|
||||||
|
|
||||||
|
commit 7590915c9d76ff7efdc6398a37351df9fab2ce7d
|
||||||
|
Author: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Mon Nov 10 12:13:42 2014 -0500
|
||||||
|
|
||||||
|
glx: Integer overflow protection for non-generated render requests (v3) [CVE-2014-8093 5/6]
|
||||||
|
|
||||||
|
v2:
|
||||||
|
Fix constants in __glXMap2fReqSize (Michal Srb)
|
||||||
|
Validate w/h/d for proxy targets too (Keith Packard)
|
||||||
|
|
||||||
|
v3:
|
||||||
|
Fix Map[12]Size to correctly reject order == 0 (Julien Cristau)
|
||||||
|
|
||||||
|
Reviewed-by: Keith Packard <keithp@keithp.com>
|
||||||
|
Reviewed-by: Michal Srb <msrb@suse.com>
|
||||||
|
Reviewed-by: Andy Ritger <aritger@nvidia.com>
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit 698888e6671d54c7ae41e9d456f7f5483a3459d2)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 20bc891f767a398bff3301369f8a78f9e65b7eda
|
||||||
|
Author: Julien Cristau <jcristau@debian.org>
|
||||||
|
Date: Mon Nov 10 12:13:41 2014 -0500
|
||||||
|
|
||||||
|
glx: Length checking for GLXRender requests (v2) [CVE-2014-8098 2/8]
|
||||||
|
|
||||||
|
v2:
|
||||||
|
Remove can't-happen comparison for cmdlen < 0 (Michal Srb)
|
||||||
|
|
||||||
|
Reviewed-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
Reviewed-by: Michal Srb <msrb@suse.com>
|
||||||
|
Reviewed-by: Andy Ritger <aritger@nvidia.com>
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit be09e0c988ffdb0371293af49fb4ea8f49ed324a)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 233429c1d8c1183bead2d6f3726c92a7fc557ca9
|
||||||
|
Author: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Mon Nov 10 12:13:40 2014 -0500
|
||||||
|
|
||||||
|
glx: Add safe_{add,mul,pad} (v3) [CVE-2014-8093 4/6]
|
||||||
|
|
||||||
|
These are paranoid about integer overflow, and will return -1 if their
|
||||||
|
operation would overflow a (signed) integer or if either argument is
|
||||||
|
negative.
|
||||||
|
|
||||||
|
Note that RenderLarge requests are sized with a uint32_t so in principle
|
||||||
|
this could be sketchy there, but dix limits bigreqs to 128M so you
|
||||||
|
shouldn't ever notice, and honestly if you're sending more than 2G of
|
||||||
|
rendering commands you're already doing something very wrong.
|
||||||
|
|
||||||
|
v2: Use INT_MAX for consistency with the rest of the server (jcristau)
|
||||||
|
v3: Reject negative arguments (anholt)
|
||||||
|
|
||||||
|
Reviewed-by: Keith Packard <keithp@keithp.com>
|
||||||
|
Reviewed-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
Reviewed-by: Michal Srb <msrb@suse.com>
|
||||||
|
Reviewed-by: Andy Ritger <aritger@nvidia.com>
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit 2a5cbc17fc72185bf0fa06fef26d1f782de72595)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit e7dc700de969242983ca0964e38e87a79675f7fa
|
||||||
|
Author: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Mon Nov 10 12:13:39 2014 -0500
|
||||||
|
|
||||||
|
glx: Fix image size computation for EXT_texture_integer [CVE-2014-8098 1/8]
|
||||||
|
|
||||||
|
Without this we'd reject the request with BadLength. Note that some old
|
||||||
|
versions of Mesa had a bug in the same place, and would _send_ zero
|
||||||
|
bytes of image data; these will now be rejected, correctly.
|
||||||
|
|
||||||
|
Reviewed-by: Keith Packard <keithp@keithp.com>
|
||||||
|
Reviewed-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
Reviewed-by: Michal Srb <msrb@suse.com>
|
||||||
|
Reviewed-by: Andy Ritger <aritger@nvidia.com>
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit 13d36923e0ddb077f4854e354c3d5c80590b5d9d)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 25e0fe2b59189be91a84626bc45278c7596ac438
|
||||||
|
Author: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Mon Nov 10 12:13:38 2014 -0500
|
||||||
|
|
||||||
|
glx: Additional paranoia in __glXGetAnswerBuffer / __GLX_GET_ANSWER_BUFFER (v2) [CVE-2014-8093 3/6]
|
||||||
|
|
||||||
|
If the computed reply size is negative, something went wrong, treat it
|
||||||
|
as an error.
|
||||||
|
|
||||||
|
v2: Be more careful about size_t being unsigned (Matthieu Herrb)
|
||||||
|
v3: SIZE_MAX not SIZE_T_MAX (Alan Coopersmith)
|
||||||
|
|
||||||
|
Reviewed-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
Reviewed-by: Michal Srb <msrb@suse.com>
|
||||||
|
Reviewed-by: Andy Ritger <aritger@nvidia.com>
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit 717a1b37767b41e14859e5022ae9e679152821a9)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit de17ad13eb38af4bd5c8f085200bdab88496062f
|
||||||
|
Author: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Mon Nov 10 12:13:37 2014 -0500
|
||||||
|
|
||||||
|
glx: Be more strict about rejecting invalid image sizes [CVE-2014-8093 2/6]
|
||||||
|
|
||||||
|
Before this we'd just clamp the image size to 0, which was just
|
||||||
|
hideously stupid; if the parameters were such that they'd overflow an
|
||||||
|
integer, you'd allocate a small buffer, then pass huge values into (say)
|
||||||
|
ReadPixels, and now you're scribbling over arbitrary server memory.
|
||||||
|
|
||||||
|
Reviewed-by: Keith Packard <keithp@keithp.com>
|
||||||
|
Reviewed-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
Reviewed-by: Michal Srb <msrb@suse.com>
|
||||||
|
Reviewed-by: Andy Ritger <aritger@nvidia.com>
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit ab2ba9338aa5e85b4487bc7fbe69985c76483e01)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 1d496e046e398cd9d6d77edf8958967c86983bf0
|
||||||
|
Author: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Mon Nov 10 12:13:36 2014 -0500
|
||||||
|
|
||||||
|
glx: Be more paranoid about variable-length requests [CVE-2014-8093 1/6]
|
||||||
|
|
||||||
|
If the size computation routine returns -1 we should just reject the
|
||||||
|
request outright. Clamping it to zero could give an attacker the
|
||||||
|
opportunity to also mangle cmdlen in such a way that the subsequent
|
||||||
|
length check passes, and the request would get executed, thus passing
|
||||||
|
data we wanted to reject to the renderer.
|
||||||
|
|
||||||
|
Reviewed-by: Keith Packard <keithp@keithp.com>
|
||||||
|
Reviewed-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
Reviewed-by: Michal Srb <msrb@suse.com>
|
||||||
|
Reviewed-by: Andy Ritger <aritger@nvidia.com>
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit 23fe7718bb171e71db2d1a30505c2ca2988799d9)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 5a4760babdfeb114d1e89df735496f042df352fe
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Sun Feb 9 22:42:47 2014 -0800
|
||||||
|
|
||||||
|
Add REQUEST_FIXED_SIZE testcases to test/misc.c
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
(cherry picked from commit f4afd53f2aeaddf509bf9f71d1716dd273fd6e14)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit efacb60e01513e9a96f2630159727835e2a8af0b
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Sun Feb 9 21:28:05 2014 -0800
|
||||||
|
|
||||||
|
Add request length checking test cases for some Xinput 2.x requests
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
(cherry picked from commit 2df83bb122debc3c20cfc3d3b0edc85cd0270f79)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 3b4aa58d565ea4542586cfc8be3f88d5616f77ed
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Sun Feb 9 21:27:27 2014 -0800
|
||||||
|
|
||||||
|
Add request length checking test cases for some Xinput 1.x requests
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
(cherry picked from commit d153a85f7478a7a67ccb02fbca6390b0ab1732ee)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
Conflicts:
|
||||||
|
test/Makefile.am
|
||||||
|
|
||||||
|
commit 4f30f4dd47df6dfd363a15a12fd30b727c0bbaa8
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Sun Jan 26 20:02:20 2014 -0800
|
||||||
|
|
||||||
|
xfixes: unvalidated length in SProcXFixesSelectSelectionInput [CVE-2014-8102]
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
(cherry picked from commit a0ece23a8bd300c8be10812d368dc8058c97c63e)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 18c7f1e49b16ce9264e77f9c244495ceb24e3f5a
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Sun Jan 26 19:51:29 2014 -0800
|
||||||
|
|
||||||
|
render: unvalidated lengths in Render extn. swapped procs [CVE-2014-8100 2/2]
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
(cherry picked from commit 5d3a788aeb2fbd3ca2812747dc18c94a8b981c63)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 0ad9121071adf1425623170c9d3bc19333d0f1a2
|
||||||
|
Author: Julien Cristau <jcristau@debian.org>
|
||||||
|
Date: Tue Oct 28 10:30:04 2014 +0100
|
||||||
|
|
||||||
|
render: check request size before reading it [CVE-2014-8100 1/2]
|
||||||
|
|
||||||
|
Otherwise we may be reading outside of the client request.
|
||||||
|
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
(cherry picked from commit b5f9ef03df6a650571b29d3d1c1d2b67c6e84336)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit df64ac720642c86efcc47b64621e8a0f1e705f16
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Sun Jan 26 19:38:09 2014 -0800
|
||||||
|
|
||||||
|
randr: unvalidated lengths in RandR extension swapped procs [CVE-2014-8101]
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
(cherry picked from commit 3df2fcf12499ebdb26b9b67419ea485a42041f33)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit ea45001614b771933590a77fdd281b910c637c1b
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Sun Jan 26 19:33:34 2014 -0800
|
||||||
|
|
||||||
|
present: unvalidated lengths in Present extension procs [CVE-2014-8103 2/2]
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
Reviewed-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
(cherry picked from commit d155b7a8e38e74aee96bf52c20c8b6a330d7d462)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit e3a1255a727518332c4a8d2af30c357aee0d50f0
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Sun Jan 26 19:28:05 2014 -0800
|
||||||
|
|
||||||
|
dri3: unvalidated lengths in DRI3 extension swapped procs [CVE-2014-8103 1/2]
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
(cherry picked from commit 0a6085aaf3581cca558d960ea176ddf3a41a2213)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit c092c31c83706cc449787d2378b7d4970e9eba8f
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Sun Jan 26 19:23:17 2014 -0800
|
||||||
|
|
||||||
|
Xv: unvalidated lengths in XVideo extension swapped procs [CVE-2014-8099]
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
(cherry picked from commit 32a95fb7c7dbe22c9441c62762dfa4a8ec54d6c3)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 3d8e2731b5dae431fe68e79ff21d067aed65a077
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Sun Jan 26 17:18:54 2014 -0800
|
||||||
|
|
||||||
|
xcmisc: unvalidated length in SProcXCMiscGetXIDList() [CVE-2014-8096]
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
(cherry picked from commit 7553082b9b883b5f130044f3d53bce2f0b660e52)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 4d3d93c68b0af02f4bc4e75b0395bbbfb8a2f15c
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Sun Jan 26 10:54:41 2014 -0800
|
||||||
|
|
||||||
|
Xi: unvalidated lengths in Xinput extension [CVE-2014-8095]
|
||||||
|
|
||||||
|
Multiple functions in the Xinput extension handling of requests from
|
||||||
|
clients failed to check that the length of the request sent by the
|
||||||
|
client was large enough to perform all the required operations and
|
||||||
|
thus could read or write to memory outside the bounds of the request
|
||||||
|
buffer.
|
||||||
|
|
||||||
|
This commit includes the creation of a new REQUEST_AT_LEAST_EXTRA_SIZE
|
||||||
|
macro in include/dix.h for the common case of needing to ensure a
|
||||||
|
request is large enough to include both the request itself and a
|
||||||
|
minimum amount of extra data following the request header.
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
(cherry picked from commit 73c63afb93c0af1bfd1969bf6e71c9edca586c77)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit d88c66541e4653bcccd083894657b45443d09970
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Wed Jan 22 23:12:04 2014 -0800
|
||||||
|
|
||||||
|
dbe: unvalidated lengths in DbeSwapBuffers calls [CVE-2014-8097]
|
||||||
|
|
||||||
|
ProcDbeSwapBuffers() has a 32bit (n) length value that it uses to read
|
||||||
|
from a buffer. The length is never validated, which can lead to out of
|
||||||
|
bound reads, and possibly returning the data read from out of bounds to
|
||||||
|
the misbehaving client via an X Error packet.
|
||||||
|
|
||||||
|
SProcDbeSwapBuffers() swaps data (for correct endianness) before
|
||||||
|
handing it off to the real proc. While doing the swapping, the
|
||||||
|
length field is not validated, which can cause memory corruption.
|
||||||
|
|
||||||
|
v2: reorder checks to avoid compilers optimizing out checks for overflow
|
||||||
|
that happen after we'd already have done the overflowing multiplications.
|
||||||
|
|
||||||
|
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
(cherry picked from commit 2ef42519c41e793579c9cea699c866fee3d9321f)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit db386cd6a1ccf62d3be9fc88994d48ef9f8375cf
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Wed Jan 22 23:40:18 2014 -0800
|
||||||
|
|
||||||
|
dri2: integer overflow in ProcDRI2GetBuffers() [CVE-2014-8094]
|
||||||
|
|
||||||
|
ProcDRI2GetBuffers() tries to validate a length field (count).
|
||||||
|
There is an integer overflow in the validation. This can cause
|
||||||
|
out of bound reads and memory corruption later on.
|
||||||
|
|
||||||
|
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
Reviewed-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
(cherry picked from commit 6692670fde081bbfe9313f17d84037ae9116702a)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 2883994f9f2d5cae63816db6945dfea618e4a2ee
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Wed Jan 22 23:44:46 2014 -0800
|
||||||
|
|
||||||
|
dix: integer overflow in REQUEST_FIXED_SIZE() [CVE-2014-8092 4/4]
|
||||||
|
|
||||||
|
Force use of 64-bit integers when evaluating data provided by clients
|
||||||
|
in 32-bit fields which can overflow when added or multiplied during
|
||||||
|
checks.
|
||||||
|
|
||||||
|
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
(cherry picked from commit e0e11644622a589129a01e11e5d105dc74a098de)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit c2515e9dfd5642e90f2b2526db02afc4ad217a53
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Wed Jan 22 22:37:15 2014 -0800
|
||||||
|
|
||||||
|
dix: integer overflow in RegionSizeof() [CVE-2014-8092 3/4]
|
||||||
|
|
||||||
|
RegionSizeof contains several integer overflows if a large length
|
||||||
|
value is passed in. Once we fix it to return 0 on overflow, we
|
||||||
|
also have to fix the callers to handle this error condition
|
||||||
|
|
||||||
|
v2: Fixed limit calculation in RegionSizeof as pointed out by jcristau.
|
||||||
|
|
||||||
|
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
Reviewed-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
(cherry picked from commit 97015a07b9e15d8ec5608b95d95ec0eb51202acb)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit cbfdb284c943c202c1fd47e560bd980a74dd662b
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Mon Jan 6 23:30:14 2014 -0800
|
||||||
|
|
||||||
|
dix: integer overflow in GetHosts() [CVE-2014-8092 2/4]
|
||||||
|
|
||||||
|
GetHosts() iterates over all the hosts it has in memory, and copies
|
||||||
|
them to a buffer. The buffer length is calculated by iterating over
|
||||||
|
all the hosts and adding up all of their combined length. There is a
|
||||||
|
potential integer overflow, if there are lots and lots of hosts (with
|
||||||
|
a combined length of > ~4 gig). This should be possible by repeatedly
|
||||||
|
calling ProcChangeHosts() on 64bit machines with enough memory.
|
||||||
|
|
||||||
|
This patch caps the list at 1mb, because multi-megabyte hostname
|
||||||
|
lists for X access control are insane.
|
||||||
|
|
||||||
|
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
(cherry picked from commit bc8e20430b6f6378daf6ce4329029248a88af08b)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit b022d4ef9d89c806024bd0cd367da1b249cc2b2d
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Wed Jan 22 21:11:16 2014 -0800
|
||||||
|
|
||||||
|
dix: integer overflow in ProcPutImage() [CVE-2014-8092 1/4]
|
||||||
|
|
||||||
|
ProcPutImage() calculates a length field from a width, left pad and depth
|
||||||
|
specified by the client (if the specified format is XYPixmap).
|
||||||
|
|
||||||
|
The calculations for the total amount of memory the server needs for the
|
||||||
|
pixmap can overflow a 32-bit number, causing out-of-bounds memory writes
|
||||||
|
on 32-bit systems (since the length is stored in a long int variable).
|
||||||
|
|
||||||
|
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
(cherry picked from commit eeae42d60bf3d5663ea088581f6c28a82cd17829)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit f1365eb0ec50bee7d99d4659319c4d93eb21642a
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Fri Jan 17 18:54:03 2014 -0800
|
||||||
|
|
||||||
|
unchecked malloc may allow unauthed client to crash Xserver [CVE-2014-8091]
|
||||||
|
|
||||||
|
authdes_ezdecode() calls malloc() using a length provided by the
|
||||||
|
connection handshake sent by a newly connected client in order
|
||||||
|
to authenticate to the server, so should be treated as untrusted.
|
||||||
|
|
||||||
|
It didn't check if malloc() failed before writing to the newly
|
||||||
|
allocated buffer, so could lead to a server crash if the server
|
||||||
|
fails to allocate memory (up to UINT16_MAX bytes, since the len
|
||||||
|
field is a CARD16 in the X protocol).
|
||||||
|
|
||||||
|
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
(cherry picked from commit 90cc925c5991fcb203f72d00b04419cd754a9b2c)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 07b01bb5bd3587cd14d9dd2c8f4b145cf1757fe5
|
||||||
|
Author: Keith Packard <keithp@keithp.com>
|
||||||
|
Date: Thu Oct 9 15:17:17 2014 +0200
|
||||||
|
|
||||||
|
glx: check return from __glXGetAnswerBuffer
|
||||||
|
|
||||||
|
This function can return NULL; make sure every caller tests for that.
|
||||||
|
|
||||||
|
Reviewed-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||||
|
(cherry picked from commit 61a292adf45405641de1c522a04c148e0a152acd)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit d1bd02fb6746a4393e2538bf605b610e1764a413
|
||||||
|
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
|
||||||
|
Date: Sat Dec 6 05:40:08 2014 +0100
|
||||||
|
|
||||||
|
present: Fix use of vsynced pageflips and honor PresentOptionAsync. (v4)
|
||||||
|
|
||||||
|
Pageflips for Pixmap presents were not synchronized to vblank on
|
||||||
|
drivers with support for PresentCapabilityAsync, due to some
|
||||||
|
missing init for vblank->sync_flips. The PresentOptionAsync
|
||||||
|
flag was completely ignored for pageflipped presents.
|
||||||
|
|
||||||
|
Vsynced flips only worked by accident on the intel-ddx, as that
|
||||||
|
driver doesn't have PresentCapabilityAsync support.
|
||||||
|
|
||||||
|
On nouveau-ddx, which supports PresentCapabilityAsync, this
|
||||||
|
always caused non-vsynced pageflips with pretty ugly tearing.
|
||||||
|
|
||||||
|
This patch fixes the problem, as tested on top of XOrg 1.16.2
|
||||||
|
on nouveau and intel.
|
||||||
|
|
||||||
|
v4: Add additional PresentCapabilityAsync caps check, as
|
||||||
|
suggested by Eric Anholt.
|
||||||
|
|
||||||
|
Please also apply to XOrg 1.17 and XOrg 1.16.2 stable.
|
||||||
|
|
||||||
|
Applying on top of XOrg 1.16.2 requires cherry-picking
|
||||||
|
commit 2051514652481a83bd7cf22e57cb0fcd40333f33
|
||||||
|
which trivially fixes lack of support for protocol option
|
||||||
|
PresentOptionCopy - get two bug fixes for the price of one!
|
||||||
|
|
||||||
|
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
|
||||||
|
Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||||
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||||
|
(cherry picked from commit aae6460694ac3667abb8c34fdf3a7dae524827a4)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 77ef968c86b4ed1accd6f04ef7bc3d9700c22ed2
|
||||||
|
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
|
||||||
|
Date: Sat Dec 6 05:40:07 2014 +0100
|
||||||
|
|
||||||
|
present: Avoid crashes in DebugPresent(), a bit more info.
|
||||||
|
|
||||||
|
DebugPresent() crashed the server when a dri3 drawable
|
||||||
|
was closed while a pageflipped present was still pending,
|
||||||
|
due to vblank->window-> Null-Ptr deref, so debug builds
|
||||||
|
caused new problems to debug.
|
||||||
|
|
||||||
|
E.g.,
|
||||||
|
|
||||||
|
glXSwapBuffers(...);
|
||||||
|
glXDestroyWindow(...);
|
||||||
|
-> Pageflip for non-existent window completes -> boom.
|
||||||
|
|
||||||
|
Also often happens when switching desktop compositor on/off
|
||||||
|
due to Present unflips, or when logging out of session.
|
||||||
|
|
||||||
|
Also add info if a Present is queued for copyswap or pageflip,
|
||||||
|
if the present is vsynced, and the serial no of the Present
|
||||||
|
request, to aid debugging of pageflip and vsync issues. The
|
||||||
|
serial number is useful as Mesa's dri3/present backend encodes
|
||||||
|
its sendSBC in the serial number, so one can easily correlate
|
||||||
|
server debug output with Mesa and with the SBC values returned
|
||||||
|
to actual OpenGL client applications via OML_sync_control and
|
||||||
|
INTEL_swap_events extension, makes debugging quite a bit more
|
||||||
|
easy.
|
||||||
|
|
||||||
|
Please also cherry-pick this for a 1.16.x stable update.
|
||||||
|
|
||||||
|
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
|
||||||
|
Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||||
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||||
|
(cherry picked from commit 32d3100bd78efe41d468f7d66861296aee468b6f)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit f1fc86d61ed97f21579d2125c26de858c1d3ee43
|
||||||
|
Author: Keith Packard <keithp@keithp.com>
|
||||||
|
Date: Wed Sep 10 14:02:13 2014 -0700
|
||||||
|
|
||||||
|
present: Support PresentOptionCopy
|
||||||
|
|
||||||
|
We added this option to the present protocol before 1.0 but somehow
|
||||||
|
never implemented it in the server. It's pretty simple; just don't
|
||||||
|
ever do flips if the application specifies Copy.
|
||||||
|
|
||||||
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||||
|
Reviewed-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
(cherry picked from commit 2051514652481a83bd7cf22e57cb0fcd40333f33)
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit 386329ec7238edfd1b680c4a7acd39947a161ab5
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Mon Dec 1 14:26:11 2014 -0800
|
||||||
|
|
||||||
|
Add -iglx & +iglx to Xserver.man
|
||||||
|
|
||||||
|
Covers the current state after commits 99f0365b1fbdfd9238b9f,
|
||||||
|
d0da0e9c3bb8fe0cd4879, & e3aa13b8d63ea2fba6eb4 were all applied.
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Reviewed-by: James Jones <jajones@nvidia.com>
|
||||||
|
Reviewed-by: Robert Morell <rmorell@nvidia.com>
|
||||||
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||||
|
(cherry picked from commit b09d59342804db7dbb8056dca43dd39f54e290aa)
|
||||||
|
|
||||||
|
[alanc: Modified for server-1.16-branch to show +iglx as default instead of
|
||||||
|
-iglx, to match code in os/utils.c in server-1.16-branch.]
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
|
||||||
|
commit a471a15c779377073fd5d6bb8cff40dff917eca9
|
||||||
|
Author: Alex Orange <crazycasta@gmail.com>
|
||||||
|
Date: Fri Oct 3 15:41:38 2014 -0600
|
||||||
|
|
||||||
|
fb: Fix Bresenham algorithms for commonly used small segments.
|
||||||
|
|
||||||
|
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=54168
|
||||||
|
|
||||||
|
Fix errors introducted in 863d528a9f76d0e8f122aebf19f8564a4c67a938. Said
|
||||||
|
patch does indeed remove the problematic writes to bad memory, however
|
||||||
|
it also introduces errors in the algoritm. This patch has the effect of
|
||||||
|
reverting said patch and adding an if in the proper location to catch
|
||||||
|
the out of bounds memory write without causing problems to the overall
|
||||||
|
algorithm.
|
||||||
|
|
||||||
|
Signed-off-by: Alex Orange <crazycasta@gmail.com>
|
||||||
|
Reviewed-by: Peter Harris <pharris@opentext.com>
|
||||||
|
Tested-by: Peter Harris <pharris@opentext.com>
|
||||||
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||||
|
(cherry picked from commit 1b94fd77792310c80b0a2bcf4bf6d4e4c4c23bca)
|
||||||
|
|
||||||
commit 4393c7f1ba6140a02232f04fbb434a80d663a99d
|
commit 4393c7f1ba6140a02232f04fbb434a80d663a99d
|
||||||
Author: Julien Cristau <jcristau@debian.org>
|
Author: Julien Cristau <jcristau@debian.org>
|
||||||
Date: Mon Nov 10 16:38:52 2014 +0100
|
Date: Mon Nov 10 16:38:52 2014 +0100
|
||||||
|
|||||||
25
xserver/configure
vendored
25
xserver/configure
vendored
@ -1,6 +1,6 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.69 for xorg-server 1.16.2.
|
# Generated by GNU Autoconf 2.69 for xorg-server 1.16.3.
|
||||||
#
|
#
|
||||||
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||||
#
|
#
|
||||||
@ -651,8 +651,8 @@ MAKEFLAGS=
|
|||||||
# Identity of this package.
|
# Identity of this package.
|
||||||
PACKAGE_NAME='xorg-server'
|
PACKAGE_NAME='xorg-server'
|
||||||
PACKAGE_TARNAME='xorg-server'
|
PACKAGE_TARNAME='xorg-server'
|
||||||
PACKAGE_VERSION='1.16.2'
|
PACKAGE_VERSION='1.16.3'
|
||||||
PACKAGE_STRING='xorg-server 1.16.2'
|
PACKAGE_STRING='xorg-server 1.16.3'
|
||||||
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
||||||
PACKAGE_URL=''
|
PACKAGE_URL=''
|
||||||
|
|
||||||
@ -2063,7 +2063,7 @@ if test "$ac_init_help" = "long"; then
|
|||||||
# Omit some internal or obsolete options to make the list less imposing.
|
# Omit some internal or obsolete options to make the list less imposing.
|
||||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||||
cat <<_ACEOF
|
cat <<_ACEOF
|
||||||
\`configure' configures xorg-server 1.16.2 to adapt to many kinds of systems.
|
\`configure' configures xorg-server 1.16.3 to adapt to many kinds of systems.
|
||||||
|
|
||||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||||
|
|
||||||
@ -2133,7 +2133,7 @@ fi
|
|||||||
|
|
||||||
if test -n "$ac_init_help"; then
|
if test -n "$ac_init_help"; then
|
||||||
case $ac_init_help in
|
case $ac_init_help in
|
||||||
short | recursive ) echo "Configuration of xorg-server 1.16.2:";;
|
short | recursive ) echo "Configuration of xorg-server 1.16.3:";;
|
||||||
esac
|
esac
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
|
|
||||||
@ -2579,7 +2579,7 @@ fi
|
|||||||
test -n "$ac_init_help" && exit $ac_status
|
test -n "$ac_init_help" && exit $ac_status
|
||||||
if $ac_init_version; then
|
if $ac_init_version; then
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
xorg-server configure 1.16.2
|
xorg-server configure 1.16.3
|
||||||
generated by GNU Autoconf 2.69
|
generated by GNU Autoconf 2.69
|
||||||
|
|
||||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||||
@ -3288,7 +3288,7 @@ cat >config.log <<_ACEOF
|
|||||||
This file contains any messages produced by compilers while
|
This file contains any messages produced by compilers while
|
||||||
running configure, to aid debugging if configure makes a mistake.
|
running configure, to aid debugging if configure makes a mistake.
|
||||||
|
|
||||||
It was created by xorg-server $as_me 1.16.2, which was
|
It was created by xorg-server $as_me 1.16.3, which was
|
||||||
generated by GNU Autoconf 2.69. Invocation command line was
|
generated by GNU Autoconf 2.69. Invocation command line was
|
||||||
|
|
||||||
$ $0 $@
|
$ $0 $@
|
||||||
@ -3636,7 +3636,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
|
|||||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||||
|
|
||||||
|
|
||||||
RELEASE_DATE="2014-11-10"
|
RELEASE_DATE="2014-12-20"
|
||||||
RELEASE_NAME="Marionberry Pie"
|
RELEASE_NAME="Marionberry Pie"
|
||||||
|
|
||||||
|
|
||||||
@ -4116,7 +4116,7 @@ fi
|
|||||||
|
|
||||||
# Define the identity of the package.
|
# Define the identity of the package.
|
||||||
PACKAGE='xorg-server'
|
PACKAGE='xorg-server'
|
||||||
VERSION='1.16.2'
|
VERSION='1.16.3'
|
||||||
|
|
||||||
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
cat >>confdefs.h <<_ACEOF
|
||||||
@ -31664,7 +31664,7 @@ $as_echo "$as_me: WARNING:
|
|||||||
***********************************************" >&2;}
|
***********************************************" >&2;}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ac_config_files="$ac_config_files Makefile glx/Makefile include/Makefile composite/Makefile damageext/Makefile dbe/Makefile dix/Makefile doc/Makefile doc/dtrace/Makefile man/Makefile fb/Makefile glamor/Makefile record/Makefile config/Makefile mi/Makefile miext/Makefile miext/sync/Makefile miext/damage/Makefile miext/shadow/Makefile miext/rootless/Makefile os/Makefile pseudoramiX/Makefile randr/Makefile render/Makefile xkb/Makefile Xext/Makefile Xi/Makefile xfixes/Makefile exa/Makefile dri3/Makefile present/Makefile hw/Makefile hw/xfree86/Makefile hw/xfree86/Xorg.sh hw/xfree86/common/Makefile hw/xfree86/common/xf86Build.h hw/xfree86/ddc/Makefile hw/xfree86/dixmods/Makefile hw/xfree86/doc/Makefile hw/xfree86/dri/Makefile hw/xfree86/dri2/Makefile hw/xfree86/exa/Makefile hw/xfree86/exa/man/Makefile hw/xfree86/fbdevhw/Makefile hw/xfree86/fbdevhw/man/Makefile hw/xfree86/glamor_egl/Makefile hw/xfree86/i2c/Makefile hw/xfree86/int10/Makefile hw/xfree86/loader/Makefile hw/xfree86/man/Makefile hw/xfree86/modes/Makefile hw/xfree86/os-support/Makefile hw/xfree86/os-support/bsd/Makefile hw/xfree86/os-support/bus/Makefile hw/xfree86/os-support/hurd/Makefile hw/xfree86/os-support/misc/Makefile hw/xfree86/os-support/linux/Makefile hw/xfree86/os-support/solaris/Makefile hw/xfree86/os-support/stub/Makefile hw/xfree86/parser/Makefile hw/xfree86/ramdac/Makefile hw/xfree86/shadowfb/Makefile hw/xfree86/vbe/Makefile hw/xfree86/vgahw/Makefile hw/xfree86/x86emu/Makefile hw/xfree86/utils/Makefile hw/xfree86/utils/man/Makefile hw/xfree86/utils/cvt/Makefile hw/xfree86/utils/gtf/Makefile hw/dmx/config/Makefile hw/dmx/config/man/Makefile hw/dmx/doc/Makefile hw/dmx/doxygen/doxygen.conf hw/dmx/doxygen/Makefile hw/dmx/examples/Makefile hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/dmx/man/Makefile hw/vfb/Makefile hw/vfb/man/Makefile hw/xnest/Makefile hw/xnest/man/Makefile hw/xwin/Makefile hw/xwin/glx/Makefile hw/xwin/man/Makefile hw/xquartz/Makefile hw/xquartz/GL/Makefile hw/xquartz/bundle/Makefile hw/xquartz/man/Makefile hw/xquartz/mach-startup/Makefile hw/xquartz/pbproxy/Makefile hw/xquartz/xpr/Makefile hw/kdrive/Makefile hw/kdrive/ephyr/Makefile hw/kdrive/ephyr/man/Makefile hw/kdrive/fake/Makefile hw/kdrive/fbdev/Makefile hw/kdrive/linux/Makefile hw/kdrive/openbsd/Makefile hw/kdrive/src/Makefile hw/kdrive/wscons/Makefile hw/xwayland/Makefile test/Makefile test/xi2/Makefile xserver.ent xorg-server.pc"
|
ac_config_files="$ac_config_files Makefile glx/Makefile include/Makefile composite/Makefile damageext/Makefile dbe/Makefile dix/Makefile doc/Makefile doc/dtrace/Makefile man/Makefile fb/Makefile glamor/Makefile record/Makefile config/Makefile mi/Makefile miext/Makefile miext/sync/Makefile miext/damage/Makefile miext/shadow/Makefile miext/rootless/Makefile os/Makefile pseudoramiX/Makefile randr/Makefile render/Makefile xkb/Makefile Xext/Makefile Xi/Makefile xfixes/Makefile exa/Makefile dri3/Makefile present/Makefile hw/Makefile hw/xfree86/Makefile hw/xfree86/Xorg.sh hw/xfree86/common/Makefile hw/xfree86/common/xf86Build.h hw/xfree86/ddc/Makefile hw/xfree86/dixmods/Makefile hw/xfree86/doc/Makefile hw/xfree86/dri/Makefile hw/xfree86/dri2/Makefile hw/xfree86/exa/Makefile hw/xfree86/exa/man/Makefile hw/xfree86/fbdevhw/Makefile hw/xfree86/fbdevhw/man/Makefile hw/xfree86/glamor_egl/Makefile hw/xfree86/i2c/Makefile hw/xfree86/int10/Makefile hw/xfree86/loader/Makefile hw/xfree86/man/Makefile hw/xfree86/modes/Makefile hw/xfree86/os-support/Makefile hw/xfree86/os-support/bsd/Makefile hw/xfree86/os-support/bus/Makefile hw/xfree86/os-support/hurd/Makefile hw/xfree86/os-support/misc/Makefile hw/xfree86/os-support/linux/Makefile hw/xfree86/os-support/solaris/Makefile hw/xfree86/os-support/stub/Makefile hw/xfree86/parser/Makefile hw/xfree86/ramdac/Makefile hw/xfree86/shadowfb/Makefile hw/xfree86/vbe/Makefile hw/xfree86/vgahw/Makefile hw/xfree86/x86emu/Makefile hw/xfree86/utils/Makefile hw/xfree86/utils/man/Makefile hw/xfree86/utils/cvt/Makefile hw/xfree86/utils/gtf/Makefile hw/dmx/config/Makefile hw/dmx/config/man/Makefile hw/dmx/doc/Makefile hw/dmx/doxygen/doxygen.conf hw/dmx/doxygen/Makefile hw/dmx/examples/Makefile hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/dmx/man/Makefile hw/vfb/Makefile hw/vfb/man/Makefile hw/xnest/Makefile hw/xnest/man/Makefile hw/xwin/Makefile hw/xwin/glx/Makefile hw/xwin/man/Makefile hw/xquartz/Makefile hw/xquartz/GL/Makefile hw/xquartz/bundle/Makefile hw/xquartz/man/Makefile hw/xquartz/mach-startup/Makefile hw/xquartz/pbproxy/Makefile hw/xquartz/xpr/Makefile hw/kdrive/Makefile hw/kdrive/ephyr/Makefile hw/kdrive/ephyr/man/Makefile hw/kdrive/fake/Makefile hw/kdrive/fbdev/Makefile hw/kdrive/linux/Makefile hw/kdrive/openbsd/Makefile hw/kdrive/src/Makefile hw/kdrive/wscons/Makefile hw/xwayland/Makefile test/Makefile test/xi1/Makefile test/xi2/Makefile xserver.ent xorg-server.pc"
|
||||||
|
|
||||||
cat >confcache <<\_ACEOF
|
cat >confcache <<\_ACEOF
|
||||||
# This file is a shell script that caches the results of configure
|
# This file is a shell script that caches the results of configure
|
||||||
@ -32693,7 +32693,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||||||
# report actual input values of CONFIG_FILES etc. instead of their
|
# report actual input values of CONFIG_FILES etc. instead of their
|
||||||
# values after options handling.
|
# values after options handling.
|
||||||
ac_log="
|
ac_log="
|
||||||
This file was extended by xorg-server $as_me 1.16.2, which was
|
This file was extended by xorg-server $as_me 1.16.3, which was
|
||||||
generated by GNU Autoconf 2.69. Invocation command line was
|
generated by GNU Autoconf 2.69. Invocation command line was
|
||||||
|
|
||||||
CONFIG_FILES = $CONFIG_FILES
|
CONFIG_FILES = $CONFIG_FILES
|
||||||
@ -32759,7 +32759,7 @@ _ACEOF
|
|||||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||||
ac_cs_version="\\
|
ac_cs_version="\\
|
||||||
xorg-server config.status 1.16.2
|
xorg-server config.status 1.16.3
|
||||||
configured by $0, generated by GNU Autoconf 2.69,
|
configured by $0, generated by GNU Autoconf 2.69,
|
||||||
with options \\"\$ac_cs_config\\"
|
with options \\"\$ac_cs_config\\"
|
||||||
|
|
||||||
@ -33282,6 +33282,7 @@ do
|
|||||||
"hw/kdrive/wscons/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/wscons/Makefile" ;;
|
"hw/kdrive/wscons/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/wscons/Makefile" ;;
|
||||||
"hw/xwayland/Makefile") CONFIG_FILES="$CONFIG_FILES hw/xwayland/Makefile" ;;
|
"hw/xwayland/Makefile") CONFIG_FILES="$CONFIG_FILES hw/xwayland/Makefile" ;;
|
||||||
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
|
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
|
||||||
|
"test/xi1/Makefile") CONFIG_FILES="$CONFIG_FILES test/xi1/Makefile" ;;
|
||||||
"test/xi2/Makefile") CONFIG_FILES="$CONFIG_FILES test/xi2/Makefile" ;;
|
"test/xi2/Makefile") CONFIG_FILES="$CONFIG_FILES test/xi2/Makefile" ;;
|
||||||
"xserver.ent") CONFIG_FILES="$CONFIG_FILES xserver.ent" ;;
|
"xserver.ent") CONFIG_FILES="$CONFIG_FILES xserver.ent" ;;
|
||||||
"xorg-server.pc") CONFIG_FILES="$CONFIG_FILES xorg-server.pc" ;;
|
"xorg-server.pc") CONFIG_FILES="$CONFIG_FILES xorg-server.pc" ;;
|
||||||
|
|||||||
@ -26,8 +26,8 @@ dnl
|
|||||||
dnl Process this file with autoconf to create configure.
|
dnl Process this file with autoconf to create configure.
|
||||||
|
|
||||||
AC_PREREQ(2.60)
|
AC_PREREQ(2.60)
|
||||||
AC_INIT([xorg-server], 1.16.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
|
AC_INIT([xorg-server], 1.16.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
|
||||||
RELEASE_DATE="2014-11-10"
|
RELEASE_DATE="2014-12-20"
|
||||||
RELEASE_NAME="Marionberry Pie"
|
RELEASE_NAME="Marionberry Pie"
|
||||||
AC_CONFIG_SRCDIR([Makefile.am])
|
AC_CONFIG_SRCDIR([Makefile.am])
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
@ -2688,6 +2688,7 @@ hw/kdrive/src/Makefile
|
|||||||
hw/kdrive/wscons/Makefile
|
hw/kdrive/wscons/Makefile
|
||||||
hw/xwayland/Makefile
|
hw/xwayland/Makefile
|
||||||
test/Makefile
|
test/Makefile
|
||||||
|
test/xi1/Makefile
|
||||||
test/xi2/Makefile
|
test/xi2/Makefile
|
||||||
xserver.ent
|
xserver.ent
|
||||||
xorg-server.pc
|
xorg-server.pc
|
||||||
|
|||||||
@ -452,6 +452,7 @@ ProcDbeSwapBuffers(ClientPtr client)
|
|||||||
int error;
|
int error;
|
||||||
unsigned int i, j;
|
unsigned int i, j;
|
||||||
unsigned int nStuff;
|
unsigned int nStuff;
|
||||||
|
int nStuff_i; /* DDX API requires int for nStuff */
|
||||||
|
|
||||||
REQUEST_AT_LEAST_SIZE(xDbeSwapBuffersReq);
|
REQUEST_AT_LEAST_SIZE(xDbeSwapBuffersReq);
|
||||||
nStuff = stuff->n; /* use local variable for performance. */
|
nStuff = stuff->n; /* use local variable for performance. */
|
||||||
@ -527,9 +528,10 @@ ProcDbeSwapBuffers(ClientPtr client)
|
|||||||
* could deal with cross-screen synchronization.
|
* could deal with cross-screen synchronization.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
while (nStuff > 0) {
|
nStuff_i = nStuff;
|
||||||
|
while (nStuff_i > 0) {
|
||||||
pDbeScreenPriv = DBE_SCREEN_PRIV_FROM_WINDOW(swapInfo[0].pWindow);
|
pDbeScreenPriv = DBE_SCREEN_PRIV_FROM_WINDOW(swapInfo[0].pWindow);
|
||||||
error = (*pDbeScreenPriv->SwapBuffers) (client, &nStuff, swapInfo);
|
error = (*pDbeScreenPriv->SwapBuffers) (client, &nStuff_i, swapInfo);
|
||||||
if (error != Success) {
|
if (error != Success) {
|
||||||
free(swapInfo);
|
free(swapInfo);
|
||||||
return error;
|
return error;
|
||||||
|
|||||||
@ -65,12 +65,6 @@ fbBresSolid(DrawablePtr pDrawable,
|
|||||||
if (axis == X_AXIS) {
|
if (axis == X_AXIS) {
|
||||||
bits = 0;
|
bits = 0;
|
||||||
while (len--) {
|
while (len--) {
|
||||||
if (e >= 0) {
|
|
||||||
WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, bits));
|
|
||||||
bits = 0;
|
|
||||||
dst += dstStride;
|
|
||||||
e += e3;
|
|
||||||
}
|
|
||||||
bits |= mask;
|
bits |= mask;
|
||||||
mask = fbBresShiftMask(mask, signdx, dstBpp);
|
mask = fbBresShiftMask(mask, signdx, dstBpp);
|
||||||
if (!mask) {
|
if (!mask) {
|
||||||
@ -80,12 +74,23 @@ fbBresSolid(DrawablePtr pDrawable,
|
|||||||
mask = mask0;
|
mask = mask0;
|
||||||
}
|
}
|
||||||
e += e1;
|
e += e1;
|
||||||
|
if (e >= 0) {
|
||||||
|
if (bits) {
|
||||||
|
WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, bits));
|
||||||
|
bits = 0;
|
||||||
|
}
|
||||||
|
dst += dstStride;
|
||||||
|
e += e3;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (bits)
|
if (bits)
|
||||||
WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, bits));
|
WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, bits));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
while (len--) {
|
while (len--) {
|
||||||
|
WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, mask));
|
||||||
|
dst += dstStride;
|
||||||
|
e += e1;
|
||||||
if (e >= 0) {
|
if (e >= 0) {
|
||||||
e += e3;
|
e += e3;
|
||||||
mask = fbBresShiftMask(mask, signdx, dstBpp);
|
mask = fbBresShiftMask(mask, signdx, dstBpp);
|
||||||
@ -94,9 +99,6 @@ fbBresSolid(DrawablePtr pDrawable,
|
|||||||
mask = mask0;
|
mask = mask0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, mask));
|
|
||||||
dst += dstStride;
|
|
||||||
e += e1;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -36,13 +36,14 @@ set_client_info(__GLXclientState * cl, xGLXSetClientInfoARBReq * req,
|
|||||||
ClientPtr client = cl->client;
|
ClientPtr client = cl->client;
|
||||||
char *gl_extensions;
|
char *gl_extensions;
|
||||||
char *glx_extensions;
|
char *glx_extensions;
|
||||||
|
int size;
|
||||||
|
|
||||||
REQUEST_AT_LEAST_SIZE(xGLXSetClientInfoARBReq);
|
REQUEST_AT_LEAST_SIZE(xGLXSetClientInfoARBReq);
|
||||||
|
|
||||||
/* Verify that the size of the packet matches the size inferred from the
|
/* Verify that the size of the packet matches the size inferred from the
|
||||||
* sizes specified for the various fields.
|
* sizes specified for the various fields.
|
||||||
*/
|
*/
|
||||||
int size = sz_xGLXSetClientInfoARBReq;
|
size = sz_xGLXSetClientInfoARBReq;
|
||||||
size = safe_add(size, safe_mul(req->numVersions, bytes_per_version));
|
size = safe_add(size, safe_mul(req->numVersions, bytes_per_version));
|
||||||
size = safe_add(size, safe_pad(req->numGLExtensionBytes));
|
size = safe_add(size, safe_pad(req->numGLExtensionBytes));
|
||||||
size = safe_add(size, safe_pad(req->numGLXExtensionBytes));
|
size = safe_add(size, safe_pad(req->numGLXExtensionBytes));
|
||||||
|
|||||||
@ -67,7 +67,7 @@ __glXDisp_ReadPixels(__GLXclientState * cl, GLbyte * pc)
|
|||||||
lsbFirst = *(GLboolean *) (pc + 25);
|
lsbFirst = *(GLboolean *) (pc + 25);
|
||||||
compsize = __glReadPixels_size(format, type, width, height);
|
compsize = __glReadPixels_size(format, type, width, height);
|
||||||
if (compsize < 0)
|
if (compsize < 0)
|
||||||
compsize = 0;
|
return BadLength;
|
||||||
|
|
||||||
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
|
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
|
||||||
glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
|
glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
|
||||||
@ -128,7 +128,7 @@ __glXDisp_GetTexImage(__GLXclientState * cl, GLbyte * pc)
|
|||||||
compsize =
|
compsize =
|
||||||
__glGetTexImage_size(target, level, format, type, width, height, depth);
|
__glGetTexImage_size(target, level, format, type, width, height, depth);
|
||||||
if (compsize < 0)
|
if (compsize < 0)
|
||||||
compsize = 0;
|
return BadLength;
|
||||||
|
|
||||||
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
|
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
|
||||||
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
||||||
@ -224,9 +224,9 @@ GetSeparableFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
|
|||||||
compsize2 = __glGetTexImage_size(target, 1, format, type, height, 1, 1);
|
compsize2 = __glGetTexImage_size(target, 1, format, type, height, 1, 1);
|
||||||
|
|
||||||
if ((compsize = safe_pad(compsize)) < 0)
|
if ((compsize = safe_pad(compsize)) < 0)
|
||||||
compsize = 0;
|
return BadLength;
|
||||||
if ((compsize2 = safe_pad(compsize2)) < 0)
|
if ((compsize2 = safe_pad(compsize2)) < 0)
|
||||||
compsize2 = 0;
|
return BadLength;
|
||||||
|
|
||||||
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
|
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
|
||||||
__GLX_GET_ANSWER_BUFFER(answer, cl, safe_add(compsize, compsize2), 1);
|
__GLX_GET_ANSWER_BUFFER(answer, cl, safe_add(compsize, compsize2), 1);
|
||||||
@ -302,7 +302,7 @@ GetConvolutionFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
|
|||||||
*/
|
*/
|
||||||
compsize = __glGetTexImage_size(target, 1, format, type, width, height, 1);
|
compsize = __glGetTexImage_size(target, 1, format, type, width, height, 1);
|
||||||
if (compsize < 0)
|
if (compsize < 0)
|
||||||
compsize = 0;
|
return BadLength;
|
||||||
|
|
||||||
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
|
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
|
||||||
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
||||||
@ -373,7 +373,7 @@ GetHistogram(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
|
|||||||
*/
|
*/
|
||||||
compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1);
|
compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1);
|
||||||
if (compsize < 0)
|
if (compsize < 0)
|
||||||
compsize = 0;
|
return BadLength;
|
||||||
|
|
||||||
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
|
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
|
||||||
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
||||||
@ -436,7 +436,7 @@ GetMinmax(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
|
|||||||
|
|
||||||
compsize = __glGetTexImage_size(target, 1, format, type, 2, 1, 1);
|
compsize = __glGetTexImage_size(target, 1, format, type, 2, 1, 1);
|
||||||
if (compsize < 0)
|
if (compsize < 0)
|
||||||
compsize = 0;
|
return BadLength;
|
||||||
|
|
||||||
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
|
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
|
||||||
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
||||||
@ -503,7 +503,7 @@ GetColorTable(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
|
|||||||
*/
|
*/
|
||||||
compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1);
|
compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1);
|
||||||
if (compsize < 0)
|
if (compsize < 0)
|
||||||
compsize = 0;
|
return BadLength;
|
||||||
|
|
||||||
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
|
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
|
||||||
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
||||||
|
|||||||
@ -77,7 +77,7 @@ __glXDispSwap_ReadPixels(__GLXclientState * cl, GLbyte * pc)
|
|||||||
lsbFirst = *(GLboolean *) (pc + 25);
|
lsbFirst = *(GLboolean *) (pc + 25);
|
||||||
compsize = __glReadPixels_size(format, type, width, height);
|
compsize = __glReadPixels_size(format, type, width, height);
|
||||||
if (compsize < 0)
|
if (compsize < 0)
|
||||||
compsize = 0;
|
return BadLength;
|
||||||
|
|
||||||
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
|
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
|
||||||
glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
|
glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
|
||||||
@ -148,7 +148,7 @@ __glXDispSwap_GetTexImage(__GLXclientState * cl, GLbyte * pc)
|
|||||||
compsize =
|
compsize =
|
||||||
__glGetTexImage_size(target, level, format, type, width, height, depth);
|
__glGetTexImage_size(target, level, format, type, width, height, depth);
|
||||||
if (compsize < 0)
|
if (compsize < 0)
|
||||||
compsize = 0;
|
return BadLength;
|
||||||
|
|
||||||
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
|
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
|
||||||
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
||||||
@ -258,9 +258,9 @@ GetSeparableFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
|
|||||||
compsize2 = __glGetTexImage_size(target, 1, format, type, height, 1, 1);
|
compsize2 = __glGetTexImage_size(target, 1, format, type, height, 1, 1);
|
||||||
|
|
||||||
if ((compsize = safe_pad(compsize)) < 0)
|
if ((compsize = safe_pad(compsize)) < 0)
|
||||||
compsize = 0;
|
return BadLength;
|
||||||
if ((compsize2 = safe_pad(compsize2)) < 0)
|
if ((compsize2 = safe_pad(compsize2)) < 0)
|
||||||
compsize2 = 0;
|
return BadLength;
|
||||||
|
|
||||||
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
|
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
|
||||||
__GLX_GET_ANSWER_BUFFER(answer, cl, safe_add(compsize, compsize2), 1);
|
__GLX_GET_ANSWER_BUFFER(answer, cl, safe_add(compsize, compsize2), 1);
|
||||||
@ -346,7 +346,7 @@ GetConvolutionFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
|
|||||||
*/
|
*/
|
||||||
compsize = __glGetTexImage_size(target, 1, format, type, width, height, 1);
|
compsize = __glGetTexImage_size(target, 1, format, type, width, height, 1);
|
||||||
if (compsize < 0)
|
if (compsize < 0)
|
||||||
compsize = 0;
|
return BadLength;
|
||||||
|
|
||||||
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
|
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
|
||||||
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
||||||
@ -427,7 +427,7 @@ GetHistogram(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
|
|||||||
*/
|
*/
|
||||||
compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1);
|
compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1);
|
||||||
if (compsize < 0)
|
if (compsize < 0)
|
||||||
compsize = 0;
|
return BadLength;
|
||||||
|
|
||||||
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
|
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
|
||||||
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
||||||
@ -499,7 +499,7 @@ GetMinmax(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
|
|||||||
|
|
||||||
compsize = __glGetTexImage_size(target, 1, format, type, 2, 1, 1);
|
compsize = __glGetTexImage_size(target, 1, format, type, 2, 1, 1);
|
||||||
if (compsize < 0)
|
if (compsize < 0)
|
||||||
compsize = 0;
|
return BadLength;
|
||||||
|
|
||||||
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
|
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
|
||||||
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
||||||
@ -574,7 +574,7 @@ GetColorTable(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
|
|||||||
*/
|
*/
|
||||||
compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1);
|
compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1);
|
||||||
if (compsize < 0)
|
if (compsize < 0)
|
||||||
compsize = 0;
|
return BadLength;
|
||||||
|
|
||||||
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
|
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
|
||||||
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
||||||
|
|||||||
@ -80,7 +80,7 @@ SOFTWARE.
|
|||||||
|
|
||||||
#define REQUEST_FIXED_SIZE(req, n)\
|
#define REQUEST_FIXED_SIZE(req, n)\
|
||||||
if (((sizeof(req) >> 2) > client->req_len) || \
|
if (((sizeof(req) >> 2) > client->req_len) || \
|
||||||
((n >> 2) >= client->req_len) || \
|
(((n) >> 2) >= client->req_len) || \
|
||||||
((((uint64_t) sizeof(req) + (n) + 3) >> 2) != (uint64_t) client->req_len)) \
|
((((uint64_t) sizeof(req) + (n) + 3) >> 2) != (uint64_t) client->req_len)) \
|
||||||
return(BadLength)
|
return(BadLength)
|
||||||
|
|
||||||
|
|||||||
@ -125,7 +125,7 @@ RegionEnd(RegionPtr reg)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static inline size_t
|
static inline size_t
|
||||||
RegionSizeof(unsigned int n)
|
RegionSizeof(int n)
|
||||||
{
|
{
|
||||||
if (n < ((INT_MAX - sizeof(RegDataRec)) / sizeof(BoxRec)))
|
if (n < ((INT_MAX - sizeof(RegDataRec)) / sizeof(BoxRec)))
|
||||||
return (sizeof(RegDataRec) + ((n) * sizeof(BoxRec)));
|
return (sizeof(RegDataRec) + ((n) * sizeof(BoxRec)));
|
||||||
|
|||||||
@ -181,6 +181,16 @@ prints a usage message.
|
|||||||
.B \-I
|
.B \-I
|
||||||
causes all remaining command line arguments to be ignored.
|
causes all remaining command line arguments to be ignored.
|
||||||
.TP 8
|
.TP 8
|
||||||
|
.B \-iglx
|
||||||
|
Prohibit creating indirect GLX contexts. Indirect GLX is of limited use,
|
||||||
|
since it lacks support for many modern OpenGL features and extensions;
|
||||||
|
it's slower than direct contexts; and it opens a large attack surface for
|
||||||
|
protocol parsing errors.
|
||||||
|
.TP 8
|
||||||
|
.B +iglx
|
||||||
|
Allow creating indirect GLX contexts.
|
||||||
|
This is the default unless \-iglx is specified.
|
||||||
|
.TP 8
|
||||||
.B \-maxbigreqsize \fIsize\fP
|
.B \-maxbigreqsize \fIsize\fP
|
||||||
sets the maximum big request to
|
sets the maximum big request to
|
||||||
.I size
|
.I size
|
||||||
|
|||||||
@ -1335,7 +1335,7 @@ GetHosts(void **data, int *pnHosts, int *pLen, BOOL * pEnabled)
|
|||||||
}
|
}
|
||||||
for (host = validhosts; host; host = host->next) {
|
for (host = validhosts; host; host = host->next) {
|
||||||
len = host->len;
|
len = host->len;
|
||||||
if ((ptr + sizeof(xHostEntry) + len) > (data + n))
|
if ((ptr + sizeof(xHostEntry) + len) > ((unsigned char *) *data + n))
|
||||||
break;
|
break;
|
||||||
((xHostEntry *) ptr)->family = host->family;
|
((xHostEntry *) ptr)->family = host->family;
|
||||||
((xHostEntry *) ptr)->length = len;
|
((xHostEntry *) ptr)->length = len;
|
||||||
|
|||||||
@ -435,7 +435,7 @@ present_flip_notify(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc)
|
|||||||
DebugPresent(("\tn %lld %p %8lld: %08lx -> %08lx\n",
|
DebugPresent(("\tn %lld %p %8lld: %08lx -> %08lx\n",
|
||||||
vblank->event_id, vblank, vblank->target_msc,
|
vblank->event_id, vblank, vblank->target_msc,
|
||||||
vblank->pixmap ? vblank->pixmap->drawable.id : 0,
|
vblank->pixmap ? vblank->pixmap->drawable.id : 0,
|
||||||
vblank->window->drawable.id));
|
vblank->window ? vblank->window->drawable.id : 0));
|
||||||
|
|
||||||
assert (vblank == screen_priv->flip_pending);
|
assert (vblank == screen_priv->flip_pending);
|
||||||
|
|
||||||
@ -829,10 +829,16 @@ present_pixmap(WindowPtr window,
|
|||||||
vblank->notifies = notifies;
|
vblank->notifies = notifies;
|
||||||
vblank->num_notifies = num_notifies;
|
vblank->num_notifies = num_notifies;
|
||||||
|
|
||||||
if (!screen_priv->info || !(screen_priv->info->capabilities & PresentCapabilityAsync))
|
if (!(options & PresentOptionAsync))
|
||||||
vblank->sync_flip = TRUE;
|
vblank->sync_flip = TRUE;
|
||||||
|
|
||||||
if (pixmap && present_check_flip (target_crtc, window, pixmap, vblank->sync_flip, valid, x_off, y_off)) {
|
if (!(options & PresentOptionCopy) &&
|
||||||
|
!((options & PresentOptionAsync) &&
|
||||||
|
(!screen_priv->info ||
|
||||||
|
!(screen_priv->info->capabilities & PresentCapabilityAsync))) &&
|
||||||
|
pixmap != NULL &&
|
||||||
|
present_check_flip (target_crtc, window, pixmap, vblank->sync_flip, valid, x_off, y_off))
|
||||||
|
{
|
||||||
vblank->flip = TRUE;
|
vblank->flip = TRUE;
|
||||||
if (vblank->sync_flip)
|
if (vblank->sync_flip)
|
||||||
target_msc--;
|
target_msc--;
|
||||||
@ -851,10 +857,10 @@ present_pixmap(WindowPtr window,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (pixmap)
|
if (pixmap)
|
||||||
DebugPresent(("q %lld %p %8lld: %08lx -> %08lx (crtc %p)\n",
|
DebugPresent(("q %lld %p %8lld: %08lx -> %08lx (crtc %p) flip %d vsync %d serial %d\n",
|
||||||
vblank->event_id, vblank, target_msc,
|
vblank->event_id, vblank, target_msc,
|
||||||
vblank->pixmap->drawable.id, vblank->window->drawable.id,
|
vblank->pixmap->drawable.id, vblank->window->drawable.id,
|
||||||
target_crtc));
|
target_crtc, vblank->flip, vblank->sync_flip, vblank->serial));
|
||||||
|
|
||||||
xorg_list_add(&vblank->event_queue, &present_exec_queue);
|
xorg_list_add(&vblank->event_queue, &present_exec_queue);
|
||||||
vblank->queued = TRUE;
|
vblank->queued = TRUE;
|
||||||
@ -946,7 +952,7 @@ present_vblank_destroy(present_vblank_ptr vblank)
|
|||||||
DebugPresent(("\td %lld %p %8lld: %08lx -> %08lx\n",
|
DebugPresent(("\td %lld %p %8lld: %08lx -> %08lx\n",
|
||||||
vblank->event_id, vblank, vblank->target_msc,
|
vblank->event_id, vblank, vblank->target_msc,
|
||||||
vblank->pixmap ? vblank->pixmap->drawable.id : 0,
|
vblank->pixmap ? vblank->pixmap->drawable.id : 0,
|
||||||
vblank->window->drawable.id));
|
vblank->window ? vblank->window->drawable.id : 0));
|
||||||
|
|
||||||
/* Drop pixmap reference */
|
/* Drop pixmap reference */
|
||||||
if (vblank->pixmap)
|
if (vblank->pixmap)
|
||||||
|
|||||||
@ -4,7 +4,7 @@ noinst_PROGRAMS = list string
|
|||||||
if XORG
|
if XORG
|
||||||
# Tests that require at least some DDX functions in order to fully link
|
# Tests that require at least some DDX functions in order to fully link
|
||||||
# For now, requires xf86 ddx, could be adjusted to use another
|
# For now, requires xf86 ddx, could be adjusted to use another
|
||||||
SUBDIRS += xi2
|
SUBDIRS += xi1 xi2
|
||||||
noinst_PROGRAMS += xkb input xtest misc fixes xfree86 hashtabletest os signal-logging touch
|
noinst_PROGRAMS += xkb input xtest misc fixes xfree86 hashtabletest os signal-logging touch
|
||||||
endif
|
endif
|
||||||
check_LTLIBRARIES = libxservertest.la
|
check_LTLIBRARIES = libxservertest.la
|
||||||
|
|||||||
@ -54,7 +54,7 @@ host_triplet = @host@
|
|||||||
@ENABLE_UNIT_TESTS_TRUE@ string$(EXEEXT) $(am__EXEEXT_1)
|
@ENABLE_UNIT_TESTS_TRUE@ string$(EXEEXT) $(am__EXEEXT_1)
|
||||||
# Tests that require at least some DDX functions in order to fully link
|
# Tests that require at least some DDX functions in order to fully link
|
||||||
# For now, requires xf86 ddx, could be adjusted to use another
|
# For now, requires xf86 ddx, could be adjusted to use another
|
||||||
@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@am__append_1 = xi2
|
@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@am__append_1 = xi1 xi2
|
||||||
@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@am__append_2 = xkb input xtest misc fixes xfree86 hashtabletest os signal-logging touch
|
@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@am__append_2 = xkb input xtest misc fixes xfree86 hashtabletest os signal-logging touch
|
||||||
@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@am__append_3 = -I$(top_srcdir)/hw/xfree86/parser \
|
@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@am__append_3 = -I$(top_srcdir)/hw/xfree86/parser \
|
||||||
@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@ -I$(top_srcdir)/hw/xfree86/ddc \
|
@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@ -I$(top_srcdir)/hw/xfree86/ddc \
|
||||||
@ -279,7 +279,7 @@ am__tty_colors_dummy = \
|
|||||||
mgn= red= grn= lgn= blu= brg= std=; \
|
mgn= red= grn= lgn= blu= brg= std=; \
|
||||||
am__color_tests=no
|
am__color_tests=no
|
||||||
am__tty_colors = $(am__tty_colors_dummy)
|
am__tty_colors = $(am__tty_colors_dummy)
|
||||||
DIST_SUBDIRS = . xi2
|
DIST_SUBDIRS = . xi1 xi2
|
||||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||||
am__relativize = \
|
am__relativize = \
|
||||||
dir0=`pwd`; \
|
dir0=`pwd`; \
|
||||||
|
|||||||
34
xserver/test/xi1/Makefile.am
Normal file
34
xserver/test/xi1/Makefile.am
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
if ENABLE_UNIT_TESTS
|
||||||
|
if HAVE_LD_WRAP
|
||||||
|
noinst_PROGRAMS = \
|
||||||
|
protocol-xchangedevicecontrol
|
||||||
|
|
||||||
|
TESTS=$(noinst_PROGRAMS)
|
||||||
|
TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV)
|
||||||
|
|
||||||
|
AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
|
||||||
|
AM_CPPFLAGS = @XORG_INCS@ -I$(srcdir)/../xi2
|
||||||
|
TEST_LDADD=../libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS)
|
||||||
|
COMMON_SOURCES=$(srcdir)/../xi2/protocol-common.c
|
||||||
|
|
||||||
|
if SPECIAL_DTRACE_OBJECTS
|
||||||
|
TEST_LDADD += $(OS_LIB) $(DIX_LIB)
|
||||||
|
endif
|
||||||
|
|
||||||
|
protocol_xchangedevicecontrol_LDADD=$(TEST_LDADD)
|
||||||
|
|
||||||
|
protocol_xchangedevicecontrol_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient
|
||||||
|
|
||||||
|
protocol_xchangedevicecontrol_SOURCES=$(COMMON_SOURCES) protocol-xchangedevicecontrol.c
|
||||||
|
|
||||||
|
else
|
||||||
|
# Print that xi1-tests were skipped (exit code 77 for automake test harness)
|
||||||
|
TESTS = xi1-tests
|
||||||
|
CLEANFILES = $(TESTS)
|
||||||
|
|
||||||
|
xi1-tests:
|
||||||
|
@echo 'echo "ld -wrap support required for xi1 unit tests, skipping"' > $@
|
||||||
|
@echo 'exit 77' >> $@
|
||||||
|
$(AM_V_GEN)chmod +x $@
|
||||||
|
endif
|
||||||
|
endif
|
||||||
931
xserver/test/xi1/Makefile.in
Normal file
931
xserver/test/xi1/Makefile.in
Normal file
@ -0,0 +1,931 @@
|
|||||||
|
# Makefile.in generated by automake 1.12.6 from Makefile.am.
|
||||||
|
# @configure_input@
|
||||||
|
|
||||||
|
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
# This Makefile.in is free software; the Free Software Foundation
|
||||||
|
# gives unlimited permission to copy and/or distribute it,
|
||||||
|
# with or without modifications, as long as this notice is preserved.
|
||||||
|
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
||||||
|
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||||
|
# PARTICULAR PURPOSE.
|
||||||
|
|
||||||
|
@SET_MAKE@
|
||||||
|
|
||||||
|
VPATH = @srcdir@
|
||||||
|
am__make_dryrun = \
|
||||||
|
{ \
|
||||||
|
am__dry=no; \
|
||||||
|
case $$MAKEFLAGS in \
|
||||||
|
*\\[\ \ ]*) \
|
||||||
|
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
|
||||||
|
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
|
||||||
|
*) \
|
||||||
|
for am__flg in $$MAKEFLAGS; do \
|
||||||
|
case $$am__flg in \
|
||||||
|
*=*|--*) ;; \
|
||||||
|
*n*) am__dry=yes; break;; \
|
||||||
|
esac; \
|
||||||
|
done;; \
|
||||||
|
esac; \
|
||||||
|
test $$am__dry = yes; \
|
||||||
|
}
|
||||||
|
pkgdatadir = $(datadir)/@PACKAGE@
|
||||||
|
pkgincludedir = $(includedir)/@PACKAGE@
|
||||||
|
pkglibdir = $(libdir)/@PACKAGE@
|
||||||
|
pkglibexecdir = $(libexecdir)/@PACKAGE@
|
||||||
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
||||||
|
install_sh_DATA = $(install_sh) -c -m 644
|
||||||
|
install_sh_PROGRAM = $(install_sh) -c
|
||||||
|
install_sh_SCRIPT = $(install_sh) -c
|
||||||
|
INSTALL_HEADER = $(INSTALL_DATA)
|
||||||
|
transform = $(program_transform_name)
|
||||||
|
NORMAL_INSTALL = :
|
||||||
|
PRE_INSTALL = :
|
||||||
|
POST_INSTALL = :
|
||||||
|
NORMAL_UNINSTALL = :
|
||||||
|
PRE_UNINSTALL = :
|
||||||
|
POST_UNINSTALL = :
|
||||||
|
build_triplet = @build@
|
||||||
|
host_triplet = @host@
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@noinst_PROGRAMS = protocol-xchangedevicecontrol$(EXEEXT)
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@@SPECIAL_DTRACE_OBJECTS_TRUE@am__append_1 = $(OS_LIB) $(DIX_LIB)
|
||||||
|
subdir = test/xi1
|
||||||
|
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||||
|
$(top_srcdir)/depcomp
|
||||||
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||||
|
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
|
||||||
|
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
|
||||||
|
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
|
||||||
|
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/xorg-tls.m4 \
|
||||||
|
$(top_srcdir)/configure.ac
|
||||||
|
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||||
|
$(ACLOCAL_M4)
|
||||||
|
mkinstalldirs = $(install_sh) -d
|
||||||
|
CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
|
||||||
|
$(top_builddir)/include/xorg-server.h \
|
||||||
|
$(top_builddir)/include/dix-config.h \
|
||||||
|
$(top_builddir)/include/xorg-config.h \
|
||||||
|
$(top_builddir)/include/xkb-config.h \
|
||||||
|
$(top_builddir)/include/xwin-config.h \
|
||||||
|
$(top_builddir)/include/kdrive-config.h \
|
||||||
|
$(top_builddir)/include/version-config.h
|
||||||
|
CONFIG_CLEAN_FILES =
|
||||||
|
CONFIG_CLEAN_VPATH_FILES =
|
||||||
|
PROGRAMS = $(noinst_PROGRAMS)
|
||||||
|
am__protocol_xchangedevicecontrol_SOURCES_DIST = \
|
||||||
|
$(srcdir)/../xi2/protocol-common.c \
|
||||||
|
protocol-xchangedevicecontrol.c
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@am__objects_1 = protocol-common.$(OBJEXT)
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@am_protocol_xchangedevicecontrol_OBJECTS = \
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@ $(am__objects_1) \
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@ protocol-xchangedevicecontrol.$(OBJEXT)
|
||||||
|
protocol_xchangedevicecontrol_OBJECTS = \
|
||||||
|
$(am_protocol_xchangedevicecontrol_OBJECTS)
|
||||||
|
am__DEPENDENCIES_1 =
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@@SPECIAL_DTRACE_OBJECTS_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@@SPECIAL_DTRACE_OBJECTS_TRUE@ $(am__DEPENDENCIES_1)
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@am__DEPENDENCIES_3 = ../libxservertest.la \
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@ $(am__DEPENDENCIES_1) \
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@ $(am__DEPENDENCIES_1) \
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@ $(am__DEPENDENCIES_1) \
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@ $(am__DEPENDENCIES_2)
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@protocol_xchangedevicecontrol_DEPENDENCIES = $(am__DEPENDENCIES_3)
|
||||||
|
AM_V_lt = $(am__v_lt_@AM_V@)
|
||||||
|
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
|
||||||
|
am__v_lt_0 = --silent
|
||||||
|
am__v_lt_1 =
|
||||||
|
protocol_xchangedevicecontrol_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
|
||||||
|
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
|
||||||
|
$(AM_CFLAGS) $(CFLAGS) \
|
||||||
|
$(protocol_xchangedevicecontrol_LDFLAGS) $(LDFLAGS) -o $@
|
||||||
|
AM_V_P = $(am__v_P_@AM_V@)
|
||||||
|
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
|
||||||
|
am__v_P_0 = false
|
||||||
|
am__v_P_1 = :
|
||||||
|
AM_V_GEN = $(am__v_GEN_@AM_V@)
|
||||||
|
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
|
||||||
|
am__v_GEN_0 = @echo " GEN " $@;
|
||||||
|
am__v_GEN_1 =
|
||||||
|
AM_V_at = $(am__v_at_@AM_V@)
|
||||||
|
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
|
||||||
|
am__v_at_0 = @
|
||||||
|
am__v_at_1 =
|
||||||
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
|
||||||
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||||
|
am__depfiles_maybe = depfiles
|
||||||
|
am__mv = mv -f
|
||||||
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||||
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||||
|
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||||
|
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
|
||||||
|
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
|
||||||
|
$(AM_CFLAGS) $(CFLAGS)
|
||||||
|
AM_V_CC = $(am__v_CC_@AM_V@)
|
||||||
|
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
|
||||||
|
am__v_CC_0 = @echo " CC " $@;
|
||||||
|
am__v_CC_1 =
|
||||||
|
CCLD = $(CC)
|
||||||
|
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||||
|
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||||
|
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||||
|
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
|
||||||
|
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
|
||||||
|
am__v_CCLD_0 = @echo " CCLD " $@;
|
||||||
|
am__v_CCLD_1 =
|
||||||
|
SOURCES = $(protocol_xchangedevicecontrol_SOURCES)
|
||||||
|
DIST_SOURCES = $(am__protocol_xchangedevicecontrol_SOURCES_DIST)
|
||||||
|
am__can_run_installinfo = \
|
||||||
|
case $$AM_UPDATE_INFO_DIR in \
|
||||||
|
n|no|NO) false;; \
|
||||||
|
*) (install-info --version) >/dev/null 2>&1;; \
|
||||||
|
esac
|
||||||
|
ETAGS = etags
|
||||||
|
CTAGS = ctags
|
||||||
|
am__tty_colors_dummy = \
|
||||||
|
mgn= red= grn= lgn= blu= brg= std=; \
|
||||||
|
am__color_tests=no
|
||||||
|
am__tty_colors = $(am__tty_colors_dummy)
|
||||||
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||||
|
ACLOCAL = @ACLOCAL@
|
||||||
|
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
|
||||||
|
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||||
|
AMTAR = @AMTAR@
|
||||||
|
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||||
|
APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
|
||||||
|
APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
|
||||||
|
APP_MAN_DIR = @APP_MAN_DIR@
|
||||||
|
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||||
|
AR = @AR@
|
||||||
|
AS = @AS@
|
||||||
|
AUTOCONF = @AUTOCONF@
|
||||||
|
AUTOHEADER = @AUTOHEADER@
|
||||||
|
AUTOMAKE = @AUTOMAKE@
|
||||||
|
AWK = @AWK@
|
||||||
|
BASE_CFLAGS = @BASE_CFLAGS@
|
||||||
|
BASE_FONT_PATH = @BASE_FONT_PATH@
|
||||||
|
BUILD_DATE = @BUILD_DATE@
|
||||||
|
BUILD_TIME = @BUILD_TIME@
|
||||||
|
BUNDLE_ID_PREFIX = @BUNDLE_ID_PREFIX@
|
||||||
|
CC = @CC@
|
||||||
|
CCAS = @CCAS@
|
||||||
|
CCASDEPMODE = @CCASDEPMODE@
|
||||||
|
CCASFLAGS = @CCASFLAGS@
|
||||||
|
CCDEPMODE = @CCDEPMODE@
|
||||||
|
CFLAGS = @CFLAGS@
|
||||||
|
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||||
|
COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
|
||||||
|
CPP = @CPP@
|
||||||
|
CPPFLAGS = @CPPFLAGS@
|
||||||
|
CWARNFLAGS = @CWARNFLAGS@
|
||||||
|
CYGPATH_W = @CYGPATH_W@
|
||||||
|
DBUS_CFLAGS = @DBUS_CFLAGS@
|
||||||
|
DBUS_LIBS = @DBUS_LIBS@
|
||||||
|
DEFAULT_LIBRARY_PATH = @DEFAULT_LIBRARY_PATH@
|
||||||
|
DEFAULT_LOGDIR = @DEFAULT_LOGDIR@
|
||||||
|
DEFAULT_LOGPREFIX = @DEFAULT_LOGPREFIX@
|
||||||
|
DEFAULT_MODULE_PATH = @DEFAULT_MODULE_PATH@
|
||||||
|
DEFAULT_XDG_DATA_HOME = @DEFAULT_XDG_DATA_HOME@
|
||||||
|
DEFAULT_XDG_DATA_HOME_LOGDIR = @DEFAULT_XDG_DATA_HOME_LOGDIR@
|
||||||
|
DEFS = @DEFS@
|
||||||
|
DEPDIR = @DEPDIR@
|
||||||
|
DGA_CFLAGS = @DGA_CFLAGS@
|
||||||
|
DGA_LIBS = @DGA_LIBS@
|
||||||
|
DIX_CFLAGS = @DIX_CFLAGS@
|
||||||
|
DIX_LIB = @DIX_LIB@
|
||||||
|
DLLTOOL = @DLLTOOL@
|
||||||
|
DLOPEN_LIBS = @DLOPEN_LIBS@
|
||||||
|
DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@
|
||||||
|
DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@
|
||||||
|
DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@
|
||||||
|
DMXMODULES_LIBS = @DMXMODULES_LIBS@
|
||||||
|
DMXXIEXAMPLES_DEP_CFLAGS = @DMXXIEXAMPLES_DEP_CFLAGS@
|
||||||
|
DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
|
||||||
|
DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
|
||||||
|
DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
|
||||||
|
DOT = @DOT@
|
||||||
|
DOXYGEN = @DOXYGEN@
|
||||||
|
DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
|
||||||
|
DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
|
||||||
|
DRI3PROTO_CFLAGS = @DRI3PROTO_CFLAGS@
|
||||||
|
DRI3PROTO_LIBS = @DRI3PROTO_LIBS@
|
||||||
|
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
||||||
|
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||||
|
DRI_DRIVER_PATH = @DRI_DRIVER_PATH@
|
||||||
|
DSYMUTIL = @DSYMUTIL@
|
||||||
|
DTRACE = @DTRACE@
|
||||||
|
DUMPBIN = @DUMPBIN@
|
||||||
|
ECHO_C = @ECHO_C@
|
||||||
|
ECHO_N = @ECHO_N@
|
||||||
|
ECHO_T = @ECHO_T@
|
||||||
|
EGREP = @EGREP@
|
||||||
|
EXEEXT = @EXEEXT@
|
||||||
|
FGREP = @FGREP@
|
||||||
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
|
FONT100DPIDIR = @FONT100DPIDIR@
|
||||||
|
FONT75DPIDIR = @FONT75DPIDIR@
|
||||||
|
FONTMISCDIR = @FONTMISCDIR@
|
||||||
|
FONTOTFDIR = @FONTOTFDIR@
|
||||||
|
FONTROOTDIR = @FONTROOTDIR@
|
||||||
|
FONTTTFDIR = @FONTTTFDIR@
|
||||||
|
FONTTYPE1DIR = @FONTTYPE1DIR@
|
||||||
|
FOP = @FOP@
|
||||||
|
GBM_CFLAGS = @GBM_CFLAGS@
|
||||||
|
GBM_LIBS = @GBM_LIBS@
|
||||||
|
GLAMOR_CFLAGS = @GLAMOR_CFLAGS@
|
||||||
|
GLAMOR_LIBS = @GLAMOR_LIBS@
|
||||||
|
GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
|
||||||
|
GLX_DEFINES = @GLX_DEFINES@
|
||||||
|
GLX_SYS_LIBS = @GLX_SYS_LIBS@
|
||||||
|
GLX_TLS = @GLX_TLS@
|
||||||
|
GL_CFLAGS = @GL_CFLAGS@
|
||||||
|
GL_LIBS = @GL_LIBS@
|
||||||
|
GREP = @GREP@
|
||||||
|
HAL_CFLAGS = @HAL_CFLAGS@
|
||||||
|
HAL_LIBS = @HAL_LIBS@
|
||||||
|
HAVE_DOT = @HAVE_DOT@
|
||||||
|
INSTALL = @INSTALL@
|
||||||
|
INSTALL_CMD = @INSTALL_CMD@
|
||||||
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||||
|
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||||
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||||
|
KDRIVE_CFLAGS = @KDRIVE_CFLAGS@
|
||||||
|
KDRIVE_INCS = @KDRIVE_INCS@
|
||||||
|
KDRIVE_LIBS = @KDRIVE_LIBS@
|
||||||
|
KDRIVE_LOCAL_LIBS = @KDRIVE_LOCAL_LIBS@
|
||||||
|
KDRIVE_PURE_INCS = @KDRIVE_PURE_INCS@
|
||||||
|
KDRIVE_PURE_LIBS = @KDRIVE_PURE_LIBS@
|
||||||
|
KHRONOS_OPENGL_REGISTRY_CFLAGS = @KHRONOS_OPENGL_REGISTRY_CFLAGS@
|
||||||
|
KHRONOS_OPENGL_REGISTRY_LIBS = @KHRONOS_OPENGL_REGISTRY_LIBS@
|
||||||
|
KHRONOS_SPEC_DIR = @KHRONOS_SPEC_DIR@
|
||||||
|
LD = @LD@
|
||||||
|
LDFLAGS = @LDFLAGS@
|
||||||
|
LD_EXPORT_SYMBOLS_FLAG = @LD_EXPORT_SYMBOLS_FLAG@
|
||||||
|
LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@
|
||||||
|
LEX = @LEX@
|
||||||
|
LEXLIB = @LEXLIB@
|
||||||
|
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
|
||||||
|
LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
|
||||||
|
LIBDRM_LIBS = @LIBDRM_LIBS@
|
||||||
|
LIBOBJS = @LIBOBJS@
|
||||||
|
LIBS = @LIBS@
|
||||||
|
LIBSHA1_CFLAGS = @LIBSHA1_CFLAGS@
|
||||||
|
LIBSHA1_LIBS = @LIBSHA1_LIBS@
|
||||||
|
LIBTOOL = @LIBTOOL@
|
||||||
|
LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
|
||||||
|
LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
|
||||||
|
LIB_MAN_DIR = @LIB_MAN_DIR@
|
||||||
|
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||||
|
LIPO = @LIPO@
|
||||||
|
LN_S = @LN_S@
|
||||||
|
LTLIBOBJS = @LTLIBOBJS@
|
||||||
|
MAIN_LIB = @MAIN_LIB@
|
||||||
|
MAKEINFO = @MAKEINFO@
|
||||||
|
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||||
|
MAN_SUBSTS = @MAN_SUBSTS@
|
||||||
|
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||||
|
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||||
|
MKDIR_P = @MKDIR_P@
|
||||||
|
NM = @NM@
|
||||||
|
NMEDIT = @NMEDIT@
|
||||||
|
OBJC = @OBJC@
|
||||||
|
OBJCCLD = @OBJCCLD@
|
||||||
|
OBJCDEPMODE = @OBJCDEPMODE@
|
||||||
|
OBJCFLAGS = @OBJCFLAGS@
|
||||||
|
OBJCLINK = @OBJCLINK@
|
||||||
|
OBJDUMP = @OBJDUMP@
|
||||||
|
OBJEXT = @OBJEXT@
|
||||||
|
OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
|
||||||
|
OPENSSL_LIBS = @OPENSSL_LIBS@
|
||||||
|
OS_LIB = @OS_LIB@
|
||||||
|
OTOOL = @OTOOL@
|
||||||
|
OTOOL64 = @OTOOL64@
|
||||||
|
PACKAGE = @PACKAGE@
|
||||||
|
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||||
|
PACKAGE_NAME = @PACKAGE_NAME@
|
||||||
|
PACKAGE_STRING = @PACKAGE_STRING@
|
||||||
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||||
|
PACKAGE_URL = @PACKAGE_URL@
|
||||||
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||||
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||||
|
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
|
||||||
|
PCIACCESS_LIBS = @PCIACCESS_LIBS@
|
||||||
|
PCI_TXT_IDS_PATH = @PCI_TXT_IDS_PATH@
|
||||||
|
PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
|
||||||
|
PIXMAN_LIBS = @PIXMAN_LIBS@
|
||||||
|
PKG_CONFIG = @PKG_CONFIG@
|
||||||
|
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||||
|
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||||
|
PROJECTROOT = @PROJECTROOT@
|
||||||
|
PYTHON3 = @PYTHON3@
|
||||||
|
RANLIB = @RANLIB@
|
||||||
|
RAWCPP = @RAWCPP@
|
||||||
|
RAWCPPFLAGS = @RAWCPPFLAGS@
|
||||||
|
RELEASE_DATE = @RELEASE_DATE@
|
||||||
|
SDK_REQUIRED_MODULES = @SDK_REQUIRED_MODULES@
|
||||||
|
SED = @SED@
|
||||||
|
SELINUX_CFLAGS = @SELINUX_CFLAGS@
|
||||||
|
SELINUX_LIBS = @SELINUX_LIBS@
|
||||||
|
SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
|
||||||
|
SET_MAKE = @SET_MAKE@
|
||||||
|
SHA1_CFLAGS = @SHA1_CFLAGS@
|
||||||
|
SHA1_LIBS = @SHA1_LIBS@
|
||||||
|
SHELL = @SHELL@
|
||||||
|
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
|
||||||
|
STRICT_CFLAGS = @STRICT_CFLAGS@
|
||||||
|
STRIP = @STRIP@
|
||||||
|
STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
|
||||||
|
SUID_WRAPPER_DIR = @SUID_WRAPPER_DIR@
|
||||||
|
SYSCONFDIR = @SYSCONFDIR@
|
||||||
|
SYSTEMD_DAEMON_CFLAGS = @SYSTEMD_DAEMON_CFLAGS@
|
||||||
|
SYSTEMD_DAEMON_LIBS = @SYSTEMD_DAEMON_LIBS@
|
||||||
|
TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
|
||||||
|
TSLIB_CFLAGS = @TSLIB_CFLAGS@
|
||||||
|
TSLIB_LIBS = @TSLIB_LIBS@
|
||||||
|
UDEV_CFLAGS = @UDEV_CFLAGS@
|
||||||
|
UDEV_LIBS = @UDEV_LIBS@
|
||||||
|
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
|
||||||
|
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
|
||||||
|
VERSION = @VERSION@
|
||||||
|
WAYLAND_SCANNER = @WAYLAND_SCANNER@
|
||||||
|
WINDOWSWM_CFLAGS = @WINDOWSWM_CFLAGS@
|
||||||
|
WINDOWSWM_LIBS = @WINDOWSWM_LIBS@
|
||||||
|
WINDRES = @WINDRES@
|
||||||
|
X11EXAMPLES_DEP_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@
|
||||||
|
X11EXAMPLES_DEP_LIBS = @X11EXAMPLES_DEP_LIBS@
|
||||||
|
XDMCP_CFLAGS = @XDMCP_CFLAGS@
|
||||||
|
XDMCP_LIBS = @XDMCP_LIBS@
|
||||||
|
XDMXCONFIG_DEP_CFLAGS = @XDMXCONFIG_DEP_CFLAGS@
|
||||||
|
XDMXCONFIG_DEP_LIBS = @XDMXCONFIG_DEP_LIBS@
|
||||||
|
XDMX_CFLAGS = @XDMX_CFLAGS@
|
||||||
|
XDMX_LIBS = @XDMX_LIBS@
|
||||||
|
XDMX_SYS_LIBS = @XDMX_SYS_LIBS@
|
||||||
|
XEPHYR_CFLAGS = @XEPHYR_CFLAGS@
|
||||||
|
XEPHYR_INCS = @XEPHYR_INCS@
|
||||||
|
XEPHYR_LIBS = @XEPHYR_LIBS@
|
||||||
|
XF86CONFIGDIR = @XF86CONFIGDIR@
|
||||||
|
XF86CONFIGFILE = @XF86CONFIGFILE@
|
||||||
|
XF86VIDMODE_CFLAGS = @XF86VIDMODE_CFLAGS@
|
||||||
|
XF86VIDMODE_LIBS = @XF86VIDMODE_LIBS@
|
||||||
|
XKB_BASE_DIRECTORY = @XKB_BASE_DIRECTORY@
|
||||||
|
XKB_BIN_DIRECTORY = @XKB_BIN_DIRECTORY@
|
||||||
|
XKB_COMPILED_DIR = @XKB_COMPILED_DIR@
|
||||||
|
XKB_DFLT_LAYOUT = @XKB_DFLT_LAYOUT@
|
||||||
|
XKB_DFLT_MODEL = @XKB_DFLT_MODEL@
|
||||||
|
XKB_DFLT_OPTIONS = @XKB_DFLT_OPTIONS@
|
||||||
|
XKB_DFLT_RULES = @XKB_DFLT_RULES@
|
||||||
|
XKB_DFLT_VARIANT = @XKB_DFLT_VARIANT@
|
||||||
|
XKM_OUTPUT_DIR = @XKM_OUTPUT_DIR@
|
||||||
|
XLIB_CFLAGS = @XLIB_CFLAGS@
|
||||||
|
XLIB_LIBS = @XLIB_LIBS@
|
||||||
|
XMLTO = @XMLTO@
|
||||||
|
XNESTMODULES_CFLAGS = @XNESTMODULES_CFLAGS@
|
||||||
|
XNESTMODULES_LIBS = @XNESTMODULES_LIBS@
|
||||||
|
XNEST_LIBS = @XNEST_LIBS@
|
||||||
|
XNEST_SYS_LIBS = @XNEST_SYS_LIBS@
|
||||||
|
XORG_CFLAGS = @XORG_CFLAGS@
|
||||||
|
XORG_DRIVER_LIBS = @XORG_DRIVER_LIBS@
|
||||||
|
XORG_INCS = @XORG_INCS@
|
||||||
|
XORG_LIBS = @XORG_LIBS@
|
||||||
|
XORG_MALLOC_DEBUG_ENV = @XORG_MALLOC_DEBUG_ENV@
|
||||||
|
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||||
|
XORG_MODULES_CFLAGS = @XORG_MODULES_CFLAGS@
|
||||||
|
XORG_MODULES_LIBS = @XORG_MODULES_LIBS@
|
||||||
|
XORG_OS_SUBDIR = @XORG_OS_SUBDIR@
|
||||||
|
XORG_SGML_PATH = @XORG_SGML_PATH@
|
||||||
|
XORG_SYS_LIBS = @XORG_SYS_LIBS@
|
||||||
|
XPBPROXY_CFLAGS = @XPBPROXY_CFLAGS@
|
||||||
|
XPBPROXY_LIBS = @XPBPROXY_LIBS@
|
||||||
|
XQUARTZ_LIBS = @XQUARTZ_LIBS@
|
||||||
|
XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
|
||||||
|
XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
|
||||||
|
XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
|
||||||
|
XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
|
||||||
|
XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
|
||||||
|
XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
|
||||||
|
XSERVERLIBS_LIBS = @XSERVERLIBS_LIBS@
|
||||||
|
XSERVER_LIBS = @XSERVER_LIBS@
|
||||||
|
XSERVER_SYS_LIBS = @XSERVER_SYS_LIBS@
|
||||||
|
XSHMFENCE_CFLAGS = @XSHMFENCE_CFLAGS@
|
||||||
|
XSHMFENCE_LIBS = @XSHMFENCE_LIBS@
|
||||||
|
XSLTPROC = @XSLTPROC@
|
||||||
|
XSL_STYLESHEET = @XSL_STYLESHEET@
|
||||||
|
XTSTEXAMPLES_DEP_CFLAGS = @XTSTEXAMPLES_DEP_CFLAGS@
|
||||||
|
XTSTEXAMPLES_DEP_LIBS = @XTSTEXAMPLES_DEP_LIBS@
|
||||||
|
XVFB_LIBS = @XVFB_LIBS@
|
||||||
|
XVFB_SYS_LIBS = @XVFB_SYS_LIBS@
|
||||||
|
XWAYLANDMODULES_CFLAGS = @XWAYLANDMODULES_CFLAGS@
|
||||||
|
XWAYLANDMODULES_LIBS = @XWAYLANDMODULES_LIBS@
|
||||||
|
XWAYLAND_LIBS = @XWAYLAND_LIBS@
|
||||||
|
XWAYLAND_SYS_LIBS = @XWAYLAND_SYS_LIBS@
|
||||||
|
XWINMODULES_CFLAGS = @XWINMODULES_CFLAGS@
|
||||||
|
XWINMODULES_LIBS = @XWINMODULES_LIBS@
|
||||||
|
XWIN_LIBS = @XWIN_LIBS@
|
||||||
|
XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
|
||||||
|
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
|
||||||
|
YACC = @YACC@
|
||||||
|
YFLAGS = @YFLAGS@
|
||||||
|
__XCONFIGDIR__ = @__XCONFIGDIR__@
|
||||||
|
__XCONFIGFILE__ = @__XCONFIGFILE__@
|
||||||
|
abi_ansic = @abi_ansic@
|
||||||
|
abi_extension = @abi_extension@
|
||||||
|
abi_videodrv = @abi_videodrv@
|
||||||
|
abi_xinput = @abi_xinput@
|
||||||
|
abs_builddir = @abs_builddir@
|
||||||
|
abs_srcdir = @abs_srcdir@
|
||||||
|
abs_top_builddir = @abs_top_builddir@
|
||||||
|
abs_top_srcdir = @abs_top_srcdir@
|
||||||
|
ac_ct_AR = @ac_ct_AR@
|
||||||
|
ac_ct_CC = @ac_ct_CC@
|
||||||
|
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
||||||
|
am__include = @am__include@
|
||||||
|
am__leading_dot = @am__leading_dot@
|
||||||
|
am__quote = @am__quote@
|
||||||
|
am__tar = @am__tar@
|
||||||
|
am__untar = @am__untar@
|
||||||
|
bindir = @bindir@
|
||||||
|
build = @build@
|
||||||
|
build_alias = @build_alias@
|
||||||
|
build_cpu = @build_cpu@
|
||||||
|
build_os = @build_os@
|
||||||
|
build_vendor = @build_vendor@
|
||||||
|
builddir = @builddir@
|
||||||
|
datadir = @datadir@
|
||||||
|
datarootdir = @datarootdir@
|
||||||
|
docdir = @docdir@
|
||||||
|
driverdir = @driverdir@
|
||||||
|
dvidir = @dvidir@
|
||||||
|
exec_prefix = @exec_prefix@
|
||||||
|
extdir = @extdir@
|
||||||
|
host = @host@
|
||||||
|
host_alias = @host_alias@
|
||||||
|
host_cpu = @host_cpu@
|
||||||
|
host_os = @host_os@
|
||||||
|
host_vendor = @host_vendor@
|
||||||
|
htmldir = @htmldir@
|
||||||
|
includedir = @includedir@
|
||||||
|
infodir = @infodir@
|
||||||
|
install_sh = @install_sh@
|
||||||
|
libdir = @libdir@
|
||||||
|
libexecdir = @libexecdir@
|
||||||
|
localedir = @localedir@
|
||||||
|
localstatedir = @localstatedir@
|
||||||
|
logdir = @logdir@
|
||||||
|
mandir = @mandir@
|
||||||
|
mkdir_p = @mkdir_p@
|
||||||
|
moduledir = @moduledir@
|
||||||
|
oldincludedir = @oldincludedir@
|
||||||
|
pdfdir = @pdfdir@
|
||||||
|
prefix = @prefix@
|
||||||
|
program_transform_name = @program_transform_name@
|
||||||
|
psdir = @psdir@
|
||||||
|
sbindir = @sbindir@
|
||||||
|
sdkdir = @sdkdir@
|
||||||
|
sharedstatedir = @sharedstatedir@
|
||||||
|
srcdir = @srcdir@
|
||||||
|
symbol_visibility = @symbol_visibility@
|
||||||
|
sysconfdir = @sysconfdir@
|
||||||
|
sysconfigdir = @sysconfigdir@
|
||||||
|
target_alias = @target_alias@
|
||||||
|
top_build_prefix = @top_build_prefix@
|
||||||
|
top_builddir = @top_builddir@
|
||||||
|
top_srcdir = @top_srcdir@
|
||||||
|
|
||||||
|
# Print that xi1-tests were skipped (exit code 77 for automake test harness)
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_FALSE@TESTS = xi1-tests
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@TESTS = $(noinst_PROGRAMS)
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV)
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@AM_CPPFLAGS = @XORG_INCS@ -I$(srcdir)/../xi2
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@TEST_LDADD = ../libxservertest.la \
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@ $(XORG_SYS_LIBS) \
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@ $(XSERVER_SYS_LIBS) \
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@ $(GLX_SYS_LIBS) \
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@ $(am__append_1)
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@COMMON_SOURCES = $(srcdir)/../xi2/protocol-common.c
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@protocol_xchangedevicecontrol_LDADD = $(TEST_LDADD)
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@protocol_xchangedevicecontrol_LDFLAGS = $(AM_LDFLAGS) -Wl,-wrap,WriteToClient
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@protocol_xchangedevicecontrol_SOURCES = $(COMMON_SOURCES) protocol-xchangedevicecontrol.c
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_FALSE@CLEANFILES = $(TESTS)
|
||||||
|
all: all-am
|
||||||
|
|
||||||
|
.SUFFIXES:
|
||||||
|
.SUFFIXES: .c .lo .o .obj
|
||||||
|
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
||||||
|
@for dep in $?; do \
|
||||||
|
case '$(am__configure_deps)' in \
|
||||||
|
*$$dep*) \
|
||||||
|
( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
|
||||||
|
&& { if test -f $@; then exit 0; else break; fi; }; \
|
||||||
|
exit 1;; \
|
||||||
|
esac; \
|
||||||
|
done; \
|
||||||
|
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/xi1/Makefile'; \
|
||||||
|
$(am__cd) $(top_srcdir) && \
|
||||||
|
$(AUTOMAKE) --foreign test/xi1/Makefile
|
||||||
|
.PRECIOUS: Makefile
|
||||||
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||||
|
@case '$?' in \
|
||||||
|
*config.status*) \
|
||||||
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
|
||||||
|
*) \
|
||||||
|
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
|
||||||
|
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
|
||||||
|
esac;
|
||||||
|
|
||||||
|
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||||
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||||
|
|
||||||
|
$(top_srcdir)/configure: $(am__configure_deps)
|
||||||
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||||
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
||||||
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||||
|
$(am__aclocal_m4_deps):
|
||||||
|
|
||||||
|
clean-noinstPROGRAMS:
|
||||||
|
@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
|
||||||
|
echo " rm -f" $$list; \
|
||||||
|
rm -f $$list || exit $$?; \
|
||||||
|
test -n "$(EXEEXT)" || exit 0; \
|
||||||
|
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
|
||||||
|
echo " rm -f" $$list; \
|
||||||
|
rm -f $$list
|
||||||
|
protocol-xchangedevicecontrol$(EXEEXT): $(protocol_xchangedevicecontrol_OBJECTS) $(protocol_xchangedevicecontrol_DEPENDENCIES) $(EXTRA_protocol_xchangedevicecontrol_DEPENDENCIES)
|
||||||
|
@rm -f protocol-xchangedevicecontrol$(EXEEXT)
|
||||||
|
$(AM_V_CCLD)$(protocol_xchangedevicecontrol_LINK) $(protocol_xchangedevicecontrol_OBJECTS) $(protocol_xchangedevicecontrol_LDADD) $(LIBS)
|
||||||
|
|
||||||
|
mostlyclean-compile:
|
||||||
|
-rm -f *.$(OBJEXT)
|
||||||
|
|
||||||
|
distclean-compile:
|
||||||
|
-rm -f *.tab.c
|
||||||
|
|
||||||
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protocol-common.Po@am__quote@
|
||||||
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protocol-xchangedevicecontrol.Po@am__quote@
|
||||||
|
|
||||||
|
.c.o:
|
||||||
|
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
||||||
|
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
||||||
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||||
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||||
|
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
|
||||||
|
|
||||||
|
.c.obj:
|
||||||
|
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
||||||
|
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
||||||
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||||
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||||
|
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
|
||||||
|
|
||||||
|
.c.lo:
|
||||||
|
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
||||||
|
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
||||||
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
||||||
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||||
|
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
|
||||||
|
|
||||||
|
protocol-common.o: $(srcdir)/../xi2/protocol-common.c
|
||||||
|
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT protocol-common.o -MD -MP -MF $(DEPDIR)/protocol-common.Tpo -c -o protocol-common.o `test -f '$(srcdir)/../xi2/protocol-common.c' || echo '$(srcdir)/'`$(srcdir)/../xi2/protocol-common.c
|
||||||
|
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/protocol-common.Tpo $(DEPDIR)/protocol-common.Po
|
||||||
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../xi2/protocol-common.c' object='protocol-common.o' libtool=no @AMDEPBACKSLASH@
|
||||||
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||||
|
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o protocol-common.o `test -f '$(srcdir)/../xi2/protocol-common.c' || echo '$(srcdir)/'`$(srcdir)/../xi2/protocol-common.c
|
||||||
|
|
||||||
|
protocol-common.obj: $(srcdir)/../xi2/protocol-common.c
|
||||||
|
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT protocol-common.obj -MD -MP -MF $(DEPDIR)/protocol-common.Tpo -c -o protocol-common.obj `if test -f '$(srcdir)/../xi2/protocol-common.c'; then $(CYGPATH_W) '$(srcdir)/../xi2/protocol-common.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../xi2/protocol-common.c'; fi`
|
||||||
|
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/protocol-common.Tpo $(DEPDIR)/protocol-common.Po
|
||||||
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../xi2/protocol-common.c' object='protocol-common.obj' libtool=no @AMDEPBACKSLASH@
|
||||||
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||||
|
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o protocol-common.obj `if test -f '$(srcdir)/../xi2/protocol-common.c'; then $(CYGPATH_W) '$(srcdir)/../xi2/protocol-common.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../xi2/protocol-common.c'; fi`
|
||||||
|
|
||||||
|
mostlyclean-libtool:
|
||||||
|
-rm -f *.lo
|
||||||
|
|
||||||
|
clean-libtool:
|
||||||
|
-rm -rf .libs _libs
|
||||||
|
|
||||||
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||||
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||||
|
unique=`for i in $$list; do \
|
||||||
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||||
|
done | \
|
||||||
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||||
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||||
|
mkid -fID $$unique
|
||||||
|
tags: TAGS
|
||||||
|
|
||||||
|
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||||
|
$(TAGS_FILES) $(LISP)
|
||||||
|
set x; \
|
||||||
|
here=`pwd`; \
|
||||||
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||||
|
unique=`for i in $$list; do \
|
||||||
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||||
|
done | \
|
||||||
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||||
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||||
|
shift; \
|
||||||
|
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
||||||
|
test -n "$$unique" || unique=$$empty_fix; \
|
||||||
|
if test $$# -gt 0; then \
|
||||||
|
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||||
|
"$$@" $$unique; \
|
||||||
|
else \
|
||||||
|
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||||
|
$$unique; \
|
||||||
|
fi; \
|
||||||
|
fi
|
||||||
|
ctags: CTAGS
|
||||||
|
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||||
|
$(TAGS_FILES) $(LISP)
|
||||||
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||||
|
unique=`for i in $$list; do \
|
||||||
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||||
|
done | \
|
||||||
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||||
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||||
|
test -z "$(CTAGS_ARGS)$$unique" \
|
||||||
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
||||||
|
$$unique
|
||||||
|
|
||||||
|
GTAGS:
|
||||||
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
||||||
|
&& $(am__cd) $(top_srcdir) \
|
||||||
|
&& gtags -i $(GTAGS_ARGS) "$$here"
|
||||||
|
|
||||||
|
cscopelist: $(HEADERS) $(SOURCES) $(LISP)
|
||||||
|
list='$(SOURCES) $(HEADERS) $(LISP)'; \
|
||||||
|
case "$(srcdir)" in \
|
||||||
|
[\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
|
||||||
|
*) sdir=$(subdir)/$(srcdir) ;; \
|
||||||
|
esac; \
|
||||||
|
for i in $$list; do \
|
||||||
|
if test -f "$$i"; then \
|
||||||
|
echo "$(subdir)/$$i"; \
|
||||||
|
else \
|
||||||
|
echo "$$sdir/$$i"; \
|
||||||
|
fi; \
|
||||||
|
done >> $(top_builddir)/cscope.files
|
||||||
|
|
||||||
|
distclean-tags:
|
||||||
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
||||||
|
|
||||||
|
check-TESTS: $(TESTS)
|
||||||
|
@failed=0; all=0; xfail=0; xpass=0; skip=0; \
|
||||||
|
srcdir=$(srcdir); export srcdir; \
|
||||||
|
list=' $(TESTS) '; \
|
||||||
|
$(am__tty_colors); \
|
||||||
|
if test -n "$$list"; then \
|
||||||
|
for tst in $$list; do \
|
||||||
|
if test -f ./$$tst; then dir=./; \
|
||||||
|
elif test -f $$tst; then dir=; \
|
||||||
|
else dir="$(srcdir)/"; fi; \
|
||||||
|
if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
|
||||||
|
all=`expr $$all + 1`; \
|
||||||
|
case " $(XFAIL_TESTS) " in \
|
||||||
|
*[\ \ ]$$tst[\ \ ]*) \
|
||||||
|
xpass=`expr $$xpass + 1`; \
|
||||||
|
failed=`expr $$failed + 1`; \
|
||||||
|
col=$$red; res=XPASS; \
|
||||||
|
;; \
|
||||||
|
*) \
|
||||||
|
col=$$grn; res=PASS; \
|
||||||
|
;; \
|
||||||
|
esac; \
|
||||||
|
elif test $$? -ne 77; then \
|
||||||
|
all=`expr $$all + 1`; \
|
||||||
|
case " $(XFAIL_TESTS) " in \
|
||||||
|
*[\ \ ]$$tst[\ \ ]*) \
|
||||||
|
xfail=`expr $$xfail + 1`; \
|
||||||
|
col=$$lgn; res=XFAIL; \
|
||||||
|
;; \
|
||||||
|
*) \
|
||||||
|
failed=`expr $$failed + 1`; \
|
||||||
|
col=$$red; res=FAIL; \
|
||||||
|
;; \
|
||||||
|
esac; \
|
||||||
|
else \
|
||||||
|
skip=`expr $$skip + 1`; \
|
||||||
|
col=$$blu; res=SKIP; \
|
||||||
|
fi; \
|
||||||
|
echo "$${col}$$res$${std}: $$tst"; \
|
||||||
|
done; \
|
||||||
|
if test "$$all" -eq 1; then \
|
||||||
|
tests="test"; \
|
||||||
|
All=""; \
|
||||||
|
else \
|
||||||
|
tests="tests"; \
|
||||||
|
All="All "; \
|
||||||
|
fi; \
|
||||||
|
if test "$$failed" -eq 0; then \
|
||||||
|
if test "$$xfail" -eq 0; then \
|
||||||
|
banner="$$All$$all $$tests passed"; \
|
||||||
|
else \
|
||||||
|
if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
|
||||||
|
banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
|
||||||
|
fi; \
|
||||||
|
else \
|
||||||
|
if test "$$xpass" -eq 0; then \
|
||||||
|
banner="$$failed of $$all $$tests failed"; \
|
||||||
|
else \
|
||||||
|
if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
|
||||||
|
banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
|
||||||
|
fi; \
|
||||||
|
fi; \
|
||||||
|
dashes="$$banner"; \
|
||||||
|
skipped=""; \
|
||||||
|
if test "$$skip" -ne 0; then \
|
||||||
|
if test "$$skip" -eq 1; then \
|
||||||
|
skipped="($$skip test was not run)"; \
|
||||||
|
else \
|
||||||
|
skipped="($$skip tests were not run)"; \
|
||||||
|
fi; \
|
||||||
|
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
|
||||||
|
dashes="$$skipped"; \
|
||||||
|
fi; \
|
||||||
|
report=""; \
|
||||||
|
if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
|
||||||
|
report="Please report to $(PACKAGE_BUGREPORT)"; \
|
||||||
|
test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
|
||||||
|
dashes="$$report"; \
|
||||||
|
fi; \
|
||||||
|
dashes=`echo "$$dashes" | sed s/./=/g`; \
|
||||||
|
if test "$$failed" -eq 0; then \
|
||||||
|
col="$$grn"; \
|
||||||
|
else \
|
||||||
|
col="$$red"; \
|
||||||
|
fi; \
|
||||||
|
echo "$${col}$$dashes$${std}"; \
|
||||||
|
echo "$${col}$$banner$${std}"; \
|
||||||
|
test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
|
||||||
|
test -z "$$report" || echo "$${col}$$report$${std}"; \
|
||||||
|
echo "$${col}$$dashes$${std}"; \
|
||||||
|
test "$$failed" -eq 0; \
|
||||||
|
else :; fi
|
||||||
|
|
||||||
|
distdir: $(DISTFILES)
|
||||||
|
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||||
|
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||||
|
list='$(DISTFILES)'; \
|
||||||
|
dist_files=`for file in $$list; do echo $$file; done | \
|
||||||
|
sed -e "s|^$$srcdirstrip/||;t" \
|
||||||
|
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
|
||||||
|
case $$dist_files in \
|
||||||
|
*/*) $(MKDIR_P) `echo "$$dist_files" | \
|
||||||
|
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
|
||||||
|
sort -u` ;; \
|
||||||
|
esac; \
|
||||||
|
for file in $$dist_files; do \
|
||||||
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
||||||
|
if test -d $$d/$$file; then \
|
||||||
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
||||||
|
if test -d "$(distdir)/$$file"; then \
|
||||||
|
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
||||||
|
fi; \
|
||||||
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
||||||
|
cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
||||||
|
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
||||||
|
fi; \
|
||||||
|
cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
||||||
|
else \
|
||||||
|
test -f "$(distdir)/$$file" \
|
||||||
|
|| cp -p $$d/$$file "$(distdir)/$$file" \
|
||||||
|
|| exit 1; \
|
||||||
|
fi; \
|
||||||
|
done
|
||||||
|
check-am: all-am
|
||||||
|
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
|
||||||
|
check: check-am
|
||||||
|
all-am: Makefile $(PROGRAMS)
|
||||||
|
installdirs:
|
||||||
|
install: install-am
|
||||||
|
install-exec: install-exec-am
|
||||||
|
install-data: install-data-am
|
||||||
|
uninstall: uninstall-am
|
||||||
|
|
||||||
|
install-am: all-am
|
||||||
|
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
|
||||||
|
|
||||||
|
installcheck: installcheck-am
|
||||||
|
install-strip:
|
||||||
|
if test -z '$(STRIP)'; then \
|
||||||
|
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||||
|
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||||||
|
install; \
|
||||||
|
else \
|
||||||
|
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||||
|
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||||||
|
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
|
||||||
|
fi
|
||||||
|
mostlyclean-generic:
|
||||||
|
|
||||||
|
clean-generic:
|
||||||
|
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||||
|
|
||||||
|
distclean-generic:
|
||||||
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
||||||
|
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
||||||
|
|
||||||
|
maintainer-clean-generic:
|
||||||
|
@echo "This command is intended for maintainers to use"
|
||||||
|
@echo "it deletes files that may require special tools to rebuild."
|
||||||
|
clean: clean-am
|
||||||
|
|
||||||
|
clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
|
||||||
|
mostlyclean-am
|
||||||
|
|
||||||
|
distclean: distclean-am
|
||||||
|
-rm -rf ./$(DEPDIR)
|
||||||
|
-rm -f Makefile
|
||||||
|
distclean-am: clean-am distclean-compile distclean-generic \
|
||||||
|
distclean-tags
|
||||||
|
|
||||||
|
dvi: dvi-am
|
||||||
|
|
||||||
|
dvi-am:
|
||||||
|
|
||||||
|
html: html-am
|
||||||
|
|
||||||
|
html-am:
|
||||||
|
|
||||||
|
info: info-am
|
||||||
|
|
||||||
|
info-am:
|
||||||
|
|
||||||
|
install-data-am:
|
||||||
|
|
||||||
|
install-dvi: install-dvi-am
|
||||||
|
|
||||||
|
install-dvi-am:
|
||||||
|
|
||||||
|
install-exec-am:
|
||||||
|
|
||||||
|
install-html: install-html-am
|
||||||
|
|
||||||
|
install-html-am:
|
||||||
|
|
||||||
|
install-info: install-info-am
|
||||||
|
|
||||||
|
install-info-am:
|
||||||
|
|
||||||
|
install-man:
|
||||||
|
|
||||||
|
install-pdf: install-pdf-am
|
||||||
|
|
||||||
|
install-pdf-am:
|
||||||
|
|
||||||
|
install-ps: install-ps-am
|
||||||
|
|
||||||
|
install-ps-am:
|
||||||
|
|
||||||
|
installcheck-am:
|
||||||
|
|
||||||
|
maintainer-clean: maintainer-clean-am
|
||||||
|
-rm -rf ./$(DEPDIR)
|
||||||
|
-rm -f Makefile
|
||||||
|
maintainer-clean-am: distclean-am maintainer-clean-generic
|
||||||
|
|
||||||
|
mostlyclean: mostlyclean-am
|
||||||
|
|
||||||
|
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
|
||||||
|
mostlyclean-libtool
|
||||||
|
|
||||||
|
pdf: pdf-am
|
||||||
|
|
||||||
|
pdf-am:
|
||||||
|
|
||||||
|
ps: ps-am
|
||||||
|
|
||||||
|
ps-am:
|
||||||
|
|
||||||
|
uninstall-am:
|
||||||
|
|
||||||
|
.MAKE: check-am install-am install-strip
|
||||||
|
|
||||||
|
.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
|
||||||
|
clean-generic clean-libtool clean-noinstPROGRAMS cscopelist \
|
||||||
|
ctags distclean distclean-compile distclean-generic \
|
||||||
|
distclean-libtool distclean-tags distdir dvi dvi-am html \
|
||||||
|
html-am info info-am install install-am install-data \
|
||||||
|
install-data-am install-dvi install-dvi-am install-exec \
|
||||||
|
install-exec-am install-html install-html-am install-info \
|
||||||
|
install-info-am install-man install-pdf install-pdf-am \
|
||||||
|
install-ps install-ps-am install-strip installcheck \
|
||||||
|
installcheck-am installdirs maintainer-clean \
|
||||||
|
maintainer-clean-generic mostlyclean mostlyclean-compile \
|
||||||
|
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
||||||
|
tags uninstall uninstall-am
|
||||||
|
|
||||||
|
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_FALSE@xi1-tests:
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_FALSE@ @echo 'echo "ld -wrap support required for xi1 unit tests, skipping"' > $@
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_FALSE@ @echo 'exit 77' >> $@
|
||||||
|
@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_FALSE@ $(AM_V_GEN)chmod +x $@
|
||||||
|
|
||||||
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||||
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
|
.NOEXPORT:
|
||||||
122
xserver/test/xi1/protocol-xchangedevicecontrol.c
Normal file
122
xserver/test/xi1/protocol-xchangedevicecontrol.c
Normal file
@ -0,0 +1,122 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
|
* copy of this software and associated documentation files (the "Software"),
|
||||||
|
* to deal in the Software without restriction, including without limitation
|
||||||
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||||
|
* and/or sell copies of the Software, and to permit persons to whom the
|
||||||
|
* Software is furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice (including the next
|
||||||
|
* paragraph) shall be included in all copies or substantial portions of the
|
||||||
|
* Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
|
* DEALINGS IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef HAVE_DIX_CONFIG_H
|
||||||
|
#include <dix-config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Protocol testing for ChangeDeviceControl request.
|
||||||
|
*/
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <X11/X.h>
|
||||||
|
#include <X11/Xproto.h>
|
||||||
|
#include <X11/extensions/XIproto.h>
|
||||||
|
#include "inputstr.h"
|
||||||
|
#include "chgdctl.h"
|
||||||
|
|
||||||
|
#include "protocol-common.h"
|
||||||
|
|
||||||
|
static ClientRec client_request;
|
||||||
|
|
||||||
|
static void
|
||||||
|
reply_ChangeDeviceControl(ClientPtr client, int len, char *data, void *userdata)
|
||||||
|
{
|
||||||
|
xChangeDeviceControlReply *rep = (xChangeDeviceControlReply *) data;
|
||||||
|
|
||||||
|
if (client->swapped) {
|
||||||
|
swapl(&rep->length);
|
||||||
|
swaps(&rep->sequenceNumber);
|
||||||
|
}
|
||||||
|
|
||||||
|
reply_check_defaults(rep, len, ChangeDeviceControl);
|
||||||
|
|
||||||
|
/* XXX: check status code in reply */
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
request_ChangeDeviceControl(ClientPtr client, xChangeDeviceControlReq * req,
|
||||||
|
xDeviceCtl *ctl, int error)
|
||||||
|
{
|
||||||
|
int rc;
|
||||||
|
|
||||||
|
client_request.req_len = req->length;
|
||||||
|
rc = ProcXChangeDeviceControl(&client_request);
|
||||||
|
assert(rc == error);
|
||||||
|
|
||||||
|
/* XXX: ChangeDeviceControl doesn't seem to fill in errorValue to check */
|
||||||
|
|
||||||
|
client_request.swapped = TRUE;
|
||||||
|
swaps(&req->length);
|
||||||
|
swaps(&req->control);
|
||||||
|
swaps(&ctl->length);
|
||||||
|
swaps(&ctl->control);
|
||||||
|
/* XXX: swap other contents of ctl, depending on type */
|
||||||
|
rc = SProcXChangeDeviceControl(&client_request);
|
||||||
|
assert(rc == error);
|
||||||
|
}
|
||||||
|
|
||||||
|
static unsigned char *data[4096]; /* the request buffer */
|
||||||
|
|
||||||
|
static void
|
||||||
|
test_ChangeDeviceControl(void)
|
||||||
|
{
|
||||||
|
xChangeDeviceControlReq *request = (xChangeDeviceControlReq *) data;
|
||||||
|
xDeviceCtl *control = (xDeviceCtl *) (&request[1]);
|
||||||
|
|
||||||
|
request_init(request, ChangeDeviceControl);
|
||||||
|
|
||||||
|
reply_handler = reply_ChangeDeviceControl;
|
||||||
|
|
||||||
|
client_request = init_client(request->length, request);
|
||||||
|
|
||||||
|
printf("Testing invalid lengths:\n");
|
||||||
|
printf(" -- no control struct\n");
|
||||||
|
request_ChangeDeviceControl(&client_request, request, control, BadLength);
|
||||||
|
|
||||||
|
printf(" -- xDeviceResolutionCtl\n");
|
||||||
|
request_init(request, ChangeDeviceControl);
|
||||||
|
request->control = DEVICE_RESOLUTION;
|
||||||
|
control->length = (sizeof(xDeviceResolutionCtl) >> 2);
|
||||||
|
request->length += control->length - 2;
|
||||||
|
request_ChangeDeviceControl(&client_request, request, control, BadLength);
|
||||||
|
|
||||||
|
printf(" -- xDeviceEnableCtl\n");
|
||||||
|
request_init(request, ChangeDeviceControl);
|
||||||
|
request->control = DEVICE_ENABLE;
|
||||||
|
control->length = (sizeof(xDeviceEnableCtl) >> 2);
|
||||||
|
request->length += control->length - 2;
|
||||||
|
request_ChangeDeviceControl(&client_request, request, control, BadLength);
|
||||||
|
|
||||||
|
/* XXX: Test functionality! */
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
main(int argc, char **argv)
|
||||||
|
{
|
||||||
|
init_simple();
|
||||||
|
|
||||||
|
test_ChangeDeviceControl();
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user