[OE-core] [PATCH 6/8] xserver-xorg: upgrade 1.19.6 -> 1.20.0

[Burton, Ross]

This is breaking a number of other bits of X:

- xf86-video-intel (was DRI1 removed or disabled in 1.20?)
- xf86-input-mouse
- xf86-video-omapfb

Ross

On 19 May 2018 at 03:13, Armin Kuster <akuster808 at gmail.com> wrote:
> From: Armin Kuster <akuster808 at gmail.com>
>
> Signed-off-by: Armin Kuster <akuster808 at 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 at 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 at 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
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core