summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-09-20 12:34:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-21 18:45:46 -0700
commitd02939de276a4bf41182ec5cfa7b04aa329ff70b (patch)
tree81ac335941bf22ac3a10ecf2e630501bd710e55b /meta/recipes-graphics/xorg-xserver
parent3b993fc618684896e492a7d3bdcaef65ec5aab54 (diff)
downloadpoky-d02939de276a4bf41182ec5cfa7b04aa329ff70b.tar.gz
xserver-xorg: remove redundant patch
Upstream doesn't assume a monotonic clock isn't available anymore, so we can remove this patch. (From OE-Core rev: 25e034b4c3854a7a9190c4deee7fbca6ba4a8c47) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch60
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb1
2 files changed, 0 insertions, 61 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
deleted file mode 100644
index 020a1cf37c..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1From 8a91316c4a38f20e7866289f3d779a037d27a129 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Mon, 12 Dec 2016 12:11:39 +0200
4Subject: [PATCH] Discover monotonic clock using compile-time check
5
6monotonic clock check does not work when cross-compiling.
7
8Upstream-Status: Denied [Does not work on OpenBSD]
9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
10
11Original patch follows:
12
13When xorg-xserver is being cross-compiled, there is currently no way
14for us to detect whether the monotonic clock is available on the
15target system, because we aren't able to run a test program on the host
16system. Currently, in this situation, we default to not use the
17monotonic clock. One problem with this situation is that the user will
18be treated as idle when the date is updated.
19
20To fix this situation, we now use a compile-time check to detect whether the
21monotonic clock is available. This check can run just fine when we are
22cross-compiling.
23
24Signed-off-by: David James <davidjames at google.com>
25
26---
27 configure.ac | 17 +++++++----------
28 1 file changed, 7 insertions(+), 10 deletions(-)
29
30diff --git a/configure.ac b/configure.ac
31index 2b21667..786e002 100644
32--- a/configure.ac
33+++ b/configure.ac
34@@ -984,19 +984,16 @@ if ! test "x$have_clock_gettime" = xno; then
35 CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
36 fi
37
38- AC_RUN_IFELSE([AC_LANG_SOURCE([
39+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
40 #include <time.h>
41-
42-int main(int argc, char *argv[[]]) {
43- struct timespec tp;
44-
45- if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
46+#include <unistd.h>
47+int main() {
48+#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC))
49+ #error No monotonic clock
50+#endif
51 return 0;
52- else
53- return 1;
54 }
55- ])], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no],
56- [MONOTONIC_CLOCK="cross compiling"])
57+]])],[MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no])
58
59 if test "$MONOTONIC_CLOCK" = "cross compiling"; then
60 AC_CHECK_DECL([CLOCK_MONOTONIC],[MONOTONIC_CLOCK="guessing yes"],[MONOTONIC_CLOCK=no],[#include <time.h>])
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb
index 2cbcd90eb8..69be3c7385 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb
@@ -1,7 +1,6 @@
1require xserver-xorg.inc 1require xserver-xorg.inc
2 2
3SRC_URI += "file://musl-arm-inb-outb.patch \ 3SRC_URI += "file://musl-arm-inb-outb.patch \
4 file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \
5 file://0003-Remove-check-for-useSIGIO-option.patch \ 4 file://0003-Remove-check-for-useSIGIO-option.patch \
6 file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ 5 file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
7 " 6 "