update buildroot to 2017.02.11
This commit is contained in:
jbnadal
@@ -0,0 +1,50 @@
|
||||
From 21b896939c5bb242f3aacc37baf12379e43254b6 Mon Sep 17 00:00:00 2001
|
||||
From: Egbert Eich <eich@freedesktop.org>
|
||||
Date: Tue, 3 Mar 2015 16:27:05 +0100
|
||||
Subject: symbols: Fix sdksyms.sh to cope with gcc5
|
||||
|
||||
Gcc5 adds additional lines stating line numbers before and
|
||||
after __attribute__() which need to be skipped.
|
||||
|
||||
Downloaded from upstream commit
|
||||
https://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/sdksyms.sh?id=21b896939c5bb242f3aacc37baf12379e43254b6
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Signed-off-by: Egbert Eich <eich@freedesktop.org>
|
||||
Tested-by: Daniel Stone <daniels@collabora.com>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
|
||||
index 2305073..05ac410 100755
|
||||
--- a/hw/xfree86/sdksyms.sh
|
||||
+++ b/hw/xfree86/sdksyms.sh
|
||||
@@ -350,13 +350,25 @@ BEGIN {
|
||||
if (sdk) {
|
||||
n = 3;
|
||||
|
||||
+ # skip line numbers GCC 5 adds before __attribute__
|
||||
+ while ($n == "" || $0 ~ /^# [0-9]+ "/) {
|
||||
+ getline;
|
||||
+ n = 1;
|
||||
+ }
|
||||
+
|
||||
# skip attribute, if any
|
||||
while ($n ~ /^(__attribute__|__global)/ ||
|
||||
# skip modifiers, if any
|
||||
$n ~ /^\*?(unsigned|const|volatile|struct|_X_EXPORT)$/ ||
|
||||
# skip pointer
|
||||
- $n ~ /^[a-zA-Z0-9_]*\*$/)
|
||||
+ $n ~ /^[a-zA-Z0-9_]*\*$/) {
|
||||
n++;
|
||||
+ # skip line numbers GCC 5 adds after __attribute__
|
||||
+ while ($n == "" || $0 ~ /^# [0-9]+ "/) {
|
||||
+ getline;
|
||||
+ n = 1;
|
||||
+ }
|
||||
+ }
|
||||
|
||||
# type specifier may not be set, as in
|
||||
# extern _X_EXPORT unsigned name(...)
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 05442de962d3dc624f79fc1a00eca3ffc5489ced Mon Sep 17 00:00:00 2001
|
||||
From: Michal Srb <msrb@suse.com>
|
||||
Date: Wed, 24 May 2017 15:54:39 +0300
|
||||
Subject: [PATCH] Xi: Zero target buffer in SProcXSendExtensionEvent.
|
||||
|
||||
Make sure that the xEvent eventT is initialized with zeros, the same way as
|
||||
in SProcSendEvent.
|
||||
|
||||
Some event swapping functions do not overwrite all 32 bytes of xEvent
|
||||
structure, for example XSecurityAuthorizationRevoked. Two cooperating
|
||||
clients, one swapped and the other not, can send
|
||||
XSecurityAuthorizationRevoked event to each other to retrieve old stack data
|
||||
from X server. This can be potentialy misused to go around ASLR or
|
||||
stack-protector.
|
||||
|
||||
Signed-off-by: Michal Srb <msrb@suse.com>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
Xi/sendexev.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
|
||||
index 11d82029f..1cf118ab6 100644
|
||||
--- a/Xi/sendexev.c
|
||||
+++ b/Xi/sendexev.c
|
||||
@@ -78,7 +78,7 @@ SProcXSendExtensionEvent(ClientPtr client)
|
||||
{
|
||||
CARD32 *p;
|
||||
int i;
|
||||
- xEvent eventT;
|
||||
+ xEvent eventT = { .u.u.type = 0 };
|
||||
xEvent *eventP;
|
||||
EventSwapPtr proc;
|
||||
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
From 215f894965df5fb0bb45b107d84524e700d2073c Mon Sep 17 00:00:00 2001
|
||||
From: Michal Srb <msrb@suse.com>
|
||||
Date: Wed, 24 May 2017 15:54:40 +0300
|
||||
Subject: [PATCH] dix: Disallow GenericEvent in SendEvent request.
|
||||
|
||||
The SendEvent request holds xEvent which is exactly 32 bytes long, no more,
|
||||
no less. Both ProcSendEvent and SProcSendEvent verify that the received data
|
||||
exactly match the request size. However nothing stops the client from passing
|
||||
in event with xEvent::type = GenericEvent and any value of
|
||||
xGenericEvent::length.
|
||||
|
||||
In the case of ProcSendEvent, the event will be eventually passed to
|
||||
WriteEventsToClient which will see that it is Generic event and copy the
|
||||
arbitrary length from the receive buffer (and possibly past it) and send it to
|
||||
the other client. This allows clients to copy unitialized heap memory out of X
|
||||
server or to crash it.
|
||||
|
||||
In case of SProcSendEvent, it will attempt to swap the incoming event by
|
||||
calling a swapping function from the EventSwapVector array. The swapped event
|
||||
is written to target buffer, which in this case is local xEvent variable. The
|
||||
xEvent variable is 32 bytes long, but the swapping functions for GenericEvents
|
||||
expect that the target buffer has size matching the size of the source
|
||||
GenericEvent. This allows clients to cause stack buffer overflows.
|
||||
|
||||
Signed-off-by: Michal Srb <msrb@suse.com>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
dix/events.c | 6 ++++++
|
||||
dix/swapreq.c | 7 +++++++
|
||||
2 files changed, 13 insertions(+)
|
||||
|
||||
diff --git a/dix/events.c b/dix/events.c
|
||||
index 3e3a01ef9..d3a33ea3f 100644
|
||||
--- a/dix/events.c
|
||||
+++ b/dix/events.c
|
||||
@@ -5366,6 +5366,12 @@ ProcSendEvent(ClientPtr client)
|
||||
client->errorValue = stuff->event.u.u.type;
|
||||
return BadValue;
|
||||
}
|
||||
+ /* Generic events can have variable size, but SendEvent request holds
|
||||
+ exactly 32B of event data. */
|
||||
+ if (stuff->event.u.u.type == GenericEvent) {
|
||||
+ client->errorValue = stuff->event.u.u.type;
|
||||
+ return BadValue;
|
||||
+ }
|
||||
if (stuff->event.u.u.type == ClientMessage &&
|
||||
stuff->event.u.u.detail != 8 &&
|
||||
stuff->event.u.u.detail != 16 && stuff->event.u.u.detail != 32) {
|
||||
diff --git a/dix/swapreq.c b/dix/swapreq.c
|
||||
index 719e9b81c..67850593b 100644
|
||||
--- a/dix/swapreq.c
|
||||
+++ b/dix/swapreq.c
|
||||
@@ -292,6 +292,13 @@ SProcSendEvent(ClientPtr client)
|
||||
swapl(&stuff->destination);
|
||||
swapl(&stuff->eventMask);
|
||||
|
||||
+ /* Generic events can have variable size, but SendEvent request holds
|
||||
+ exactly 32B of event data. */
|
||||
+ if (stuff->event.u.u.type == GenericEvent) {
|
||||
+ client->errorValue = stuff->event.u.u.type;
|
||||
+ return BadValue;
|
||||
+ }
|
||||
+
|
||||
/* Swap event */
|
||||
proc = EventSwapVector[stuff->event.u.u.type & 0177];
|
||||
if (!proc || proc == NotImplemented) /* no swapping proc; invalid event type? */
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
From 8caed4df36b1f802b4992edcfd282cbeeec35d9d Mon Sep 17 00:00:00 2001
|
||||
From: Michal Srb <msrb@suse.com>
|
||||
Date: Wed, 24 May 2017 15:54:41 +0300
|
||||
Subject: [PATCH] Xi: Verify all events in ProcXSendExtensionEvent.
|
||||
|
||||
The requirement is that events have type in range
|
||||
EXTENSION_EVENT_BASE..lastEvent, but it was tested
|
||||
only for first event of all.
|
||||
|
||||
Signed-off-by: Michal Srb <msrb@suse.com>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
Xi/sendexev.c | 12 +++++++-----
|
||||
1 file changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
|
||||
index 1cf118ab6..5e63bfcca 100644
|
||||
--- a/Xi/sendexev.c
|
||||
+++ b/Xi/sendexev.c
|
||||
@@ -117,7 +117,7 @@ SProcXSendExtensionEvent(ClientPtr client)
|
||||
int
|
||||
ProcXSendExtensionEvent(ClientPtr client)
|
||||
{
|
||||
- int ret;
|
||||
+ int ret, i;
|
||||
DeviceIntPtr dev;
|
||||
xEvent *first;
|
||||
XEventClass *list;
|
||||
@@ -141,10 +141,12 @@ ProcXSendExtensionEvent(ClientPtr client)
|
||||
/* The client's event type must be one defined by an extension. */
|
||||
|
||||
first = ((xEvent *) &stuff[1]);
|
||||
- if (!((EXTENSION_EVENT_BASE <= first->u.u.type) &&
|
||||
- (first->u.u.type < lastEvent))) {
|
||||
- client->errorValue = first->u.u.type;
|
||||
- return BadValue;
|
||||
+ for (i = 0; i < stuff->num_events; i++) {
|
||||
+ if (!((EXTENSION_EVENT_BASE <= first[i].u.u.type) &&
|
||||
+ (first[i].u.u.type < lastEvent))) {
|
||||
+ client->errorValue = first[i].u.u.type;
|
||||
+ return BadValue;
|
||||
+ }
|
||||
}
|
||||
|
||||
list = (XEventClass *) (first + stuff->num_events);
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
From ba336b24052122b136486961c82deac76bbde455 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Srb <msrb@suse.com>
|
||||
Date: Wed, 24 May 2017 15:54:42 +0300
|
||||
Subject: [PATCH] Xi: Do not try to swap GenericEvent.
|
||||
|
||||
The SProcXSendExtensionEvent must not attempt to swap GenericEvent because
|
||||
it is assuming that the event has fixed size and gives the swapping function
|
||||
xEvent-sized buffer.
|
||||
|
||||
A GenericEvent would be later rejected by ProcXSendExtensionEvent anyway.
|
||||
|
||||
Signed-off-by: Michal Srb <msrb@suse.com>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
Xi/sendexev.c | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
|
||||
index 5e63bfcca..5c2e0fc56 100644
|
||||
--- a/Xi/sendexev.c
|
||||
+++ b/Xi/sendexev.c
|
||||
@@ -95,9 +95,17 @@ SProcXSendExtensionEvent(ClientPtr client)
|
||||
|
||||
eventP = (xEvent *) &stuff[1];
|
||||
for (i = 0; i < stuff->num_events; i++, eventP++) {
|
||||
+ if (eventP->u.u.type == GenericEvent) {
|
||||
+ client->errorValue = eventP->u.u.type;
|
||||
+ return BadValue;
|
||||
+ }
|
||||
+
|
||||
proc = EventSwapVector[eventP->u.u.type & 0177];
|
||||
- if (proc == NotImplemented) /* no swapping proc; invalid event type? */
|
||||
+ /* no swapping proc; invalid event type? */
|
||||
+ if (proc == NotImplemented) {
|
||||
+ client->errorValue = eventP->u.u.type;
|
||||
return BadValue;
|
||||
+ }
|
||||
(*proc) (eventP, &eventT);
|
||||
*eventP = eventT;
|
||||
}
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
Kernel modesettings support also depends on dri2, see
|
||||
http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/drivers/modesetting/Makefile.am#n46
|
||||
|
||||
Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=91584
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
diff -uNr xorg-server-1.17.2.org/configure.ac xorg-server-1.17.2/configure.ac
|
||||
--- xorg-server-1.17.2.org/configure.ac 2015-06-16 17:42:40.000000000 +0200
|
||||
+++ xorg-server-1.17.2/configure.ac 2015-08-08 10:44:59.702382624 +0200
|
||||
@@ -2036,7 +2036,7 @@
|
||||
XORG_SYS_LIBS="$XORG_SYS_LIBS $XORG_MODULES_LIBS"
|
||||
fi
|
||||
|
||||
- if test "x$DRM" = xyes; then
|
||||
+ if test "x$DRM" = xyes -a "x$DRI2" = xyes; then
|
||||
dnl 2.4.46 is required for cursor hotspot support.
|
||||
PKG_CHECK_EXISTS(libdrm >= 2.4.46)
|
||||
XORG_DRIVER_MODESETTING=yes
|
||||
@@ -0,0 +1,39 @@
|
||||
From 05442de962d3dc624f79fc1a00eca3ffc5489ced Mon Sep 17 00:00:00 2001
|
||||
From: Michal Srb <msrb@suse.com>
|
||||
Date: Wed, 24 May 2017 15:54:39 +0300
|
||||
Subject: [PATCH] Xi: Zero target buffer in SProcXSendExtensionEvent.
|
||||
|
||||
Make sure that the xEvent eventT is initialized with zeros, the same way as
|
||||
in SProcSendEvent.
|
||||
|
||||
Some event swapping functions do not overwrite all 32 bytes of xEvent
|
||||
structure, for example XSecurityAuthorizationRevoked. Two cooperating
|
||||
clients, one swapped and the other not, can send
|
||||
XSecurityAuthorizationRevoked event to each other to retrieve old stack data
|
||||
from X server. This can be potentialy misused to go around ASLR or
|
||||
stack-protector.
|
||||
|
||||
Signed-off-by: Michal Srb <msrb@suse.com>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
Xi/sendexev.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
|
||||
index 11d82029f..1cf118ab6 100644
|
||||
--- a/Xi/sendexev.c
|
||||
+++ b/Xi/sendexev.c
|
||||
@@ -78,7 +78,7 @@ SProcXSendExtensionEvent(ClientPtr client)
|
||||
{
|
||||
CARD32 *p;
|
||||
int i;
|
||||
- xEvent eventT;
|
||||
+ xEvent eventT = { .u.u.type = 0 };
|
||||
xEvent *eventP;
|
||||
EventSwapPtr proc;
|
||||
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
From 215f894965df5fb0bb45b107d84524e700d2073c Mon Sep 17 00:00:00 2001
|
||||
From: Michal Srb <msrb@suse.com>
|
||||
Date: Wed, 24 May 2017 15:54:40 +0300
|
||||
Subject: [PATCH] dix: Disallow GenericEvent in SendEvent request.
|
||||
|
||||
The SendEvent request holds xEvent which is exactly 32 bytes long, no more,
|
||||
no less. Both ProcSendEvent and SProcSendEvent verify that the received data
|
||||
exactly match the request size. However nothing stops the client from passing
|
||||
in event with xEvent::type = GenericEvent and any value of
|
||||
xGenericEvent::length.
|
||||
|
||||
In the case of ProcSendEvent, the event will be eventually passed to
|
||||
WriteEventsToClient which will see that it is Generic event and copy the
|
||||
arbitrary length from the receive buffer (and possibly past it) and send it to
|
||||
the other client. This allows clients to copy unitialized heap memory out of X
|
||||
server or to crash it.
|
||||
|
||||
In case of SProcSendEvent, it will attempt to swap the incoming event by
|
||||
calling a swapping function from the EventSwapVector array. The swapped event
|
||||
is written to target buffer, which in this case is local xEvent variable. The
|
||||
xEvent variable is 32 bytes long, but the swapping functions for GenericEvents
|
||||
expect that the target buffer has size matching the size of the source
|
||||
GenericEvent. This allows clients to cause stack buffer overflows.
|
||||
|
||||
Signed-off-by: Michal Srb <msrb@suse.com>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
dix/events.c | 6 ++++++
|
||||
dix/swapreq.c | 7 +++++++
|
||||
2 files changed, 13 insertions(+)
|
||||
|
||||
diff --git a/dix/events.c b/dix/events.c
|
||||
index 3e3a01ef9..d3a33ea3f 100644
|
||||
--- a/dix/events.c
|
||||
+++ b/dix/events.c
|
||||
@@ -5366,6 +5366,12 @@ ProcSendEvent(ClientPtr client)
|
||||
client->errorValue = stuff->event.u.u.type;
|
||||
return BadValue;
|
||||
}
|
||||
+ /* Generic events can have variable size, but SendEvent request holds
|
||||
+ exactly 32B of event data. */
|
||||
+ if (stuff->event.u.u.type == GenericEvent) {
|
||||
+ client->errorValue = stuff->event.u.u.type;
|
||||
+ return BadValue;
|
||||
+ }
|
||||
if (stuff->event.u.u.type == ClientMessage &&
|
||||
stuff->event.u.u.detail != 8 &&
|
||||
stuff->event.u.u.detail != 16 && stuff->event.u.u.detail != 32) {
|
||||
diff --git a/dix/swapreq.c b/dix/swapreq.c
|
||||
index 719e9b81c..67850593b 100644
|
||||
--- a/dix/swapreq.c
|
||||
+++ b/dix/swapreq.c
|
||||
@@ -292,6 +292,13 @@ SProcSendEvent(ClientPtr client)
|
||||
swapl(&stuff->destination);
|
||||
swapl(&stuff->eventMask);
|
||||
|
||||
+ /* Generic events can have variable size, but SendEvent request holds
|
||||
+ exactly 32B of event data. */
|
||||
+ if (stuff->event.u.u.type == GenericEvent) {
|
||||
+ client->errorValue = stuff->event.u.u.type;
|
||||
+ return BadValue;
|
||||
+ }
|
||||
+
|
||||
/* Swap event */
|
||||
proc = EventSwapVector[stuff->event.u.u.type & 0177];
|
||||
if (!proc || proc == NotImplemented) /* no swapping proc; invalid event type? */
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
From 8caed4df36b1f802b4992edcfd282cbeeec35d9d Mon Sep 17 00:00:00 2001
|
||||
From: Michal Srb <msrb@suse.com>
|
||||
Date: Wed, 24 May 2017 15:54:41 +0300
|
||||
Subject: [PATCH] Xi: Verify all events in ProcXSendExtensionEvent.
|
||||
|
||||
The requirement is that events have type in range
|
||||
EXTENSION_EVENT_BASE..lastEvent, but it was tested
|
||||
only for first event of all.
|
||||
|
||||
Signed-off-by: Michal Srb <msrb@suse.com>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
Xi/sendexev.c | 12 +++++++-----
|
||||
1 file changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
|
||||
index 1cf118ab6..5e63bfcca 100644
|
||||
--- a/Xi/sendexev.c
|
||||
+++ b/Xi/sendexev.c
|
||||
@@ -117,7 +117,7 @@ SProcXSendExtensionEvent(ClientPtr client)
|
||||
int
|
||||
ProcXSendExtensionEvent(ClientPtr client)
|
||||
{
|
||||
- int ret;
|
||||
+ int ret, i;
|
||||
DeviceIntPtr dev;
|
||||
xEvent *first;
|
||||
XEventClass *list;
|
||||
@@ -141,10 +141,12 @@ ProcXSendExtensionEvent(ClientPtr client)
|
||||
/* The client's event type must be one defined by an extension. */
|
||||
|
||||
first = ((xEvent *) &stuff[1]);
|
||||
- if (!((EXTENSION_EVENT_BASE <= first->u.u.type) &&
|
||||
- (first->u.u.type < lastEvent))) {
|
||||
- client->errorValue = first->u.u.type;
|
||||
- return BadValue;
|
||||
+ for (i = 0; i < stuff->num_events; i++) {
|
||||
+ if (!((EXTENSION_EVENT_BASE <= first[i].u.u.type) &&
|
||||
+ (first[i].u.u.type < lastEvent))) {
|
||||
+ client->errorValue = first[i].u.u.type;
|
||||
+ return BadValue;
|
||||
+ }
|
||||
}
|
||||
|
||||
list = (XEventClass *) (first + stuff->num_events);
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
From ba336b24052122b136486961c82deac76bbde455 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Srb <msrb@suse.com>
|
||||
Date: Wed, 24 May 2017 15:54:42 +0300
|
||||
Subject: [PATCH] Xi: Do not try to swap GenericEvent.
|
||||
|
||||
The SProcXSendExtensionEvent must not attempt to swap GenericEvent because
|
||||
it is assuming that the event has fixed size and gives the swapping function
|
||||
xEvent-sized buffer.
|
||||
|
||||
A GenericEvent would be later rejected by ProcXSendExtensionEvent anyway.
|
||||
|
||||
Signed-off-by: Michal Srb <msrb@suse.com>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
Xi/sendexev.c | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
|
||||
index 5e63bfcca..5c2e0fc56 100644
|
||||
--- a/Xi/sendexev.c
|
||||
+++ b/Xi/sendexev.c
|
||||
@@ -95,9 +95,17 @@ SProcXSendExtensionEvent(ClientPtr client)
|
||||
|
||||
eventP = (xEvent *) &stuff[1];
|
||||
for (i = 0; i < stuff->num_events; i++, eventP++) {
|
||||
+ if (eventP->u.u.type == GenericEvent) {
|
||||
+ client->errorValue = eventP->u.u.type;
|
||||
+ return BadValue;
|
||||
+ }
|
||||
+
|
||||
proc = EventSwapVector[eventP->u.u.type & 0177];
|
||||
- if (proc == NotImplemented) /* no swapping proc; invalid event type? */
|
||||
+ /* no swapping proc; invalid event type? */
|
||||
+ if (proc == NotImplemented) {
|
||||
+ client->errorValue = eventP->u.u.type;
|
||||
return BadValue;
|
||||
+ }
|
||||
(*proc) (eventP, &eventT);
|
||||
*eventP = eventT;
|
||||
}
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
Kernel modesettings support also depends on dri2, see
|
||||
http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/drivers/modesetting/Makefile.am#n46
|
||||
|
||||
Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=91584
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
diff -uNr xorg-server-1.17.2.org/configure.ac xorg-server-1.17.2/configure.ac
|
||||
--- xorg-server-1.17.2.org/configure.ac 2015-06-16 17:42:40.000000000 +0200
|
||||
+++ xorg-server-1.17.2/configure.ac 2015-08-08 10:44:59.702382624 +0200
|
||||
@@ -2036,7 +2036,7 @@
|
||||
XORG_SYS_LIBS="$XORG_SYS_LIBS $XORG_MODULES_LIBS"
|
||||
fi
|
||||
|
||||
- if test "x$DRM" = xyes; then
|
||||
+ if test "x$DRM" = xyes -a "x$DRI2" = xyes; then
|
||||
dnl 2.4.46 is required for cursor hotspot support.
|
||||
PKG_CHECK_EXISTS(libdrm >= 2.4.46)
|
||||
XORG_DRIVER_MODESETTING=yes
|
||||
@@ -0,0 +1,66 @@
|
||||
Discover monotonic clock using compile-time check
|
||||
|
||||
monotonic clock check does not work when cross-compiling.
|
||||
|
||||
Upstream-Status: Denied [Does not work on OpenBSD]
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
|
||||
|
||||
|
||||
Original patch follows:
|
||||
|
||||
When xorg-xserver is being cross-compiled, there is currently no way
|
||||
for us to detect whether the monotonic clock is available on the
|
||||
target system, because we aren't able to run a test program on the host
|
||||
system. Currently, in this situation, we default to not use the
|
||||
monotonic clock. One problem with this situation is that the user will
|
||||
be treated as idle when the date is updated.
|
||||
|
||||
To fix this situation, we now use a compile-time check to detect whether the
|
||||
monotonic clock is available. This check can run just fine when we are
|
||||
cross-compiling.
|
||||
|
||||
Signed-off-by: David James <davidjames at google.com>
|
||||
|
||||
Downloaded from
|
||||
https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
configure.ac | 17 +++++++----------
|
||||
1 file changed, 7 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f7ab48c..26e85cd 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1048,19 +1048,16 @@ if ! test "x$have_clock_gettime" = xno; then
|
||||
CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
|
||||
fi
|
||||
|
||||
- AC_RUN_IFELSE([AC_LANG_SOURCE([
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
|
||||
#include <time.h>
|
||||
-
|
||||
-int main(int argc, char *argv[[]]) {
|
||||
- struct timespec tp;
|
||||
-
|
||||
- if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
|
||||
+#include <unistd.h>
|
||||
+int main() {
|
||||
+#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC))
|
||||
+ #error No monotonic clock
|
||||
+#endif
|
||||
return 0;
|
||||
- else
|
||||
- return 1;
|
||||
}
|
||||
- ])], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no],
|
||||
- [MONOTONIC_CLOCK="cross compiling"])
|
||||
+]])],[MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no])
|
||||
|
||||
LIBS="$LIBS_SAVE"
|
||||
CPPFLAGS="$CPPFLAGS_SAVE"
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
From cf407b16cd65ad6e26a9c8e5984e163409a5c0f7 Mon Sep 17 00:00:00 2001
|
||||
From: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
|
||||
Date: Mon, 30 Jan 2017 16:32:06 -0600
|
||||
Subject: [PATCH] Remove check for useSIGIO option
|
||||
|
||||
Original patch follows:
|
||||
Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of useSIGIO
|
||||
option.
|
||||
|
||||
As the xfree86 SIGIO support is reworked to use internal versions of OsBlockSIGIO
|
||||
and OsReleaseSIGIO.
|
||||
|
||||
No longer the check for useSIGIO is needed
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
|
||||
|
||||
Downloaded from
|
||||
https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch
|
||||
|
||||
Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
|
||||
---
|
||||
hw/xfree86/os-support/shared/sigio.c | 6 ------
|
||||
1 file changed, 6 deletions(-)
|
||||
|
||||
diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
|
||||
index 884a71c..be76498 100644
|
||||
--- a/hw/xfree86/os-support/shared/sigio.c
|
||||
+++ b/hw/xfree86/os-support/shared/sigio.c
|
||||
@@ -185,9 +185,6 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure)
|
||||
int i;
|
||||
int installed = FALSE;
|
||||
|
||||
- if (!xf86Info.useSIGIO)
|
||||
- return 0;
|
||||
-
|
||||
for (i = 0; i < MAX_FUNCS; i++) {
|
||||
if (!xf86SigIOFuncs[i].f) {
|
||||
if (xf86IsPipe(fd))
|
||||
@@ -256,9 +253,6 @@ xf86RemoveSIGIOHandler(int fd)
|
||||
int max;
|
||||
int ret;
|
||||
|
||||
- if (!xf86Info.useSIGIO)
|
||||
- return 0;
|
||||
-
|
||||
max = 0;
|
||||
ret = 0;
|
||||
for (i = 0; i < MAX_FUNCS; i++) {
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,181 @@
|
||||
comment "xorg-server needs a glibc or uClibc toolchain"
|
||||
depends on BR2_arm && BR2_TOOLCHAIN_USES_MUSL
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER
|
||||
bool "xorg-server"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
# xserver uses inb/outb on arm, which aren't available with musl
|
||||
depends on !(BR2_arm && BR2_TOOLCHAIN_USES_MUSL)
|
||||
# We need a SHA1 implementation. If either openssl or
|
||||
# libgcrypt are already part of the build, we'll use one of
|
||||
# them, otherwise, use the small libsha1 library.
|
||||
select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT)
|
||||
select BR2_PACKAGE_MCOOKIE
|
||||
select BR2_PACKAGE_PIXMAN
|
||||
select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
|
||||
select BR2_PACKAGE_XFONT_FONT_MISC_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
|
||||
select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
|
||||
select BR2_PACKAGE_XLIB_LIBX11
|
||||
select BR2_PACKAGE_XLIB_LIBXAU
|
||||
select BR2_PACKAGE_XLIB_LIBXCURSOR
|
||||
select BR2_PACKAGE_XLIB_LIBXDAMAGE
|
||||
select BR2_PACKAGE_XLIB_LIBXDMCP
|
||||
select BR2_PACKAGE_XLIB_LIBXEXT
|
||||
select BR2_PACKAGE_XLIB_LIBXFIXES
|
||||
select BR2_PACKAGE_XLIB_LIBXFT
|
||||
select BR2_PACKAGE_XLIB_LIBXI
|
||||
select BR2_PACKAGE_XLIB_LIBXINERAMA
|
||||
select BR2_PACKAGE_XLIB_LIBXRANDR
|
||||
select BR2_PACKAGE_XLIB_LIBXRENDER
|
||||
select BR2_PACKAGE_XLIB_LIBXRES
|
||||
select BR2_PACKAGE_XLIB_LIBXXF86VM
|
||||
select BR2_PACKAGE_XLIB_LIBXKBFILE
|
||||
select BR2_PACKAGE_XLIB_XTRANS
|
||||
select BR2_PACKAGE_XDATA_XBITMAPS
|
||||
select BR2_PACKAGE_XPROTO_BIGREQSPROTO
|
||||
select BR2_PACKAGE_XPROTO_COMPOSITEPROTO
|
||||
select BR2_PACKAGE_XPROTO_DAMAGEPROTO
|
||||
select BR2_PACKAGE_XPROTO_FIXESPROTO
|
||||
select BR2_PACKAGE_XPROTO_FONTSPROTO
|
||||
select BR2_PACKAGE_XPROTO_GLPROTO
|
||||
select BR2_PACKAGE_XPROTO_INPUTPROTO
|
||||
select BR2_PACKAGE_XPROTO_KBPROTO
|
||||
select BR2_PACKAGE_XPROTO_RANDRPROTO
|
||||
select BR2_PACKAGE_XPROTO_RENDERPROTO
|
||||
select BR2_PACKAGE_XPROTO_RESOURCEPROTO
|
||||
select BR2_PACKAGE_XPROTO_VIDEOPROTO
|
||||
select BR2_PACKAGE_XPROTO_XCMISCPROTO
|
||||
select BR2_PACKAGE_XPROTO_XEXTPROTO
|
||||
select BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
|
||||
select BR2_PACKAGE_XPROTO_XF86DGAPROTO
|
||||
select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
|
||||
select BR2_PACKAGE_XPROTO_XPROTO
|
||||
select BR2_PACKAGE_XUTIL_UTIL_MACROS
|
||||
select BR2_PACKAGE_XKEYBOARD_CONFIG
|
||||
select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_SYSTEMD
|
||||
help
|
||||
X.Org X server
|
||||
|
||||
http://xorg.freedesktop.org
|
||||
|
||||
if BR2_PACKAGE_XSERVER_XORG_SERVER
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
|
||||
bool
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
|
||||
bool
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
|
||||
bool
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI
|
||||
int
|
||||
default 14 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
|
||||
default 19 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
|
||||
default 23 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
|
||||
|
||||
choice
|
||||
bool "X Window System server version"
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
|
||||
bool "1.19.5"
|
||||
select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
|
||||
select BR2_PACKAGE_XLIB_LIBXFONT2
|
||||
select BR2_PACKAGE_XPROTO_PRESENTPROTO
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
|
||||
bool "1.17.4"
|
||||
select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
|
||||
select BR2_PACKAGE_XLIB_LIBXFONT
|
||||
select BR2_PACKAGE_XPROTO_PRESENTPROTO
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14
|
||||
bool "1.14.7"
|
||||
select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
|
||||
select BR2_PACKAGE_XLIB_LIBXFONT
|
||||
|
||||
endchoice
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION
|
||||
string
|
||||
default "1.19.5" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
|
||||
default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
|
||||
default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14
|
||||
|
||||
choice
|
||||
prompt "X Window System server type"
|
||||
help
|
||||
Select the X Window System server to use
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
|
||||
bool "Modular X.org"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
select BR2_PACKAGE_LIBDRM if (BR2_PACKAGE_XPROTO_XF86DRIPROTO || \
|
||||
BR2_PACKAGE_XPROTO_DRI2PROTO)
|
||||
select BR2_PACKAGE_LIBPCIACCESS
|
||||
select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO
|
||||
help
|
||||
This variant of the X.org server is the full-blown variant,
|
||||
as used by desktop GNU/Linux distributions. The drivers (for
|
||||
input and graphics) are built separately from the X.org
|
||||
server (see the xdriver* packages).
|
||||
|
||||
comment "Modular X.org needs a toolchain w/ C++"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
|
||||
bool "KDrive / TinyX"
|
||||
help
|
||||
This variant of the X.org server is a lightweight version
|
||||
intended for embedded systems. The drivers (for input and
|
||||
graphics) are built into the server. It is generally used
|
||||
directly on top of the Linux framebuffer without DRM or
|
||||
video card specific drivers.
|
||||
|
||||
endchoice
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX
|
||||
bool "Enable AIGLX Extension"
|
||||
# AIGLX Extension removed in 1.19.0
|
||||
depends on BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 || BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
|
||||
help
|
||||
Enable/Use AIGLX extension.
|
||||
|
||||
if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV
|
||||
bool "Enable KDrive/TinyX evdev input driver"
|
||||
help
|
||||
Enable evdev input driver in KDrive. This allows KDrive to
|
||||
use input devices that are integrated in the Linux input
|
||||
subsystem, i.e have a /dev/input/eventX device file. This is
|
||||
most likely the input driver you want to use.
|
||||
|
||||
This driver can then be enabled by running the X server
|
||||
using:
|
||||
|
||||
Xfbdev -keybd evdev,,device=/dev/input/eventX -mouse evdev,,device=/dev/input/eventY.
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD
|
||||
bool "Enable KDrive/TinyX kbd input driver"
|
||||
help
|
||||
Enable kbd input driver in KDrive. It uses the console
|
||||
keyboard as input device.
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE
|
||||
bool "Enable KDrive/TinyX mouse input driver"
|
||||
help
|
||||
Enable mouse input driver in KDrive. It supports PS/2 mice
|
||||
and serial port mice.
|
||||
|
||||
endif
|
||||
|
||||
comment "Optional Servers"
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB
|
||||
bool "Xvfb server"
|
||||
help
|
||||
Virtual frame buffer X server.
|
||||
|
||||
endif
|
||||
@@ -0,0 +1,10 @@
|
||||
# From http://lists.x.org/archives/xorg-announce/2014-June/002440.html
|
||||
sha1 7a95765e56b124758fcd7b609589e65b8870880b xorg-server-1.14.7.tar.bz2
|
||||
sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f xorg-server-1.14.7.tar.bz2
|
||||
# From https://lists.x.org/archives/xorg-announce/2015-October/002650.html
|
||||
sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 xorg-server-1.17.4.tar.bz2
|
||||
# From https://lists.x.org/archives/xorg-announce/2017-October/002814.html
|
||||
md5 4ac6feeae6790436ce9de879ca9a3bf8 xorg-server-1.19.5.tar.bz2
|
||||
sha1 307d3405f709f7e41966c850b37deefe7f83eb9b xorg-server-1.19.5.tar.bz2
|
||||
sha256 18fffa8eb93d06d2800d06321fc0df4d357684d8d714315a66d8dfa7df251447 xorg-server-1.19.5.tar.bz2
|
||||
sha512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c xorg-server-1.19.5.tar.bz2
|
||||
@@ -0,0 +1,261 @@
|
||||
################################################################################
|
||||
#
|
||||
# xserver_xorg-server
|
||||
#
|
||||
################################################################################
|
||||
|
||||
XSERVER_XORG_SERVER_VERSION = $(call qstrip,$(BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION))
|
||||
XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
|
||||
XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver
|
||||
XSERVER_XORG_SERVER_LICENSE = MIT
|
||||
XSERVER_XORG_SERVER_LICENSE_FILES = COPYING
|
||||
XSERVER_XORG_SERVER_INSTALL_STAGING = YES
|
||||
# xfont_font-util is needed only for autoreconf
|
||||
XSERVER_XORG_SERVER_AUTORECONF = YES
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES = \
|
||||
xfont_font-util \
|
||||
xutil_util-macros \
|
||||
xlib_libX11 \
|
||||
xlib_libXau \
|
||||
xlib_libXdmcp \
|
||||
xlib_libXext \
|
||||
xlib_libXfixes \
|
||||
xlib_libXi \
|
||||
xlib_libXrender \
|
||||
xlib_libXres \
|
||||
xlib_libXft \
|
||||
xlib_libXcursor \
|
||||
xlib_libXinerama \
|
||||
xlib_libXrandr \
|
||||
xlib_libXdamage \
|
||||
xlib_libXxf86vm \
|
||||
xlib_libxkbfile \
|
||||
xlib_xtrans \
|
||||
xdata_xbitmaps \
|
||||
xproto_bigreqsproto \
|
||||
xproto_compositeproto \
|
||||
xproto_damageproto \
|
||||
xproto_fixesproto \
|
||||
xproto_fontsproto \
|
||||
xproto_glproto \
|
||||
xproto_inputproto \
|
||||
xproto_kbproto \
|
||||
xproto_randrproto \
|
||||
xproto_renderproto \
|
||||
xproto_resourceproto \
|
||||
xproto_videoproto \
|
||||
xproto_xcmiscproto \
|
||||
xproto_xextproto \
|
||||
xproto_xf86bigfontproto \
|
||||
xproto_xf86dgaproto \
|
||||
xproto_xf86vidmodeproto \
|
||||
xproto_xproto \
|
||||
xkeyboard-config \
|
||||
pixman \
|
||||
mcookie \
|
||||
host-pkgconf
|
||||
|
||||
# We force -O2 regardless of the optimization level chosen by the
|
||||
# user, as the X.org server is known to trigger some compiler bugs at
|
||||
# -Os on several architectures.
|
||||
XSERVER_XORG_SERVER_CONF_OPTS = \
|
||||
--disable-config-hal \
|
||||
--disable-xnest \
|
||||
--disable-xephyr \
|
||||
--disable-dmx \
|
||||
--with-builder-addr=buildroot@buildroot.org \
|
||||
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1 -O2" \
|
||||
--with-fontrootdir=/usr/share/fonts/X11/ \
|
||||
--$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += \
|
||||
--with-systemd-daemon \
|
||||
--enable-systemd-logind
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += \
|
||||
systemd \
|
||||
xproto_dri2proto
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += \
|
||||
--without-systemd-daemon \
|
||||
--disable-systemd-logind
|
||||
endif
|
||||
|
||||
# Xwayland support needs libdrm, libepoxy, wayland and libxcomposite
|
||||
ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY)$(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_WAYLAND_PROTOCOLS)$(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),yyyyy)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-xwayland
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libdrm libepoxy wayland wayland-protocols xlib_libXcomposite
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-xwayland
|
||||
endif
|
||||
|
||||
# Present protocol only required for xserver 1.15+, but does not matter if
|
||||
# enabled for older versions as they don't use it (not even optionally).
|
||||
ifeq ($(BR2_PACKAGE_XPROTO_PRESENTPROTO),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xproto_presentproto
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libpciaccess
|
||||
ifeq ($(BR2_PACKAGE_LIBDRM),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libdrm
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-libdrm
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-libdrm
|
||||
endif
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-xorg
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += \
|
||||
--enable-kdrive \
|
||||
--enable-xfbdev \
|
||||
--disable-glx \
|
||||
--disable-dri \
|
||||
--disable-xsdl
|
||||
define XSERVER_CREATE_X_SYMLINK
|
||||
ln -f -s Xfbdev $(TARGET_DIR)/usr/bin/X
|
||||
endef
|
||||
XSERVER_XORG_SERVER_POST_INSTALL_TARGET_HOOKS += XSERVER_CREATE_X_SYMLINK
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-evdev
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-evdev
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-kbd
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-kbd
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-mouse
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-mouse
|
||||
endif
|
||||
|
||||
else # modular
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive --disable-xfbdev
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-glx
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d xproto_xf86driproto
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-aiglx
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-aiglx
|
||||
endif
|
||||
|
||||
# Optional packages
|
||||
ifeq ($(BR2_PACKAGE_TSLIB),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += tslib
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-tslib LDFLAGS="-lts"
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += udev
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev
|
||||
# udev kms support depends on libdrm and dri2
|
||||
ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_XPROTO_DRI2PROTO),yy)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev-kms
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-config-udev-kms
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DBUS),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += dbus
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-dbus
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FREETYPE),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += freetype
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libunwind
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-libunwind
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-libunwind
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XPROTO_RECORDPROTO),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xproto_recordproto
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-record
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-record
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT2),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-xvmc
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXcomposite
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-composite
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
|
||||
ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xproto_dri2proto
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri2
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri2
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri3
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yyy)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libepoxy
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-glamor
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-glamor
|
||||
endif
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri3 --disable-glamor
|
||||
endif
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri2 --disable-dri3 --disable-glamor
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBXSCRNSAVER),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXScrnSaver
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-screensaver
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-screensaver
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dmx
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libcrypto
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += openssl
|
||||
else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libgcrypt
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libgcrypt
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libsha1
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libsha1
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user