This commit is contained in:
@@ -0,0 +1,20 @@
|
||||
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
|
||||
|
||||
[rebased for version 1.20.0]
|
||||
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
|
||||
XORG_DRIVER_MODESETTING=yes
|
||||
fi
|
||||
|
||||
@@ -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,31 @@
|
||||
From 2e8fca00f5bdb02f2f59aaa428d1e9d808ab0e86 Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Date: Sat, 16 Jun 2018 19:20:16 +0200
|
||||
Subject: [PATCH] include/misc.h: fix uClibc build
|
||||
|
||||
A similar fix was used for Dovecot:
|
||||
https://www.dovecot.org/list/dovecot/2017-November/110019.html
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
include/misc.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/include/misc.h b/include/misc.h
|
||||
index 14920c3c3..390e52b60 100644
|
||||
--- a/include/misc.h
|
||||
+++ b/include/misc.h
|
||||
@@ -185,6 +185,10 @@ typedef struct _xReq *xReqPtr;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#undef bswap_16
|
||||
+#undef bswap_32
|
||||
+#undef bswap_64
|
||||
+
|
||||
/**
|
||||
* Calculate the number of bytes needed to hold bits.
|
||||
* @param bits The minimum number of bits needed.
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
From b1d2a82d644518c1a75775244ac63be738aaf062 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri, 19 Apr 2019 10:19:50 +0200
|
||||
Subject: [PATCH] hw/xwayland/Makefile.am: fix build without glx
|
||||
|
||||
Commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b added libglxvnd.la to
|
||||
Xwayland_LDFLAGS but GLX can be disabled through --disable-glx.
|
||||
In this case, build fails on:
|
||||
|
||||
make[3]: *** No rule to make target '../../glx/libglxvnd.la', needed by 'Xwayland'. Stop.
|
||||
make[3]: *** Waiting for unfinished jobs....
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/397f8098c57fc6c88aa12dc8d35ebb1b933d52ef
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status:
|
||||
https://gitlab.freedesktop.org/xorg/xserver/merge_requests/173]
|
||||
---
|
||||
hw/xwayland/Makefile.am | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
|
||||
index bc1cb8506..502879e2a 100644
|
||||
--- a/hw/xwayland/Makefile.am
|
||||
+++ b/hw/xwayland/Makefile.am
|
||||
@@ -21,10 +21,14 @@ Xwayland_SOURCES = \
|
||||
$(top_srcdir)/Xi/stubs.c \
|
||||
$(top_srcdir)/mi/miinitext.c
|
||||
|
||||
+if GLX
|
||||
+GLXVND_LIB = $(top_builddir)/glx/libglxvnd.la
|
||||
+endif
|
||||
+
|
||||
Xwayland_LDADD = \
|
||||
$(glamor_lib) \
|
||||
$(XWAYLAND_LIBS) \
|
||||
- $(top_builddir)/glx/libglxvnd.la \
|
||||
+ $(GLXVND_LIB) \
|
||||
$(XWAYLAND_SYS_LIBS) \
|
||||
$(top_builddir)/Xext/libXvidmode.la \
|
||||
$(XSERVER_SYS_LIBS)
|
||||
--
|
||||
2.20.1
|
||||
|
||||
Reference in New Issue
Block a user