From: Armin Kuster <akuster808@gmail.com>
To: akuster@mvista.com, openembedded-core@lists.openembedded.org
Subject: [PATCH 6/8] xserver-xorg: upgrade 1.19.6 -> 1.20.0
Date: Fri, 18 May 2018 19:13:52 -0700 [thread overview]
Message-ID: <1526696034-3857-6-git-send-email-akuster@mvista.com> (raw)
In-Reply-To: <1526696034-3857-1-git-send-email-akuster@mvista.com>
From: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...1-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 19 +++++++++----------
...{xserver-xorg_1.19.6.bb => xserver-xorg_1.20.0.bb} | 4 ++--
2 files changed, 11 insertions(+), 12 deletions(-)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.19.6.bb => xserver-xorg_1.20.0.bb} (89%)
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
index 16ec3ed..020a1cf 100644
--- 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
@@ -1,12 +1,13 @@
-Discover monotonic clock using compile-time check
+From 8a91316c4a38f20e7866289f3d779a037d27a129 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Mon, 12 Dec 2016 12:11:39 +0200
+Subject: [PATCH] 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
@@ -21,15 +22,16 @@ monotonic clock is available. This check can run just fine when we are
cross-compiling.
Signed-off-by: David James <davidjames at google.com>
+
---
configure.ac | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
-index f7ab48c..26e85cd 100644
+index 2b21667..786e002 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1048,19 +1048,16 @@ if ! test "x$have_clock_gettime" = xno; then
+@@ -984,19 +984,16 @@ if ! test "x$have_clock_gettime" = xno; then
CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
fi
@@ -54,8 +56,5 @@ index f7ab48c..26e85cd 100644
- [MONOTONIC_CLOCK="cross compiling"])
+]])],[MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no])
- LIBS="$LIBS_SAVE"
- CPPFLAGS="$CPPFLAGS_SAVE"
---
-2.1.4
-
+ if test "$MONOTONIC_CLOCK" = "cross compiling"; then
+ 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.19.6.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.0.bb
similarity index 89%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.0.bb
index c680cf9..620eb7b 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.0.bb
@@ -6,8 +6,8 @@ SRC_URI += "file://musl-arm-inb-outb.patch \
file://0003-Remove-check-for-useSIGIO-option.patch \
file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
"
-SRC_URI[md5sum] = "3e47777ff034a331aed2322b078694a8"
-SRC_URI[sha256sum] = "a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197"
+SRC_URI[md5sum] = "c1ca1ea0a905ea788da03c77cc38b06e"
+SRC_URI[sha256sum] = "9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6"
# These extensions are now integrated into the server, so declare the migration
# path for in-place upgrades.
--
2.7.4
next prev parent reply other threads:[~2018-05-19 2:14 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-19 2:13 [PATCH 1/8] openssh: upgrade 7.6p1 -> 7.7p1 Armin Kuster
2018-05-19 2:13 ` [PATCH 2/8] kexec-tools: upgrade 2.0.16 -> 2.0.17 Armin Kuster
2018-05-19 2:13 ` [PATCH 3/8] libdmx: upgrade 1.1.3 -> 1.1.4 Armin Kuster
2018-05-19 2:13 ` [PATCH 4/8] xf86-input-libinput: upgrade 0.26.0 -> 0.27.1 Armin Kuster
2018-05-19 2:13 ` [PATCH 5/8] nss: update to 3.36.1 Armin Kuster
2018-05-19 2:13 ` Armin Kuster [this message]
2018-05-23 11:01 ` [PATCH 6/8] xserver-xorg: upgrade 1.19.6 -> 1.20.0 Burton, Ross
2018-05-28 14:25 ` akuster808
2018-06-01 15:15 ` akuster808
2018-06-13 10:17 ` Burton, Ross
2018-06-13 14:51 ` akuster808
2018-06-13 16:34 ` Burton, Ross
2018-06-17 19:14 ` akuster808
2018-06-17 19:23 ` Burton, Ross
2018-05-19 2:13 ` [PATCH 7/8] busybox: update to 1.28.3 Armin Kuster
2018-05-19 2:30 ` Anuj Mittal
2018-05-19 14:19 ` akuster808
2018-05-19 2:13 ` [PATCH 8/8] openssh: fix some ptest exec issues Armin Kuster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1526696034-3857-6-git-send-email-akuster@mvista.com \
--to=akuster808@gmail.com \
--cc=akuster@mvista.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.