diff -Nru xorg-server-1.20.11/aclocal.m4 xorg-server-1.20.13/aclocal.m4 --- xorg-server-1.20.11/aclocal.m4 2021-04-13 14:11:54.000000000 +0000 +++ xorg-server-1.20.13/aclocal.m4 2021-07-29 18:48:25.000000000 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.16.2 -*- Autoconf -*- +# generated automatically by aclocal 1.16.3 -*- Autoconf -*- # Copyright (C) 1996-2020 Free Software Foundation, Inc. @@ -2863,7 +2863,7 @@ [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.2], [], +m4_if([$1], [1.16.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -2879,7 +2879,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.2])dnl +[AM_AUTOMAKE_VERSION([1.16.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -3551,12 +3551,7 @@ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then diff -Nru xorg-server-1.20.11/ChangeLog xorg-server-1.20.13/ChangeLog --- xorg-server-1.20.11/ChangeLog 2021-04-13 14:12:37.000000000 +0000 +++ xorg-server-1.20.13/ChangeLog 2021-07-29 18:48:47.000000000 +0000 @@ -1,3 +1,392 @@ +commit 86a72cb1927dd91132d231bb7920b651704601ef +Author: Matt Turner +Date: Thu Jul 29 11:23:15 2021 -0700 + + xserver 1.20.13 + + Signed-off-by: Matt Turner + +commit f85e4edba489316950fc3422f39e3c2ef8fb1ac5 +Author: Łukasz Spintzyk +Date: Thu Jul 22 13:12:05 2021 +0200 + + modesetting: unflip not possible when glamor is not set + + This is fixing crashes of xfce when running under qemu + + (cherry picked from commit 8836b9d243444031b6396d39d345f2f83b5fa6a9) + +commit b03d7184b7906121a432b05473675937ab6c0f1e +Author: Łukasz Spintzyk +Date: Mon Jul 19 14:25:28 2021 +0200 + + present: fallback get_crtc to return crtc belonging to screen with present extension + + Since crtc can belong to secondary output that may not have present + extension enabled we should fallback to first enabled crtc or fake crtc. + + Fix for issue xorg/xserver#1195 + + (cherry picked from commit d6c02ffd9c910637f6b3b7249507998e9e45f93c) + +commit b88ad0b342c954109bfd4b1d32c04ff55545cb0f +Author: Matt Turner +Date: Thu Jul 8 12:15:21 2021 -0700 + + xserver 1.20.12 + + Signed-off-by: Matt Turner + +commit 8dea50223b9b9495aa2e2f4e6aef2a842c0e0a2f +Author: Matt Turner +Date: Thu Jul 8 12:15:13 2021 -0700 + + Build xz tarballs instead of bzip2 + + Signed-off-by: Matt Turner + +commit b7adbac7d14bca3b0790fd7d1a706be28d954af5 +Author: orbea +Date: Wed Jun 23 05:50:21 2021 -0700 + + hw/dmx/config: Link directly with libdmxconfig.a + + When building xserver with slibtool (https://dev.midipix.org/cross/slibtool) + the build will fail. + + /usr/bin/ld: cannot find -ldmxconfig + + This is because xserver creates libdmxconfig.a internally and then links with + the linker flag -ldmxconfig. However according to automake documentation the + -lfoo linker flags should only be used for external dependencies and all + internal libraries should be linked with the libtool archive file (.la) or + the static archive (.a) when the former is not available. + + GNU libtool is far more permissive and happens to silently obscure this issue + while slibtool fails because it instead sees '-L./.libs -ldmxconfig'. + + Signed-off-by: Matt Turner + (cherry picked from commit 2531ee02450e3be3549daa09407557c3addeba02) + +commit e49738f0c9d4370c7a7e6e86c2c74151aa2e33fa +Author: Zoltán Böszörményi +Date: Mon Jun 21 12:12:41 2021 +0200 + + xfree86: Fix NULL pointer dereference crash + + screenp->displays[count] (passed to configDisplay() in + configScreen()) is NULL if there is no Virtual setting + in the configuration. + + Fixes: f8a6be04d0c7e6a99824ff888ad6c010960c5c21 ("xfree86: Change + displays array to pointers array to fix invalid pointer issues + after table reallocation") + + Signed-off-by: Zoltán Böszörményi + (cherry picked from commit ef89b6648e2a806237a6d2fa598e1b9c83f128b4) + +commit 9a59631a490876eae57f813e3a274c46d35d5287 +Author: Olivier Fourdan +Date: Fri Jun 18 14:52:55 2021 +0200 + + glx: Fix use after free in MakeCurrent + + The fix from commit c468d34c7 - "glx: Set ContextTag for all contexts" + is actually incomplete, it correctly sets the context tag for direct + contexts as well, but would fail to mark the context's currentClient. + + As a result, when the context is destroyed, it would be freed + immediately rather than being just scheduled for deletion, even though + it is still current for some client. leading to a use-after-free. + + Make sure to also set the context's currentClient for direct contexts as + well, not just indirect ones. + + Signed-off-by: Olivier Fourdan + Fixes: c468d34c7 - "glx: Set ContextTag for all contexts" + Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1186 + Reviewed-by: Adam Jackson + (cherry picked from commit aad61e8e03311eb8bae4f7db59e65634733eadc2) + +commit 1fc0ca6e680fbc50b7a4b60b8797d0fce69cf6fb +Author: Łukasz Spintzyk +Date: Wed Jun 23 15:26:23 2021 +0200 + + xfree86: Fix out of array bound access to xf86Entities + + Signed-off-by: Łukasz Spintzyk + (cherry picked from commit d66b7ec12986efd4f32fcc84cdaacbd04ec98ccb) + +commit a4210fe07a8bd5fd4851ffa202ecffca1cc8062c +Author: Łukasz Spintzyk +Date: Tue Jun 8 20:02:21 2021 +0200 + + xfree86: Change displays array to pointers array to fix invalid pointer issues after table reallocation + + There are rare cases when xf86SetDepthBpp is resizing displays array in confScreen. + As that array is shared between set of ScrnInfoRec's then realloc might invalidate chached DispPtr display values in + otheres ScrnInfoRec objects. + + If we will change displays array as an array of pointers to DispRec then cached DispRec pointers in ScrnInfoRec + won't be invalid after reallocation of displays array. + + Signed-off-by: Łukasz Spintzyk + (cherry picked from commit f8a6be04d0c7e6a99824ff888ad6c010960c5c21) + +commit 22449f6300aad600cc49024640651a46a128e3ad +Author: Jose Maria Casanova Crespo +Date: Tue Jun 8 14:52:17 2021 +0200 + + glamor: Avoid using GL_QUADS on V3D + + Like in 0e3f1252dacdc3194 ("glamor: Avoid using GL_QUADS on VC4") + this will avoid mesa to fallback doing conversion for QUADS primitives. + + Signed-off-by: Jose Maria Casanova Crespo + Reviewed-by: Emma Anholt + (cherry picked from commit 9adb13e296baead53112a268ddfd291195742c71) + +commit d16f6403153596b62c555fb511881289f59f9e81 +Author: Ville Syrjälä +Date: Tue Sep 3 16:44:56 2019 +0300 + + modesetting: Fix possible_crtcs + + Populate outout possible_crtcs as the union of possible_crtcs from + the encoders rather than the intersection. Otherwise we're easily left + with possible_crtcs==0 when all the possible encoders have + non-overlapping possible_crtcs. + + No idea what the magic 0x7f is about, but keep it around in case + it matters. + + Signed-off-by: Ville Syrjälä + (cherry picked from commit 0e4bd71d02d09c320e76280ae8f14df169387507) + +commit f1e76731a02e77c73521134933e424a17df40a1c +Author: Ville Syrjälä +Date: Tue Aug 20 17:46:09 2019 +0300 + + modesetting: Update props for dynamically added outputs + + Dynamically added outputs should have their properties + properly updated as well. Otherwise we're left with an output + with many of its propeties not exposed. + + Signed-off-by: Ville Syrjälä + Reviewed-by: Michel Dänzer + Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1143 + (cherry picked from commit 0c5179c280a193a1dbbe29160906087f06eae6f2) + +commit 7bf4777116b9b6d416914561015662f494bb4184 +Author: Jeremy Huddleston Sequoia +Date: Mon Mar 8 21:02:40 2021 -0800 + + xquartz: Ensure the mouse pointer is shown when switching to a native macOS alert or window + + Fixes: https://github.com/XQuartz/XQuartz/issues/100 + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 4ae36f418ed683532b0b6991e4a1e7d56740b845) + +commit 3ef6e7b766a9f20b208b50203ad6b45f65fbc29e +Author: Jeremy Huddleston Sequoia +Date: Fri Mar 5 22:57:24 2021 -0800 + + xquartz: Fix appFlags build failure with macOS 10.15+ SDKs + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit e59848548a462f1a0ac751bb8bb6afe56258cf4e) + +commit 2a83c840c8f38281b7f93b5522e20a71f6723b08 +Author: Olivier Fourdan +Date: Thu Jun 3 17:51:01 2021 +0200 + + glx: Set ContextTag for all contexts + + Currently, xorgGlxMakeCurrent() would set the context tag only for + indirect GLX contexts. + + However, several other places expect to find a context for the tag or + they would raise a GLXBadContextTag error, such as WaitGL() or WaitX(). + + Set the context tag for direct contexts as well, to avoid raising an + error and possibly killing the client. + + Thanks to Erik Kurzinger for spotting the issue. + + Signed-off-by: Olivier Fourdan + Reviewed-by: Adam Jackson + (cherry picked from commit c468d34c7208c9041f9c077b54a00ae9cccad6a3) + +commit 394b6cc1cf614ba7b13db7976b0739035da86d28 +Author: Erik Kurzinger +Date: Thu Dec 10 14:24:32 2020 -0800 + + glx: don't create implicit GLXWindow if one already exists + + If a GLXMakeCurrent request specifies an X window as its drawable, + __glXGetDrawable will implicitly create a GLXWindow for it. However, + the client may have already explicitly created a GLXWindow for that X + window. If that happens, two __glXDrawableRes resources will be added + to the window. + + If the explicitly-created GLXWindow is later destroyed by the client, + DrawableGone will call FreeResourceByType on the X window, but this + will actually free the resource for the implicitly-created GLXWindow, + since that one would be at the head of the list. + + Then if the X window is destroyed after that, the resource for the + explicitly-created GLXWindow will be freed. But that GLXWindow was + already destroyed above. This crashes the server when it tries to call + the destroyed GLXWindow's destructor. It also means the + implicitly-created GLXWindow would have been leaked since the + FreeResourceByType call mentioned above skips calling the destructor. + + To fix this, if __glXGetDrawable is given an X window, it should check + if there is already a GLXWindow associated with it, and only create an + implicit one if there is not. + + Signed-off-by: Erik Kurzinger + Reviewed-by: Adam Jackson + (cherry picked from commit b7a85e44da91d1663d5b4eabac06327c92a80f91) + +commit 0086535e7a331f81823a0f4e578bc3346ee1c312 +Author: Łukasz Spintzyk +Date: Fri Sep 18 14:32:01 2020 +0200 + + modesetting: Remove few common functions from ms namespace + + A lot of that code is the same as in xf86-amdgpu and xf86-nouveau drivers. By removing that functions from + ms namespace we can move that code to common implementation. + + Signed-off-by: Łukasz Spintzyk + (cherry picked from commit 5be3b80b8d084ca5721be8791910d5827d1b6014) + +commit 321964443be6b6daae0f7c1097a34106782ae338 +Author: Łukasz Spintzyk +Date: Fri Sep 18 14:31:53 2020 +0200 + + modesetting: remove unnecessary ms_covering_xf86_crtc dup of ms_covering_randr_crtc + + Signed-off-by: Łukasz Spintzyk + (cherry picked from commit c282be503e267afdd050df837d4cf61e0e7287b7) + +commit 52eb801d048f63952ca48487d86ba089dfcbe131 +Author: Łukasz Spintzyk +Date: Fri Sep 18 14:31:47 2020 +0200 + + modesetting: Find crtc on slave outputs as fallback instead of returning primary crtc + + Signed-off-by: Łukasz Spintzyk + (cherry picked from commit b923364c5ec8251e81b4aa5fd451d9d7bb038009) + +commit c7a2da7b994cdf829d805944c80f9fefd9246109 +Author: Łukasz Spintzyk +Date: Fri Sep 18 14:31:34 2020 +0200 + + present: fix msc offset calculation in screen mode + + Instead of getting the current msc value from the window crtc, + which not exist take the last saved msc value saved in + the window_priv struct + + Signed-off-by: Łukasz Spintzyk + (cherry picked from commit d2dce22b6775c772282ac2c0e224ef9685ab34fa) + +commit 31544e68e605f0595e700bf4ce468b16e7b195ac +Author: Łukasz Spintzyk +Date: Fri Sep 18 14:31:25 2020 +0200 + + present: Use crtc's screen present operation for syncing + + Signed-off-by: Łukasz Spintzyk + (cherry picked from commit 908deb0895f9fe345d70be933d251ea10511d30a) + +commit 464cbee1c625d60ac9e18b7f4e3d53bc83b0d585 +Author: Łukasz Spintzyk +Date: Fri Sep 18 14:29:25 2020 +0200 + + modesetting: Initialize present extension despite glamor is disabled + + Signed-off-by: Łukasz Spintzyk + (cherry picked from commit d03c0de77ba36bb5221d00ac84dcdd6aae0df453) + +commit 4e11bd390a28144fac03dc21a6caf0800596e2fa +Author: Łukasz Spintzyk +Date: Tue Jun 8 18:53:07 2021 +0200 + + modesetting: Disable reverse prime offload mode for displays running on evdi,udl + + This mode for displays running on evdi/udl as side effect of failed glamor_egl_init + reverse_prime_offload_mode was initialized to FALSE + + After Mesa upgrade to 21.0.0 GL_RENDERER is not llvmpipe that results in successful glamor_egl_init + and reverse_prime_offload_mode enabled. + + This commit is explicitly disabling reverse_prime_offload_mode for evdi and udl drivers + + Signed-off-by: Łukasz Spintzyk + (cherry picked from commit 7e7c147105ac704a7b33bdee0f85dc9ccdd8f747) + +commit 6272529339f975777f22bb0e6162ac43480ae257 +Author: Olivier Fourdan +Date: Mon Feb 15 11:33:56 2021 +0100 + + dix: Guard against non-existing PtrFeedbackPtr + + Trying to change the pointer control settings on a device without + PtrFeedbackPtr would be a bug and a crash in the Xserver. + + Guard against that case by returning early with a BadImplementation + error, that might kill the X11 client but the Xserver would survive. + + Signed-off-by: Olivier Fourdan + Reviewed-by: Peter Hutterer + Related: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1137 + (cherry picked from commit dee2bb033e78e2f4aae7f5708c3d4fc74a9957de) + +commit d41b43345cde2330648ad1890fb95bdbd5362f7f +Author: Olivier Fourdan +Date: Mon Feb 15 11:23:59 2021 +0100 + + xwayland: Add PtrFeedback to the touch device + + Trying to change the acceleration/threshold on Xwayland cannot work, and + the corresponding handler xwl_pointer_control() is a no-op. + + Yet, an X11 client trying to change those on the touch device may + possibly cause a crash because the touch device in Xwayland doesn't set + that. + + Initialize the touch device's PtrFeedback to make sure that just cannot + happen. + + Signed-off-by: Olivier Fourdan + Reviewed-by: Peter Hutterer + Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1137 + (cherry picked from commit ab76272a7d2bff997985893c89147412a7360310) + +commit 23a53f0d5460eb45f05b0b370dfcec712652598c +Author: Vasily Khoruzhick +Date: Fri Mar 20 20:36:25 2020 -0700 + + glx: fixup symbol name for get_extensions function + + glxProbeDriver() concatenates __DRI_DRIVER_GET_EXTENSIONS with driver name + to get symbol name for get_extension function. Unfortunately that doesn't + work for drivers that have hyphen in their name, e.g. sun4i-drm -- + get_extensions() for these uses underscore instead. + + As result dlsym() doesn't find get_extension() function and AIGLX + initialization fails resulting in following message in Xorg.0.log: + + (EE) AIGLX error: sun4i-drm does not export required DRI extension + + Replace all non-alpha-numeric characters with underscore to fix the issue. + + Signed-off-by: Vasily Khoruzhick + (cherry picked from commit b56e501092169a9c0a60663d832ee71898a8bc4b) + commit 6b767cdf6574081164aa6c6a7b617cda579b84c6 Author: Matt Turner Date: Tue Apr 13 10:01:34 2021 -0400 diff -Nru xorg-server-1.20.11/composite/Makefile.in xorg-server-1.20.13/composite/Makefile.in --- xorg-server-1.20.11/composite/Makefile.in 2021-04-13 14:11:57.000000000 +0000 +++ xorg-server-1.20.13/composite/Makefile.in 2021-07-29 18:48:28.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/config/Makefile.in xorg-server-1.20.13/config/Makefile.in --- xorg-server-1.20.11/config/Makefile.in 2021-04-13 14:11:57.000000000 +0000 +++ xorg-server-1.20.13/config/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/config.guess xorg-server-1.20.13/config.guess --- xorg-server-1.20.11/config.guess 2021-04-13 14:11:57.000000000 +0000 +++ xorg-server-1.20.13/config.guess 2021-07-29 18:48:28.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2020 Free Software Foundation, Inc. +# Copyright 1992-2021 Free Software Foundation, Inc. -timestamp='2020-04-26' +timestamp='2021-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,12 +27,12 @@ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess # # Please send patches to . -me=`echo "$0" | sed -e 's,.*/,,'` +me=$(echo "$0" | sed -e 's,.*/,,') usage="\ Usage: $0 [OPTION] @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2020 Free Software Foundation, Inc. +Copyright 1992-2021 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -103,7 +103,7 @@ test "$tmp" && return 0 : "${TMPDIR=/tmp}" # shellcheck disable=SC2039 - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=$( (umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null) && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } @@ -131,16 +131,14 @@ PATH=$PATH:/.attbin ; export PATH fi -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +UNAME_MACHINE=$( (uname -m) 2>/dev/null) || UNAME_MACHINE=unknown +UNAME_RELEASE=$( (uname -r) 2>/dev/null) || UNAME_RELEASE=unknown +UNAME_SYSTEM=$( (uname -s) 2>/dev/null) || UNAME_SYSTEM=unknown +UNAME_VERSION=$( (uname -v) 2>/dev/null) || UNAME_VERSION=unknown case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu + LIBC=unknown set_cc_for_build cat <<-EOF > "$dummy.c" @@ -149,17 +147,29 @@ LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc - #else + #elif defined(__GLIBC__) LIBC=gnu + #else + #include + /* First heuristic to detect musl libc. */ + #ifdef __DEFINED_va_list + LIBC=musl + #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g')" - # If ldd exists, use it to detect musl libc. - if command -v ldd >/dev/null && \ - ldd --version 2>&1 | grep -q ^musl - then - LIBC=musl + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu fi ;; esac @@ -179,19 +189,20 @@ # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + UNAME_MACHINE_ARCH=$( (uname -p 2>/dev/null || \ "/sbin/$sysctl" 2>/dev/null || \ "/usr/sbin/$sysctl" 2>/dev/null || \ - echo unknown)` + echo unknown)) case "$UNAME_MACHINE_ARCH" in + aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; earmv*) - arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + arch=$(echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,') + endian=$(echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p') machine="${arch}${endian}"-unknown ;; *) machine="$UNAME_MACHINE_ARCH"-unknown ;; @@ -222,7 +233,7 @@ case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` + abi=$(echo "$UNAME_MACHINE_ARCH" | sed -e "$expr") ;; esac # The OS release @@ -235,7 +246,7 @@ release='-gnu' ;; *) - release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=$(echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2) ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: @@ -244,15 +255,15 @@ echo "$machine-${os}${release}${abi-}" exit ;; *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + UNAME_MACHINE_ARCH=$(arch | sed 's/Bitrig.//') echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + UNAME_MACHINE_ARCH=$(arch | sed 's/OpenBSD.//') echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" exit ;; *:LibertyBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + UNAME_MACHINE_ARCH=$(arch | sed 's/^.*BSD\.//') echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" exit ;; *:MidnightBSD:*:*) @@ -288,17 +299,17 @@ alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $3}') ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $4}') ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + ALPHA_CPU_TYPE=$(/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1) case "$ALPHA_CPU_TYPE" in "EV4 (21064)") UNAME_MACHINE=alpha ;; @@ -336,7 +347,7 @@ # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" + echo "$UNAME_MACHINE"-dec-osf"$(echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)" # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -370,7 +381,7 @@ exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then + if test "$( (/bin/universe) 2>/dev/null)" = att ; then echo pyramid-pyramid-sysv3 else echo pyramid-pyramid-bsd @@ -383,17 +394,17 @@ echo sparc-icl-nx6 exit ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in + case $(/usr/bin/uname -p) in sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + echo "$UNAME_MACHINE"-ibm-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')" exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo sparc-hal-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + echo sparc-sun-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) echo i386-pc-auroraux"$UNAME_RELEASE" @@ -404,7 +415,7 @@ # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null @@ -412,30 +423,30 @@ SUN_ARCH=x86_64 fi fi - echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo "$SUN_ARCH"-pc-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo sparc-sun-solaris3"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in + case "$(/usr/bin/arch -k)" in Series*|S4*) - UNAME_RELEASE=`uname -v` + UNAME_RELEASE=$(uname -v) ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" + echo sparc-sun-sunos"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/')" exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos"$UNAME_RELEASE" exit ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=$( (sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null) test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case "`/bin/arch`" in + case "$(/bin/arch)" in sun3) echo m68k-sun-sunos"$UNAME_RELEASE" ;; @@ -515,8 +526,8 @@ } EOF $CC_FOR_BUILD -o "$dummy" "$dummy.c" && - dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`"$dummy" "$dummyarg"` && + dummyarg=$(echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p') && + SYSTEM_NAME=$("$dummy" "$dummyarg") && { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos"$UNAME_RELEASE" exit ;; @@ -543,11 +554,11 @@ exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] + UNAME_PROCESSOR=$(/usr/bin/uname -p) + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then - if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ - [ "$TARGET_BINARY_INTERFACE"x = x ] + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ + test "$TARGET_BINARY_INTERFACE"x = x then echo m88k-dg-dgux"$UNAME_RELEASE" else @@ -571,17 +582,17 @@ echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) - echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" + echo mips-sgi-irix"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/g')" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + exit ;; # Note that: echo "'$(uname -s)'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix exit ;; ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if test -x /usr/bin/oslevel ; then + IBM_REV=$(/usr/bin/oslevel) else IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi @@ -601,7 +612,7 @@ exit(0); } EOF - if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") then echo "$SYSTEM_NAME" else @@ -614,15 +625,15 @@ fi exit ;; *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + IBM_CPU_ID=$(/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }') if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc fi - if [ -x /usr/bin/lslpp ] ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | - awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + if test -x /usr/bin/lslpp ; then + IBM_REV=$(/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/) else IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi @@ -650,14 +661,14 @@ echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//') case "$UNAME_MACHINE" in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + if test -x /usr/bin/getconf; then + sc_cpu_version=$(/usr/bin/getconf SC_CPU_VERSION 2>/dev/null) + sc_kernel_bits=$(/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null) case "$sc_cpu_version" in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 @@ -669,7 +680,7 @@ esac ;; esac fi - if [ "$HP_ARCH" = "" ]; then + if test "$HP_ARCH" = ""; then set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" @@ -704,11 +715,11 @@ exit (0); } EOF - (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=$("$dummy") test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ "$HP_ARCH" = hppa2.0w ] + if test "$HP_ARCH" = hppa2.0w then set_cc_for_build @@ -732,7 +743,7 @@ echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//') echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) @@ -762,7 +773,7 @@ exit (0); } EOF - $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; @@ -782,7 +793,7 @@ echo hppa1.0-hp-osf exit ;; i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then + if test -x /usr/sbin/sysversion ; then echo "$UNAME_MACHINE"-unknown-osf1mk else echo "$UNAME_MACHINE"-unknown-osf1 @@ -831,14 +842,14 @@ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` + FUJITSU_PROC=$(uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz) + FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///') + FUJITSU_REL=$(echo "$UNAME_RELEASE" | sed -e 's/ /_/') echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///') + FUJITSU_REL=$(echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/') echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -851,25 +862,25 @@ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; arm:FreeBSD:*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) set_cc_for_build if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi + echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabi else - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf + echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabihf fi exit ;; *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` + UNAME_PROCESSOR=$(/usr/bin/uname -p) case "$UNAME_PROCESSOR" in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" + echo "$UNAME_PROCESSOR"-unknown-freebsd"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')" exit ;; i*:CYGWIN*:*) echo "$UNAME_MACHINE"-pc-cygwin @@ -905,15 +916,15 @@ echo x86_64-pc-cygwin exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; *:GNU:*:*) # the GNU system - echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" + echo "$(echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,')-unknown-$LIBC$(echo "$UNAME_RELEASE"|sed -e 's,/.*$,,')" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" + echo "$UNAME_MACHINE-unknown-$(echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')-$LIBC" exit ;; *:Minix:*:*) echo "$UNAME_MACHINE"-unknown-minix @@ -926,7 +937,7 @@ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in + case $(sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null) in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -985,6 +996,9 @@ k1om:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; m32r*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; @@ -1035,7 +1049,7 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`" + eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI')" test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; mips64el:Linux:*:*) @@ -1055,7 +1069,7 @@ exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + case $(grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2) in PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; *) echo hppa-unknown-linux-"$LIBC" ;; @@ -1073,7 +1087,7 @@ ppcle:Linux:*:*) echo powerpcle-unknown-linux-"$LIBC" exit ;; - riscv32:Linux:*:* | riscv64:Linux:*:*) + riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) @@ -1097,7 +1111,7 @@ x86_64:Linux:*:*) set_cc_for_build LIBCABI=$LIBC - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_X32 >/dev/null @@ -1145,7 +1159,7 @@ echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; i*86:*:4.*:*) - UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` + UNAME_REL=$(echo "$UNAME_RELEASE" | sed 's/\/MP$//') if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else @@ -1154,7 +1168,7 @@ exit ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in + case $(/bin/uname -X | grep "^Machine") in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; @@ -1163,10 +1177,10 @@ exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + UNAME_REL=$( (/bin/uname -X|grep Release|sed -e 's/.*= //')) (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 @@ -1216,7 +1230,7 @@ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ @@ -1227,7 +1241,7 @@ NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ @@ -1260,7 +1274,7 @@ exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=$( (uname -p) 2>/dev/null) echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv @@ -1294,7 +1308,7 @@ echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then + if test -d /usr/nec; then echo mips-nec-sysv"$UNAME_RELEASE" else echo mips-unknown-sysv"$UNAME_RELEASE" @@ -1342,8 +1356,11 @@ *:Rhapsody:*:*) echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; + arm64:Darwin:*:*) + echo aarch64-apple-darwin"$UNAME_RELEASE" + exit ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) case $UNAME_PROCESSOR in unknown) UNAME_PROCESSOR=powerpc ;; esac @@ -1356,7 +1373,7 @@ else set_cc_for_build fi - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null @@ -1380,7 +1397,7 @@ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc @@ -1448,10 +1465,10 @@ echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) - echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" + echo "$UNAME_MACHINE"-unknown-dragonfly"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')" exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=$( (uname -p) 2>/dev/null) case "$UNAME_MACHINE" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1461,7 +1478,7 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" + echo "$UNAME_MACHINE"-pc-skyos"$(echo "$UNAME_RELEASE" | sed -e 's/ .*$//')" exit ;; i*86:rdos:*:*) echo "$UNAME_MACHINE"-pc-rdos @@ -1519,7 +1536,7 @@ #define __ARCHITECTURE__ "m68k" #endif int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + version=$( (hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null); if (version < 4) printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); else @@ -1611,7 +1628,7 @@ } EOF -$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` && +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=$($dummy) && { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. @@ -1636,14 +1653,14 @@ operating system you are using. If your script is old, overwrite *all* copies of config.guess and config.sub with the latest versions from: - https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess + https://git.savannah.gnu.org/cgit/config.git/plain/config.guess and - https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub + https://git.savannah.gnu.org/cgit/config.git/plain/config.sub EOF -year=`echo $timestamp | sed 's,-.*,,'` +year=$(echo $timestamp | sed 's,-.*,,') # shellcheck disable=SC2003 -if test "`expr "\`date +%Y\`" - "$year"`" -lt 3 ; then +if test "$(expr "$(date +%Y)" - "$year")" -lt 3 ; then cat >&2 </dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` +uname -m = $( (uname -m) 2>/dev/null || echo unknown) +uname -r = $( (uname -r) 2>/dev/null || echo unknown) +uname -s = $( (uname -s) 2>/dev/null || echo unknown) +uname -v = $( (uname -v) 2>/dev/null || echo unknown) + +/usr/bin/uname -p = $( (/usr/bin/uname -p) 2>/dev/null) +/bin/uname -X = $( (/bin/uname -X) 2>/dev/null) + +hostinfo = $( (hostinfo) 2>/dev/null) +/bin/universe = $( (/bin/universe) 2>/dev/null) +/usr/bin/arch -k = $( (/usr/bin/arch -k) 2>/dev/null) +/bin/arch = $( (/bin/arch) 2>/dev/null) +/usr/bin/oslevel = $( (/usr/bin/oslevel) 2>/dev/null) +/usr/convex/getsysinfo = $( (/usr/convex/getsysinfo) 2>/dev/null) UNAME_MACHINE = "$UNAME_MACHINE" UNAME_RELEASE = "$UNAME_RELEASE" diff -Nru xorg-server-1.20.11/config.sub xorg-server-1.20.13/config.sub --- xorg-server-1.20.11/config.sub 2021-04-13 14:11:57.000000000 +0000 +++ xorg-server-1.20.13/config.sub 2021-07-29 18:48:28.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2020 Free Software Foundation, Inc. +# Copyright 1992-2021 Free Software Foundation, Inc. -timestamp='2020-06-20' +timestamp='2021-01-07' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -50,7 +50,7 @@ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -me=`echo "$0" | sed -e 's,.*/,,'` +me=$(echo "$0" | sed -e 's,.*/,,') usage="\ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS @@ -67,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2020 Free Software Foundation, Inc. +Copyright 1992-2021 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -124,28 +124,27 @@ ;; *-*-*-*) basic_machine=$field1-$field2 - os=$field3-$field4 + basic_os=$field3-$field4 ;; *-*-*) # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two # parts maybe_os=$field2-$field3 case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \ - | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ + nto-qnx* | linux-* | uclinux-uclibc* \ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ | storm-chaos* | os2-emx* | rtmk-nova*) basic_machine=$field1 - os=$maybe_os + basic_os=$maybe_os ;; android-linux) basic_machine=$field1-unknown - os=linux-android + basic_os=linux-android ;; *) basic_machine=$field1-$field2 - os=$field3 + basic_os=$field3 ;; esac ;; @@ -154,7 +153,7 @@ case $field1-$field2 in decstation-3100) basic_machine=mips-dec - os= + basic_os= ;; *-*) # Second component is usually, but not always the OS @@ -162,7 +161,7 @@ # Prevent following clause from handling this valid os sun*os*) basic_machine=$field1 - os=$field2 + basic_os=$field2 ;; # Manufacturers dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ @@ -175,11 +174,11 @@ | microblaze* | sim | cisco \ | oki | wec | wrs | winbond) basic_machine=$field1-$field2 - os= + basic_os= ;; *) basic_machine=$field1 - os=$field2 + basic_os=$field2 ;; esac ;; @@ -191,451 +190,451 @@ case $field1 in 386bsd) basic_machine=i386-pc - os=bsd + basic_os=bsd ;; a29khif) basic_machine=a29k-amd - os=udi + basic_os=udi ;; adobe68k) basic_machine=m68010-adobe - os=scout + basic_os=scout ;; alliant) basic_machine=fx80-alliant - os= + basic_os= ;; altos | altos3068) basic_machine=m68k-altos - os= + basic_os= ;; am29k) basic_machine=a29k-none - os=bsd + basic_os=bsd ;; amdahl) basic_machine=580-amdahl - os=sysv + basic_os=sysv ;; amiga) basic_machine=m68k-unknown - os= + basic_os= ;; amigaos | amigados) basic_machine=m68k-unknown - os=amigaos + basic_os=amigaos ;; amigaunix | amix) basic_machine=m68k-unknown - os=sysv4 + basic_os=sysv4 ;; apollo68) basic_machine=m68k-apollo - os=sysv + basic_os=sysv ;; apollo68bsd) basic_machine=m68k-apollo - os=bsd + basic_os=bsd ;; aros) basic_machine=i386-pc - os=aros + basic_os=aros ;; aux) basic_machine=m68k-apple - os=aux + basic_os=aux ;; balance) basic_machine=ns32k-sequent - os=dynix + basic_os=dynix ;; blackfin) basic_machine=bfin-unknown - os=linux + basic_os=linux ;; cegcc) basic_machine=arm-unknown - os=cegcc + basic_os=cegcc ;; convex-c1) basic_machine=c1-convex - os=bsd + basic_os=bsd ;; convex-c2) basic_machine=c2-convex - os=bsd + basic_os=bsd ;; convex-c32) basic_machine=c32-convex - os=bsd + basic_os=bsd ;; convex-c34) basic_machine=c34-convex - os=bsd + basic_os=bsd ;; convex-c38) basic_machine=c38-convex - os=bsd + basic_os=bsd ;; cray) basic_machine=j90-cray - os=unicos + basic_os=unicos ;; crds | unos) basic_machine=m68k-crds - os= + basic_os= ;; da30) basic_machine=m68k-da30 - os= + basic_os= ;; decstation | pmax | pmin | dec3100 | decstatn) basic_machine=mips-dec - os= + basic_os= ;; delta88) basic_machine=m88k-motorola - os=sysv3 + basic_os=sysv3 ;; dicos) basic_machine=i686-pc - os=dicos + basic_os=dicos ;; djgpp) basic_machine=i586-pc - os=msdosdjgpp + basic_os=msdosdjgpp ;; ebmon29k) basic_machine=a29k-amd - os=ebmon + basic_os=ebmon ;; es1800 | OSE68k | ose68k | ose | OSE) basic_machine=m68k-ericsson - os=ose + basic_os=ose ;; gmicro) basic_machine=tron-gmicro - os=sysv + basic_os=sysv ;; go32) basic_machine=i386-pc - os=go32 + basic_os=go32 ;; h8300hms) basic_machine=h8300-hitachi - os=hms + basic_os=hms ;; h8300xray) basic_machine=h8300-hitachi - os=xray + basic_os=xray ;; h8500hms) basic_machine=h8500-hitachi - os=hms + basic_os=hms ;; harris) basic_machine=m88k-harris - os=sysv3 + basic_os=sysv3 ;; hp300 | hp300hpux) basic_machine=m68k-hp - os=hpux + basic_os=hpux ;; hp300bsd) basic_machine=m68k-hp - os=bsd + basic_os=bsd ;; hppaosf) basic_machine=hppa1.1-hp - os=osf + basic_os=osf ;; hppro) basic_machine=hppa1.1-hp - os=proelf + basic_os=proelf ;; i386mach) basic_machine=i386-mach - os=mach + basic_os=mach ;; isi68 | isi) basic_machine=m68k-isi - os=sysv + basic_os=sysv ;; m68knommu) basic_machine=m68k-unknown - os=linux + basic_os=linux ;; magnum | m3230) basic_machine=mips-mips - os=sysv + basic_os=sysv ;; merlin) basic_machine=ns32k-utek - os=sysv + basic_os=sysv ;; mingw64) basic_machine=x86_64-pc - os=mingw64 + basic_os=mingw64 ;; mingw32) basic_machine=i686-pc - os=mingw32 + basic_os=mingw32 ;; mingw32ce) basic_machine=arm-unknown - os=mingw32ce + basic_os=mingw32ce ;; monitor) basic_machine=m68k-rom68k - os=coff + basic_os=coff ;; morphos) basic_machine=powerpc-unknown - os=morphos + basic_os=morphos ;; moxiebox) basic_machine=moxie-unknown - os=moxiebox + basic_os=moxiebox ;; msdos) basic_machine=i386-pc - os=msdos + basic_os=msdos ;; msys) basic_machine=i686-pc - os=msys + basic_os=msys ;; mvs) basic_machine=i370-ibm - os=mvs + basic_os=mvs ;; nacl) basic_machine=le32-unknown - os=nacl + basic_os=nacl ;; ncr3000) basic_machine=i486-ncr - os=sysv4 + basic_os=sysv4 ;; netbsd386) basic_machine=i386-pc - os=netbsd + basic_os=netbsd ;; netwinder) basic_machine=armv4l-rebel - os=linux + basic_os=linux ;; news | news700 | news800 | news900) basic_machine=m68k-sony - os=newsos + basic_os=newsos ;; news1000) basic_machine=m68030-sony - os=newsos + basic_os=newsos ;; necv70) basic_machine=v70-nec - os=sysv + basic_os=sysv ;; nh3000) basic_machine=m68k-harris - os=cxux + basic_os=cxux ;; nh[45]000) basic_machine=m88k-harris - os=cxux + basic_os=cxux ;; nindy960) basic_machine=i960-intel - os=nindy + basic_os=nindy ;; mon960) basic_machine=i960-intel - os=mon960 + basic_os=mon960 ;; nonstopux) basic_machine=mips-compaq - os=nonstopux + basic_os=nonstopux ;; os400) basic_machine=powerpc-ibm - os=os400 + basic_os=os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson - os=ose + basic_os=ose ;; os68k) basic_machine=m68k-none - os=os68k + basic_os=os68k ;; paragon) basic_machine=i860-intel - os=osf + basic_os=osf ;; parisc) basic_machine=hppa-unknown - os=linux + basic_os=linux ;; psp) basic_machine=mipsallegrexel-sony - os=psp + basic_os=psp ;; pw32) basic_machine=i586-unknown - os=pw32 + basic_os=pw32 ;; rdos | rdos64) basic_machine=x86_64-pc - os=rdos + basic_os=rdos ;; rdos32) basic_machine=i386-pc - os=rdos + basic_os=rdos ;; rom68k) basic_machine=m68k-rom68k - os=coff + basic_os=coff ;; sa29200) basic_machine=a29k-amd - os=udi + basic_os=udi ;; sei) basic_machine=mips-sei - os=seiux + basic_os=seiux ;; sequent) basic_machine=i386-sequent - os= + basic_os= ;; sps7) basic_machine=m68k-bull - os=sysv2 + basic_os=sysv2 ;; st2000) basic_machine=m68k-tandem - os= + basic_os= ;; stratus) basic_machine=i860-stratus - os=sysv4 + basic_os=sysv4 ;; sun2) basic_machine=m68000-sun - os= + basic_os= ;; sun2os3) basic_machine=m68000-sun - os=sunos3 + basic_os=sunos3 ;; sun2os4) basic_machine=m68000-sun - os=sunos4 + basic_os=sunos4 ;; sun3) basic_machine=m68k-sun - os= + basic_os= ;; sun3os3) basic_machine=m68k-sun - os=sunos3 + basic_os=sunos3 ;; sun3os4) basic_machine=m68k-sun - os=sunos4 + basic_os=sunos4 ;; sun4) basic_machine=sparc-sun - os= + basic_os= ;; sun4os3) basic_machine=sparc-sun - os=sunos3 + basic_os=sunos3 ;; sun4os4) basic_machine=sparc-sun - os=sunos4 + basic_os=sunos4 ;; sun4sol2) basic_machine=sparc-sun - os=solaris2 + basic_os=solaris2 ;; sun386 | sun386i | roadrunner) basic_machine=i386-sun - os= + basic_os= ;; sv1) basic_machine=sv1-cray - os=unicos + basic_os=unicos ;; symmetry) basic_machine=i386-sequent - os=dynix + basic_os=dynix ;; t3e) basic_machine=alphaev5-cray - os=unicos + basic_os=unicos ;; t90) basic_machine=t90-cray - os=unicos + basic_os=unicos ;; toad1) basic_machine=pdp10-xkl - os=tops20 + basic_os=tops20 ;; tpf) basic_machine=s390x-ibm - os=tpf + basic_os=tpf ;; udi29k) basic_machine=a29k-amd - os=udi + basic_os=udi ;; ultra3) basic_machine=a29k-nyu - os=sym1 + basic_os=sym1 ;; v810 | necv810) basic_machine=v810-nec - os=none + basic_os=none ;; vaxv) basic_machine=vax-dec - os=sysv + basic_os=sysv ;; vms) basic_machine=vax-dec - os=vms + basic_os=vms ;; vsta) basic_machine=i386-pc - os=vsta + basic_os=vsta ;; vxworks960) basic_machine=i960-wrs - os=vxworks + basic_os=vxworks ;; vxworks68) basic_machine=m68k-wrs - os=vxworks + basic_os=vxworks ;; vxworks29k) basic_machine=a29k-wrs - os=vxworks + basic_os=vxworks ;; xbox) basic_machine=i686-pc - os=mingw32 + basic_os=mingw32 ;; ymp) basic_machine=ymp-cray - os=unicos + basic_os=unicos ;; *) basic_machine=$1 - os= + basic_os= ;; esac ;; @@ -687,17 +686,17 @@ bluegene*) cpu=powerpc vendor=ibm - os=cnk + basic_os=cnk ;; decsystem10* | dec10*) cpu=pdp10 vendor=dec - os=tops10 + basic_os=tops10 ;; decsystem20* | dec20*) cpu=pdp10 vendor=dec - os=tops20 + basic_os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) @@ -707,7 +706,7 @@ dpx2*) cpu=m68k vendor=bull - os=sysv3 + basic_os=sysv3 ;; encore | umax | mmax) cpu=ns32k @@ -716,7 +715,7 @@ elxsi) cpu=elxsi vendor=elxsi - os=${os:-bsd} + basic_os=${basic_os:-bsd} ;; fx2800) cpu=i860 @@ -729,7 +728,7 @@ h3050r* | hiux*) cpu=hppa1.1 vendor=hitachi - os=hiuxwe2 + basic_os=hiuxwe2 ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) cpu=hppa1.0 @@ -770,38 +769,38 @@ vendor=hp ;; i*86v32) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc - os=sysv32 + basic_os=sysv32 ;; i*86v4*) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc - os=sysv4 + basic_os=sysv4 ;; i*86v) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc - os=sysv + basic_os=sysv ;; i*86sol2) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc - os=solaris2 + basic_os=solaris2 ;; j90 | j90-cray) cpu=j90 vendor=cray - os=${os:-unicos} + basic_os=${basic_os:-unicos} ;; iris | iris4d) cpu=mips vendor=sgi - case $os in + case $basic_os in irix*) ;; *) - os=irix4 + basic_os=irix4 ;; esac ;; @@ -812,7 +811,7 @@ *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) cpu=m68k vendor=atari - os=mint + basic_os=mint ;; mipsEE* | ee) cpu=mips64r5900el @@ -838,21 +837,21 @@ news-3600 | risc-news) cpu=mips vendor=sony - os=newsos + basic_os=newsos ;; next | m*-next) cpu=m68k vendor=next - case $os in + case $basic_os in openstep*) ;; nextstep*) ;; ns2*) - os=nextstep2 + basic_os=nextstep2 ;; *) - os=nextstep3 + basic_os=nextstep3 ;; esac ;; @@ -863,12 +862,12 @@ op50n-* | op60c-*) cpu=hppa1.1 vendor=oki - os=proelf + basic_os=proelf ;; pa-hitachi) cpu=hppa1.1 vendor=hitachi - os=hiuxwe2 + basic_os=hiuxwe2 ;; pbd) cpu=sparc @@ -905,12 +904,12 @@ sde) cpu=mipsisa32 vendor=sde - os=${os:-elf} + basic_os=${basic_os:-elf} ;; simso-wrs) cpu=sparclite vendor=wrs - os=vxworks + basic_os=vxworks ;; tower | tower-32) cpu=m68k @@ -927,7 +926,7 @@ w89k-*) cpu=hppa1.1 vendor=winbond - os=proelf + basic_os=proelf ;; none) cpu=none @@ -939,7 +938,7 @@ ;; leon-*|leon[3-9]-*) cpu=sparc - vendor=`echo "$basic_machine" | sed 's/-.*//'` + vendor=$(echo "$basic_machine" | sed 's/-.*//') ;; *-*) @@ -980,11 +979,11 @@ # some cases the only manufacturer, in others, it is the most popular. craynv-unknown) vendor=cray - os=${os:-unicosmp} + basic_os=${basic_os:-unicosmp} ;; c90-unknown | c90-cray) vendor=cray - os=${os:-unicos} + basic_os=${Basic_os:-unicos} ;; fx80-unknown) vendor=alliant @@ -1028,7 +1027,7 @@ dpx20-unknown | dpx20-bull) cpu=rs6000 vendor=bull - os=${os:-bosx} + basic_os=${basic_os:-bosx} ;; # Here we normalize CPU types irrespective of the vendor @@ -1037,7 +1036,7 @@ ;; blackfin-*) cpu=bfin - os=linux + basic_os=linux ;; c54x-*) cpu=tic54x @@ -1050,7 +1049,7 @@ ;; e500v[12]-*) cpu=powerpc - os=$os"spe" + basic_os=${basic_os}"spe" ;; mips3*-*) cpu=mips64 @@ -1060,7 +1059,7 @@ ;; m68knommu-*) cpu=m68k - os=linux + basic_os=linux ;; m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*) cpu=s12z @@ -1070,7 +1069,7 @@ ;; parisc-*) cpu=hppa - os=linux + basic_os=linux ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) cpu=i586 @@ -1106,7 +1105,7 @@ cpu=mipsisa64sb1el ;; sh5e[lb]-*) - cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'` + cpu=$(echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/') ;; spur-*) cpu=spur @@ -1124,13 +1123,16 @@ cpu=x86_64 ;; xscale-* | xscalee[bl]-*) - cpu=`echo "$cpu" | sed 's/^xscale/arm/'` + cpu=$(echo "$cpu" | sed 's/^xscale/arm/') + ;; + arm64-*) + cpu=aarch64 ;; # Recognize the canonical CPU Types that limit and/or modify the # company names they are paired with. cr16-*) - os=${os:-elf} + basic_os=${basic_os:-elf} ;; crisv32-* | etraxfs*-*) cpu=crisv32 @@ -1141,7 +1143,7 @@ vendor=axis ;; crx-*) - os=${os:-elf} + basic_os=${basic_os:-elf} ;; neo-tandem) cpu=neo @@ -1168,7 +1170,7 @@ vendor=sony ;; tile*-*) - os=${os:-linux-gnu} + basic_os=${basic_os:-linux-gnu} ;; *) @@ -1185,7 +1187,7 @@ | am33_2.0 \ | amdgcn \ | arc | arceb \ - | arm | arm[lb]e | arme[lb] | armv* \ + | arm | arm[lb]e | arme[lb] | armv* \ | avr | avr32 \ | asmjs \ | ba \ @@ -1204,6 +1206,7 @@ | k1om \ | le32 | le64 \ | lm32 \ + | loongarch32 | loongarch64 | loongarchx32 \ | m32c | m32r | m32rle \ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ @@ -1248,7 +1251,7 @@ | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ | pru \ | pyramid \ - | riscv | riscv32 | riscv64 \ + | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ | rl78 | romp | rs6000 | rx \ | s390 | s390x \ | score \ @@ -1260,6 +1263,7 @@ | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ | spu \ | tahoe \ + | thumbv7* \ | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ | tron \ | ubicom32 \ @@ -1297,8 +1301,47 @@ # Decode manufacturer-specific aliases for certain operating systems. -if [ x$os != x ] +if test x$basic_os != x then + +# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just +# set os. +case $basic_os in + gnu/linux*) + kernel=linux + os=$(echo $basic_os | sed -e 's|gnu/linux|gnu|') + ;; + os2-emx) + kernel=os2 + os=$(echo $basic_os | sed -e 's|os2-emx|emx|') + ;; + nto-qnx*) + kernel=nto + os=$(echo $basic_os | sed -e 's|nto-qnx|qnx|') + ;; + *-*) + # shellcheck disable=SC2162 + IFS="-" read kernel os <&2 - exit 1 + # No normalization, but not necessarily accepted, that comes below. ;; esac + else # Here we handle the default operating systems that come with various machines. @@ -1552,6 +1520,7 @@ # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. +kernel= case $cpu-$vendor in score-*) os=elf @@ -1563,7 +1532,8 @@ os=riscix1.2 ;; arm*-rebel) - os=linux + kernel=linux + os=gnu ;; arm*-semi) os=aout @@ -1729,84 +1699,173 @@ os=none ;; esac + fi +# Now, validate our (potentially fixed-up) OS. +case $os in + # Sometimes we do "kernel-abi", so those need to count as OSes. + musl* | newlib* | uclibc*) + ;; + # Likewise for "kernel-libc" + eabi* | gnueabi*) + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ + | hiux* | abug | nacl* | netware* | windows* \ + | os9* | macos* | osx* | ios* \ + | mpw* | magic* | mmixware* | mon960* | lnews* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | mirbsd* | netbsd* | dicos* | openedition* | ose* \ + | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \ + | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | mint* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* | irx* \ + | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ + | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*) + ;; + # This one is extra strict with allowed versions + sco3.2v2 | sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + none) + ;; + *) + echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + exit 1 + ;; +esac + +# As a final step for OS-related things, validate the OS-kernel combination +# (given a valid OS), if there is a kernel. +case $kernel-$os in + linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) + ;; + uclinux-uclibc* ) + ;; + -dietlibc* | -newlib* | -musl* | -uclibc* ) + # These are just libc implementations, not actual OSes, and thus + # require a kernel. + echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + kfreebsd*-gnu* | kopensolaris*-gnu*) + ;; + nto-qnx*) + ;; + os2-emx) + ;; + *-eabi* | *-gnueabi*) + ;; + -*) + # Blank kernel with real OS is always fine. + ;; + *-*) + echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + exit 1 + ;; +esac + # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. case $vendor in unknown) - case $os in - riscix*) + case $cpu-$os in + *-riscix*) vendor=acorn ;; - sunos*) + *-sunos*) vendor=sun ;; - cnk*|-aix*) + *-cnk* | *-aix*) vendor=ibm ;; - beos*) + *-beos*) vendor=be ;; - hpux*) + *-hpux*) vendor=hp ;; - mpeix*) + *-mpeix*) vendor=hp ;; - hiux*) + *-hiux*) vendor=hitachi ;; - unos*) + *-unos*) vendor=crds ;; - dgux*) + *-dgux*) vendor=dg ;; - luna*) + *-luna*) vendor=omron ;; - genix*) + *-genix*) vendor=ns ;; - clix*) + *-clix*) vendor=intergraph ;; - mvs* | opened*) + *-mvs* | *-opened*) + vendor=ibm + ;; + *-os400*) vendor=ibm ;; - os400*) + s390-* | s390x-*) vendor=ibm ;; - ptx*) + *-ptx*) vendor=sequent ;; - tpf*) + *-tpf*) vendor=ibm ;; - vxsim* | vxworks* | windiss*) + *-vxsim* | *-vxworks* | *-windiss*) vendor=wrs ;; - aux*) + *-aux*) vendor=apple ;; - hms*) + *-hms*) vendor=hitachi ;; - mpw* | macos*) + *-mpw* | *-macos*) vendor=apple ;; - *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) vendor=atari ;; - vos*) + *-vos*) vendor=stratus ;; esac ;; esac -echo "$cpu-$vendor-$os" +echo "$cpu-$vendor-${kernel:+$kernel-}$os" exit # Local variables: diff -Nru xorg-server-1.20.11/configure xorg-server-1.20.13/configure --- xorg-server-1.20.11/configure 2021-04-13 14:11:55.000000000 +0000 +++ xorg-server-1.20.13/configure 2021-07-29 18:48:26.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xorg-server 1.20.11. +# Generated by GNU Autoconf 2.69 for xorg-server 1.20.13. # # Report bugs to . # @@ -651,8 +651,8 @@ # Identity of this package. PACKAGE_NAME='xorg-server' PACKAGE_TARNAME='xorg-server' -PACKAGE_VERSION='1.20.11' -PACKAGE_STRING='xorg-server 1.20.11' +PACKAGE_VERSION='1.20.13' +PACKAGE_STRING='xorg-server 1.20.13' PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues' PACKAGE_URL='' @@ -2045,7 +2045,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xorg-server 1.20.11 to adapt to many kinds of systems. +\`configure' configures xorg-server 1.20.13 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2116,7 +2116,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorg-server 1.20.11:";; + short | recursive ) echo "Configuration of xorg-server 1.20.13:";; esac cat <<\_ACEOF @@ -2307,10 +2307,10 @@ org.x) --with-bundle-version=VERSION Version to use for X11.app's CFBundleVersion - (default: 1.20.11) + (default: 1.20.13) --with-bundle-version-string=VERSION Version to use for X11.app's - CFBundleShortVersionString (default: 1.20.11) + CFBundleShortVersionString (default: 1.20.13) --with-sparkle-feed-url=URL URL for the Sparkle feed (default: https://www.xquartz.org/releases/sparkle/release.xml) @@ -2567,7 +2567,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorg-server configure 1.20.11 +xorg-server configure 1.20.13 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3276,7 +3276,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xorg-server $as_me 1.20.11, which was +It was created by xorg-server $as_me 1.20.13, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3624,8 +3624,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -RELEASE_DATE="2021-04-13" -RELEASE_NAME="Arroz con Pollo" +RELEASE_DATE="2021-07-29" +RELEASE_NAME="Lemon Pepper Chicken" am__api_version='1.16' @@ -3833,12 +3833,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -4143,7 +4138,7 @@ # Define the identity of the package. PACKAGE='xorg-server' - VERSION='1.20.11' + VERSION='1.20.13' cat >>confdefs.h <<_ACEOF @@ -16507,7 +16502,7 @@ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; 10.[012][,.]*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; @@ -23778,7 +23773,7 @@ if test "${with_bundle_version+set}" = set; then : withval=$with_bundle_version; BUNDLE_VERSION="${withval}" else - BUNDLE_VERSION="1.20.11" + BUNDLE_VERSION="1.20.13" fi @@ -31304,7 +31299,7 @@ fi DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC" XDMX_CFLAGS="$DMXMODULES_CFLAGS" - XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $RANDR_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB" + XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $RANDR_LIB $RENDER_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB" XDMX_SYS_LIBS="$DMXMODULES_LIBS" @@ -33623,7 +33618,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xorg-server $as_me 1.20.11, which was +This file was extended by xorg-server $as_me 1.20.13, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -33689,7 +33684,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xorg-server config.status 1.20.11 +xorg-server config.status 1.20.13 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru xorg-server-1.20.11/configure.ac xorg-server-1.20.13/configure.ac --- xorg-server-1.20.11/configure.ac 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/configure.ac 2021-07-29 18:48:13.000000000 +0000 @@ -26,12 +26,12 @@ dnl Process this file with autoconf to create configure. AC_PREREQ(2.60) -AC_INIT([xorg-server], 1.20.11, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server) -RELEASE_DATE="2021-04-13" -RELEASE_NAME="Arroz con Pollo" +AC_INIT([xorg-server], 1.20.13, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server) +RELEASE_DATE="2021-07-29" +RELEASE_NAME="Lemon Pepper Chicken" AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-xz]) AC_USE_SYSTEM_EXTENSIONS # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS @@ -2236,7 +2236,7 @@ fi DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC" XDMX_CFLAGS="$DMXMODULES_CFLAGS" - XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $RANDR_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB" + XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $RANDR_LIB $RENDER_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB" XDMX_SYS_LIBS="$DMXMODULES_LIBS" AC_SUBST([XDMX_CFLAGS]) AC_SUBST([XDMX_LIBS]) diff -Nru xorg-server-1.20.11/damageext/Makefile.in xorg-server-1.20.13/damageext/Makefile.in --- xorg-server-1.20.11/damageext/Makefile.in 2021-04-13 14:11:57.000000000 +0000 +++ xorg-server-1.20.13/damageext/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/dbe/Makefile.in xorg-server-1.20.13/dbe/Makefile.in --- xorg-server-1.20.11/dbe/Makefile.in 2021-04-13 14:11:57.000000000 +0000 +++ xorg-server-1.20.13/dbe/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/debian/changelog xorg-server-1.20.13/debian/changelog --- xorg-server-1.20.11/debian/changelog 2021-12-14 18:59:17.000000000 +0000 +++ xorg-server-1.20.13/debian/changelog 2021-12-14 18:59:18.000000000 +0000 @@ -1,16 +1,47 @@ -xorg-server (2:1.20.11-1ubuntu1~20.04.2) focal; urgency=medium +xorg-server (2:1.20.13-1ubuntu1~20.04.2) focal-security; urgency=medium - * modesetting-disable-reverse-prime-offload-udl.diff: Fix a regression - on displaylink devices after mesa update. (LP: #1931547) + * SECURITY UPDATE: SProcRenderCompositeGlyphs out-of-bounds access + - debian/patches/CVE-2021-4008.patch: check lengths in render/render.c. + - CVE-2021-4008 + * SECURITY UPDATE: SProcXFixesCreatePointerBarrier out-of-bounds access + - debian/patches/CVE-2021-4009.patch: use sizes in xfixes/cursor.c. + - CVE-2021-4009 + * SECURITY UPDATE: SProcScreenSaverSuspend out-of-bounds access + - debian/patches/CVE-2021-4010.patch: fix logic in Xext/saver.c. + - CVE-2021-4010 + * SECURITY UPDATE: SwapCreateRegister out-of-bounds access + - debian/patches/CVE-2021-4011.patch: fix length in record/record.c. + - CVE-2021-4011 - -- Timo Aaltonen Tue, 06 Jul 2021 13:17:51 +0300 + -- Marc Deslauriers Tue, 14 Dec 2021 09:14:13 -0500 -xorg-server (2:1.20.11-1ubuntu1~20.04.1) focal; urgency=medium +xorg-server (2:1.20.13-1ubuntu1~20.04.1) focal; urgency=medium - * Backport to focal. (LP: #1925320) + * Backport to focal. (LP: #1947820, LP: #1949553) - don't disable building xwayland - -- Timo Aaltonen Mon, 31 May 2021 18:24:16 +0300 + -- Timo Aaltonen Thu, 18 Nov 2021 14:55:16 +0200 + +xorg-server (2:1.20.13-1ubuntu1) impish; urgency=medium + + * Merge from Debian. + * modesetting-disable-reverse-prime-offload-udl.diff: Dropped, + upstream. + + -- Timo Aaltonen Tue, 10 Aug 2021 12:32:48 +0300 + +xorg-server (2:1.20.13-1) experimental; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Tue, 10 Aug 2021 12:27:00 +0300 + +xorg-server (2:1.20.11-1ubuntu2) impish; urgency=medium + + * modesetting-disable-reverse-prime-offload-udl.diff: Fix a regression + on displaylink devices after mesa update. (LP: #1931547) + + -- Timo Aaltonen Tue, 06 Jul 2021 13:17:51 +0300 xorg-server (2:1.20.11-1ubuntu1) hirsute; urgency=medium diff -Nru xorg-server-1.20.11/debian/patches/CVE-2021-4008.patch xorg-server-1.20.13/debian/patches/CVE-2021-4008.patch --- xorg-server-1.20.11/debian/patches/CVE-2021-4008.patch 1970-01-01 00:00:00.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/CVE-2021-4008.patch 2021-12-14 18:59:18.000000000 +0000 @@ -0,0 +1,52 @@ +From ebce7e2d80e7c80e1dda60f2f0bc886f1106ba60 Mon Sep 17 00:00:00 2001 +From: Povilas Kanapickas +Date: Tue, 14 Dec 2021 15:00:03 +0200 +Subject: [PATCH] render: Fix out of bounds access in + SProcRenderCompositeGlyphs() + +ZDI-CAN-14192, CVE-2021-4008 + +This vulnerability was discovered and the fix was suggested by: +Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + +Signed-off-by: Povilas Kanapickas +--- + render/render.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/render/render.c b/render/render.c +index c376090ca..456f156d4 100644 +--- a/render/render.c ++++ b/render/render.c +@@ -2309,6 +2309,9 @@ SProcRenderCompositeGlyphs(ClientPtr client) + + i = elt->len; + if (i == 0xff) { ++ if (buffer + 4 > end) { ++ return BadLength; ++ } + swapl((int *) buffer); + buffer += 4; + } +@@ -2319,12 +2322,18 @@ SProcRenderCompositeGlyphs(ClientPtr client) + buffer += i; + break; + case 2: ++ if (buffer + i * 2 > end) { ++ return BadLength; ++ } + while (i--) { + swaps((short *) buffer); + buffer += 2; + } + break; + case 4: ++ if (buffer + i * 4 > end) { ++ return BadLength; ++ } + while (i--) { + swapl((int *) buffer); + buffer += 4; +-- +GitLab + diff -Nru xorg-server-1.20.11/debian/patches/CVE-2021-4009.patch xorg-server-1.20.13/debian/patches/CVE-2021-4009.patch --- xorg-server-1.20.11/debian/patches/CVE-2021-4009.patch 1970-01-01 00:00:00.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/CVE-2021-4009.patch 2021-12-14 18:59:18.000000000 +0000 @@ -0,0 +1,43 @@ +From b5196750099ae6ae582e1f46bd0a6dad29550e02 Mon Sep 17 00:00:00 2001 +From: Povilas Kanapickas +Date: Tue, 14 Dec 2021 15:00:01 +0200 +Subject: [PATCH] xfixes: Fix out of bounds access in + *ProcXFixesCreatePointerBarrier() + +ZDI-CAN-14950, CVE-2021-4009 + +This vulnerability was discovered and the fix was suggested by: +Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + +Signed-off-by: Povilas Kanapickas +--- + xfixes/cursor.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/xfixes/cursor.c b/xfixes/cursor.c +index 60580b88f..c5d4554b2 100644 +--- a/xfixes/cursor.c ++++ b/xfixes/cursor.c +@@ -1010,7 +1010,8 @@ ProcXFixesCreatePointerBarrier(ClientPtr client) + { + REQUEST(xXFixesCreatePointerBarrierReq); + +- REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, pad_to_int32(stuff->num_devices)); ++ REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, ++ pad_to_int32(stuff->num_devices * sizeof(CARD16))); + LEGAL_NEW_RESOURCE(stuff->barrier, client); + + return XICreatePointerBarrier(client, stuff); +@@ -1027,7 +1028,8 @@ SProcXFixesCreatePointerBarrier(ClientPtr client) + + swaps(&stuff->length); + swaps(&stuff->num_devices); +- REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, pad_to_int32(stuff->num_devices)); ++ REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, ++ pad_to_int32(stuff->num_devices * sizeof(CARD16))); + + swapl(&stuff->barrier); + swapl(&stuff->window); +-- +GitLab + diff -Nru xorg-server-1.20.11/debian/patches/CVE-2021-4010.patch xorg-server-1.20.13/debian/patches/CVE-2021-4010.patch --- xorg-server-1.20.11/debian/patches/CVE-2021-4010.patch 1970-01-01 00:00:00.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/CVE-2021-4010.patch 2021-12-14 18:59:18.000000000 +0000 @@ -0,0 +1,32 @@ +From 6c4c53010772e3cb4cb8acd54950c8eec9c00d21 Mon Sep 17 00:00:00 2001 +From: Povilas Kanapickas +Date: Tue, 14 Dec 2021 15:00:02 +0200 +Subject: [PATCH] Xext: Fix out of bounds access in SProcScreenSaverSuspend() + +ZDI-CAN-14951, CVE-2021-4010 + +This vulnerability was discovered and the fix was suggested by: +Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + +Signed-off-by: Povilas Kanapickas +--- + Xext/saver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Xext/saver.c b/Xext/saver.c +index 1d7e3cadf..f813ba08d 100644 +--- a/Xext/saver.c ++++ b/Xext/saver.c +@@ -1351,8 +1351,8 @@ SProcScreenSaverSuspend(ClientPtr client) + REQUEST(xScreenSaverSuspendReq); + + swaps(&stuff->length); +- swapl(&stuff->suspend); + REQUEST_SIZE_MATCH(xScreenSaverSuspendReq); ++ swapl(&stuff->suspend); + return ProcScreenSaverSuspend(client); + } + +-- +GitLab + diff -Nru xorg-server-1.20.11/debian/patches/CVE-2021-4011.patch xorg-server-1.20.13/debian/patches/CVE-2021-4011.patch --- xorg-server-1.20.11/debian/patches/CVE-2021-4011.patch 1970-01-01 00:00:00.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/CVE-2021-4011.patch 2021-12-14 18:59:18.000000000 +0000 @@ -0,0 +1,28 @@ +From e56f61c79fc3cee26d83cda0f84ae56d5979f768 Mon Sep 17 00:00:00 2001 +From: Povilas Kanapickas +Date: Tue, 14 Dec 2021 15:00:00 +0200 +Subject: [PATCH] record: Fix out of bounds access in SwapCreateRegister() + +ZDI-CAN-14952, CVE-2021-4011 + +This vulnerability was discovered and the fix was suggested by: +Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + +Signed-off-by: Povilas Kanapickas +--- + record/record.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/record/record.c ++++ b/record/record.c +@@ -2515,8 +2515,8 @@ SwapCreateRegister(ClientPtr client, xRe + swapl(pClientID); + } + if (stuff->nRanges > +- client->req_len - bytes_to_int32(sz_xRecordRegisterClientsReq) +- - stuff->nClients) ++ (client->req_len - bytes_to_int32(sz_xRecordRegisterClientsReq) ++ - stuff->nClients) / bytes_to_int32(sz_xRecordRange)) + return BadLength; + RecordSwapRanges((xRecordRange *) pClientID, stuff->nRanges); + return Success; diff -Nru xorg-server-1.20.11/debian/patches/modesetting-disable-reverse-prime-offload-udl.diff xorg-server-1.20.13/debian/patches/modesetting-disable-reverse-prime-offload-udl.diff --- xorg-server-1.20.11/debian/patches/modesetting-disable-reverse-prime-offload-udl.diff 2021-12-14 18:59:17.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/modesetting-disable-reverse-prime-offload-udl.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -commit 4e11bd390a28144fac03dc21a6caf0800596e2fa -Author: Łukasz Spintzyk -Date: Tue Jun 8 18:53:07 2021 +0200 - - modesetting: Disable reverse prime offload mode for displays running on evdi,udl - - This mode for displays running on evdi/udl as side effect of failed glamor_egl_init - reverse_prime_offload_mode was initialized to FALSE - - After Mesa upgrade to 21.0.0 GL_RENDERER is not llvmpipe that results in successful glamor_egl_init - and reverse_prime_offload_mode enabled. - - This commit is explicitly disabling reverse_prime_offload_mode for evdi and udl drivers - - Signed-off-by: Łukasz Spintzyk - (cherry picked from commit 7e7c147105ac704a7b33bdee0f85dc9ccdd8f747) - -diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c -index ef4a3147d..8ca3e897a 100644 ---- a/hw/xfree86/drivers/modesetting/driver.c -+++ b/hw/xfree86/drivers/modesetting/driver.c -@@ -1752,18 +1752,30 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv) - "Failed to initialize the Present extension.\n"); - } - /* enable reverse prime if we are a GPU screen, and accelerated, and not -- * i915. i915 is happy scanning out from sysmem. */ -+ * i915, evdi or udl. i915 is happy scanning out from sysmem. -+ * evdi and udl are virtual drivers scanning out from sysmem -+ * backed dumb buffers. -+ */ - if (pScreen->isGPU) { - drmVersionPtr version; - - /* enable if we are an accelerated GPU screen */ - ms->drmmode.reverse_prime_offload_mode = TRUE; - -- /* disable if we detect i915 */ - if ((version = drmGetVersion(ms->drmmode.fd))) { - if (!strncmp("i915", version->name, version->name_len)) { - ms->drmmode.reverse_prime_offload_mode = FALSE; - } -+ if (!strncmp("evdi", version->name, version->name_len)) { -+ ms->drmmode.reverse_prime_offload_mode = FALSE; -+ } -+ if (!strncmp("udl", version->name, version->name_len)) { -+ ms->drmmode.reverse_prime_offload_mode = FALSE; -+ } -+ if (!ms->drmmode.reverse_prime_offload_mode) { -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, -+ "Disable reverse prime offload mode for %s.\n", version->name); -+ } - drmFreeVersion(version); - } - } diff -Nru xorg-server-1.20.11/debian/patches/series xorg-server-1.20.13/debian/patches/series --- xorg-server-1.20.11/debian/patches/series 2021-12-14 18:59:17.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/series 2021-12-14 18:59:18.000000000 +0000 @@ -30,4 +30,7 @@ dri2-set-fallback-names-amd-intel.diff randr-auto-bind-of-gpu-is-a-config-change.diff fix-gtf-detection-for-edid-14.diff -modesetting-disable-reverse-prime-offload-udl.diff +CVE-2021-4008.patch +CVE-2021-4009.patch +CVE-2021-4010.patch +CVE-2021-4011.patch diff -Nru xorg-server-1.20.11/dix/devices.c xorg-server-1.20.13/dix/devices.c --- xorg-server-1.20.11/dix/devices.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/dix/devices.c 2021-07-29 18:48:13.000000000 +0000 @@ -2261,6 +2261,9 @@ REQUEST(xChangePointerControlReq); REQUEST_SIZE_MATCH(xChangePointerControlReq); + /* If the device has no PtrFeedbackPtr, the xserver has a bug */ + BUG_RETURN_VAL (!mouse->ptrfeed, BadImplementation); + ctrl = mouse->ptrfeed->ctrl; if ((stuff->doAccel != xTrue) && (stuff->doAccel != xFalse)) { client->errorValue = stuff->doAccel; diff -Nru xorg-server-1.20.11/dix/Makefile.in xorg-server-1.20.13/dix/Makefile.in --- xorg-server-1.20.11/dix/Makefile.in 2021-04-13 14:11:57.000000000 +0000 +++ xorg-server-1.20.13/dix/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. @@ -908,7 +908,8 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -1074,7 +1075,7 @@ uninstall-am: uninstall-dist_miscconfigDATA -.MAKE: all check install install-am install-strip +.MAKE: all check install install-am install-exec install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-generic clean-libtool clean-noinstLTLIBRARIES \ diff -Nru xorg-server-1.20.11/doc/dtrace/Makefile.in xorg-server-1.20.13/doc/dtrace/Makefile.in --- xorg-server-1.20.11/doc/dtrace/Makefile.in 2021-04-13 14:11:57.000000000 +0000 +++ xorg-server-1.20.13/doc/dtrace/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/doc/Makefile.in xorg-server-1.20.13/doc/Makefile.in --- xorg-server-1.20.11/doc/Makefile.in 2021-04-13 14:11:57.000000000 +0000 +++ xorg-server-1.20.13/doc/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/dri3/Makefile.in xorg-server-1.20.13/dri3/Makefile.in --- xorg-server-1.20.11/dri3/Makefile.in 2021-04-13 14:11:57.000000000 +0000 +++ xorg-server-1.20.13/dri3/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/exa/Makefile.in xorg-server-1.20.13/exa/Makefile.in --- xorg-server-1.20.11/exa/Makefile.in 2021-04-13 14:11:57.000000000 +0000 +++ xorg-server-1.20.13/exa/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/fb/Makefile.in xorg-server-1.20.13/fb/Makefile.in --- xorg-server-1.20.11/fb/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/fb/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/glamor/glamor.c xorg-server-1.20.13/glamor/glamor.c --- xorg-server-1.20.11/glamor/glamor.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/glamor/glamor.c 2021-07-29 18:48:14.000000000 +0000 @@ -654,7 +654,8 @@ * cached IB. */ if (strstr((char *)glGetString(GL_VENDOR), "Broadcom") && - strstr((char *)glGetString(GL_RENDERER), "VC4")) + (strstr((char *)glGetString(GL_RENDERER), "VC4") || + strstr((char *)glGetString(GL_RENDERER), "V3D"))) glamor_priv->use_quads = FALSE; glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE, &glamor_priv->max_fbo_size); diff -Nru xorg-server-1.20.11/glamor/Makefile.in xorg-server-1.20.13/glamor/Makefile.in --- xorg-server-1.20.11/glamor/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/glamor/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/glx/glxcmds.c xorg-server-1.20.13/glx/glxcmds.c --- xorg-server-1.20.11/glx/glxcmds.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/glx/glxcmds.c 2021-07-29 18:48:14.000000000 +0000 @@ -473,8 +473,15 @@ __GLXscreen *pGlxScreen; int rc; - if (validGlxDrawable(client, drawId, GLX_DRAWABLE_ANY, - DixWriteAccess, &pGlxDraw, &rc)) { + rc = dixLookupResourceByType((void **)&pGlxDraw, drawId, + __glXDrawableRes, client, DixWriteAccess); + if (rc == Success && + /* If pGlxDraw->drawId == drawId, drawId is a valid GLX drawable. + * Otherwise, if pGlxDraw->type == GLX_DRAWABLE_WINDOW, drawId is + * an X window, but the client has already created a GLXWindow + * associated with it, so we don't want to create another one. */ + (pGlxDraw->drawId == drawId || + pGlxDraw->type == GLX_DRAWABLE_WINDOW)) { if (glxc != NULL && glxc->config != NULL && glxc->config != pGlxDraw->config) { @@ -641,10 +648,11 @@ glxc->readPriv = NULL; return __glXError(GLXBadContext); } + } + glxServer.setContextTagPrivate(client, newContextTag, glxc); + if (glxc) glxc->currentClient = client; - glxServer.setContextTagPrivate(client, newContextTag, glxc); - } if (prevglxc) { prevglxc->currentClient = NULL; diff -Nru xorg-server-1.20.11/glx/glxdricommon.c xorg-server-1.20.13/glx/glxdricommon.c --- xorg-server-1.20.11/glx/glxdricommon.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/glx/glxdricommon.c 2021-07-29 18:48:14.000000000 +0000 @@ -27,6 +27,7 @@ #include #endif +#include #include #include #include @@ -322,6 +323,15 @@ __DRI_DRIVER_GET_EXTENSIONS, driverName) != -1) { const __DRIextension **(*get_extensions)(void); + for (i = 0; i < strlen(get_extensions_name); i++) { + /* Replace all non-alphanumeric characters with underscore, + * since they are not allowed in C symbol names. That fixes up + * symbol name for drivers with '-drm' suffix + */ + if (!isalnum(get_extensions_name[i])) + get_extensions_name[i] = '_'; + } + get_extensions = dlsym(driver, get_extensions_name); if (get_extensions) extensions = get_extensions(); diff -Nru xorg-server-1.20.11/glx/Makefile.in xorg-server-1.20.13/glx/Makefile.in --- xorg-server-1.20.11/glx/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/glx/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/dmx/config/Makefile.am xorg-server-1.20.13/hw/dmx/config/Makefile.am --- xorg-server-1.20.11/hw/dmx/config/Makefile.am 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/config/Makefile.am 2021-07-29 18:48:14.000000000 +0000 @@ -38,23 +38,20 @@ bin_PROGRAMS = xdmxconfig vdltodmx dmxtodmx -xdmxconfig_DEPENDENCIES = libdmxconfig.a xdmxconfig_SOURCES = \ xdmxconfig.c \ $(top_srcdir)/hw/dmx/dmxlog.c \ Canvas.c \ Canvas.h \ CanvasP.h -xdmxconfig_LDADD = -L. -ldmxconfig @XDMXCONFIG_DEP_LIBS@ +xdmxconfig_LDADD = libdmxconfig.a @XDMXCONFIG_DEP_LIBS@ xdmxconfig_CFLAGS = $(AM_CFLAGS) @XDMXCONFIG_DEP_CFLAGS@ -vdltodmx_DEPENDENCIES = libdmxconfig.a vdltodmx_SOURCES = vdltodmx.c -vdltodmx_LDADD = -L. -ldmxconfig +vdltodmx_LDADD = libdmxconfig.a -dmxtodmx_DEPENDENCIES = libdmxconfig.a dmxtodmx_SOURCES = dmxtodmx.c -dmxtodmx_LDADD = -L. -ldmxconfig +dmxtodmx_LDADD = libdmxconfig.a EXTRA_DIST = \ test-a.in test-a.out \ diff -Nru xorg-server-1.20.11/hw/dmx/config/Makefile.in xorg-server-1.20.13/hw/dmx/config/Makefile.in --- xorg-server-1.20.11/hw/dmx/config/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/config/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. @@ -127,15 +127,18 @@ libdmxconfig_a_OBJECTS = $(am_libdmxconfig_a_OBJECTS) am_dmxtodmx_OBJECTS = dmxtodmx.$(OBJEXT) dmxtodmx_OBJECTS = $(am_dmxtodmx_OBJECTS) +dmxtodmx_DEPENDENCIES = libdmxconfig.a AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = am_vdltodmx_OBJECTS = vdltodmx.$(OBJEXT) vdltodmx_OBJECTS = $(am_vdltodmx_OBJECTS) +vdltodmx_DEPENDENCIES = libdmxconfig.a am_xdmxconfig_OBJECTS = xdmxconfig-xdmxconfig.$(OBJEXT) \ xdmxconfig-dmxlog.$(OBJEXT) xdmxconfig-Canvas.$(OBJEXT) xdmxconfig_OBJECTS = $(am_xdmxconfig_OBJECTS) +xdmxconfig_DEPENDENCIES = libdmxconfig.a xdmxconfig_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(xdmxconfig_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -656,7 +659,6 @@ $(GLX_DEFS) \ @DMXMODULES_CFLAGS@ -xdmxconfig_DEPENDENCIES = libdmxconfig.a xdmxconfig_SOURCES = \ xdmxconfig.c \ $(top_srcdir)/hw/dmx/dmxlog.c \ @@ -664,14 +666,12 @@ Canvas.h \ CanvasP.h -xdmxconfig_LDADD = -L. -ldmxconfig @XDMXCONFIG_DEP_LIBS@ +xdmxconfig_LDADD = libdmxconfig.a @XDMXCONFIG_DEP_LIBS@ xdmxconfig_CFLAGS = $(AM_CFLAGS) @XDMXCONFIG_DEP_CFLAGS@ -vdltodmx_DEPENDENCIES = libdmxconfig.a vdltodmx_SOURCES = vdltodmx.c -vdltodmx_LDADD = -L. -ldmxconfig -dmxtodmx_DEPENDENCIES = libdmxconfig.a +vdltodmx_LDADD = libdmxconfig.a dmxtodmx_SOURCES = dmxtodmx.c -dmxtodmx_LDADD = -L. -ldmxconfig +dmxtodmx_LDADD = libdmxconfig.a EXTRA_DIST = \ test-a.in test-a.out \ test-b.in test-b.out \ @@ -1072,7 +1072,8 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive -install-exec: install-exec-recursive +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -1200,7 +1201,7 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: $(am__recursive_targets) all check install install-am \ - install-strip + install-exec install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ am--depfiles check check-am clean clean-binPROGRAMS \ diff -Nru xorg-server-1.20.11/hw/dmx/config/man/Makefile.in xorg-server-1.20.13/hw/dmx/config/man/Makefile.in --- xorg-server-1.20.11/hw/dmx/config/man/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/config/man/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/dmx/config/parser.c xorg-server-1.20.13/hw/dmx/config/parser.c --- xorg-server-1.20.11/hw/dmx/config/parser.c 2021-04-13 14:12:40.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/config/parser.c 2021-07-29 18:48:49.000000000 +0000 @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 3.7.3. */ +/* A Bison parser, made by GNU Bison 3.7.6. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation, + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -45,11 +45,11 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ -/* Identify Bison output. */ -#define YYBISON 1 +/* Identify Bison output, and Bison version. */ +#define YYBISON 30706 -/* Bison version. */ -#define YYBISON_VERSION "3.7.3" +/* Bison version string. */ +#define YYBISON_VERSION "3.7.6" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -148,6 +148,7 @@ typedef enum yytokentype yytoken_kind_t; #endif /* Token kinds. */ +#define YYEMPTY -2 #define YYEOF 0 #define YYerror 256 #define YYUNDEF 257 @@ -184,7 +185,7 @@ DMXConfigVirtualPtr virtual; DMXConfigEntryPtr entry; -#line 188 "parser.c" +#line 189 "parser.c" }; typedef union YYSTYPE YYSTYPE; @@ -288,6 +289,18 @@ typedef short yytype_int16; #endif +/* Work around bug in HP-UX 11.23, which defines these macros + incorrectly for preprocessor constants. This workaround can likely + be removed in 2023, as HPE has promised support for HP-UX 11.23 + (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of + . */ +#ifdef __hpux +# undef UINT_LEAST8_MAX +# undef UINT_LEAST16_MAX +# define UINT_LEAST8_MAX 255 +# define UINT_LEAST16_MAX 65535 +#endif + #if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__ typedef __UINT_LEAST8_TYPE__ yytype_uint8; #elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \ @@ -385,9 +398,9 @@ /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(E) ((void) (E)) +# define YY_USE(E) ((void) (E)) #else -# define YYUSE(E) /* empty */ +# define YY_USE(E) /* empty */ #endif #if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ @@ -715,7 +728,7 @@ /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { - -1, 3, 4, 5, 6, 26, 27, 28, 29, 62, + 0, 3, 4, 5, 6, 26, 27, 28, 29, 62, 63, 49, 50, 30, 31, 32, 39, 52, 53, 72, 54, 12, 45, 33, 64 }; @@ -867,7 +880,7 @@ yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep) { FILE *yyoutput = yyo; - YYUSE (yyoutput); + YY_USE (yyoutput); if (!yyvaluep) return; # ifdef YYPRINT @@ -875,7 +888,7 @@ YYPRINT (yyo, yytoknum[yykind], *yyvaluep); # endif YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - YYUSE (yykind); + YY_USE (yykind); YY_IGNORE_MAYBE_UNINITIALIZED_END } @@ -989,13 +1002,13 @@ yydestruct (const char *yymsg, yysymbol_kind_t yykind, YYSTYPE *yyvaluep) { - YYUSE (yyvaluep); + YY_USE (yyvaluep); if (!yymsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp); YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - YYUSE (yykind); + YY_USE (yykind); YY_IGNORE_MAYBE_UNINITIALIZED_END } @@ -1258,97 +1271,97 @@ case 2: /* Program: EntryList */ #line 96 "parser.y" { dmxConfigEntry = (yyvsp[0].entry); } -#line 1262 "parser.c" +#line 1275 "parser.c" break; case 4: /* EntryList: EntryList Entry */ #line 100 "parser.y" { APPEND(DMXConfigEntryPtr,(yyvsp[-1].entry),(yyvsp[0].entry)); (yyval.entry) = (yyvsp[-1].entry); } -#line 1268 "parser.c" +#line 1281 "parser.c" break; case 5: /* Entry: Virtual */ #line 103 "parser.y" { (yyval.entry) = dmxConfigEntryVirtual((yyvsp[0].virtual)); } -#line 1274 "parser.c" +#line 1287 "parser.c" break; case 6: /* Entry: T_LINE_COMMENT */ #line 104 "parser.y" { (yyval.entry) = dmxConfigEntryComment((yyvsp[0].comment)); } -#line 1280 "parser.c" +#line 1293 "parser.c" break; case 7: /* Virtual: T_VIRTUAL Open SubList Close */ #line 108 "parser.y" { (yyval.virtual) = dmxConfigCreateVirtual((yyvsp[-3].token), NULL, NULL, (yyvsp[-2].token), (yyvsp[-1].subentry), (yyvsp[0].token)); } -#line 1286 "parser.c" +#line 1299 "parser.c" break; case 8: /* Virtual: T_VIRTUAL Dimension Open SubList Close */ #line 110 "parser.y" { (yyval.virtual) = dmxConfigCreateVirtual((yyvsp[-4].token), NULL, (yyvsp[-3].pair), (yyvsp[-2].token), (yyvsp[-1].subentry), (yyvsp[0].token)); } -#line 1292 "parser.c" +#line 1305 "parser.c" break; case 9: /* Virtual: T_VIRTUAL Name Open SubList Close */ #line 112 "parser.y" { (yyval.virtual) = dmxConfigCreateVirtual((yyvsp[-4].token), (yyvsp[-3].string), NULL, (yyvsp[-2].token), (yyvsp[-1].subentry), (yyvsp[0].token)); } -#line 1298 "parser.c" +#line 1311 "parser.c" break; case 10: /* Virtual: T_VIRTUAL Name Dimension Open SubList Close */ #line 114 "parser.y" { (yyval.virtual) = dmxConfigCreateVirtual((yyvsp[-5].token), (yyvsp[-4].string), (yyvsp[-3].pair), (yyvsp[-2].token), (yyvsp[-1].subentry), (yyvsp[0].token) ); } -#line 1304 "parser.c" +#line 1317 "parser.c" break; case 12: /* SubList: SubList Sub */ #line 118 "parser.y" { APPEND(DMXConfigSubPtr,(yyvsp[-1].subentry),(yyvsp[0].subentry)); (yyval.subentry) = (yyvsp[-1].subentry); } -#line 1310 "parser.c" +#line 1323 "parser.c" break; case 13: /* Sub: T_LINE_COMMENT */ #line 121 "parser.y" { (yyval.subentry) = dmxConfigSubComment((yyvsp[0].comment)); } -#line 1316 "parser.c" +#line 1329 "parser.c" break; case 14: /* Sub: DisplayEntry */ #line 122 "parser.y" { (yyval.subentry) = dmxConfigSubDisplay((yyvsp[0].display)); } -#line 1322 "parser.c" +#line 1335 "parser.c" break; case 15: /* Sub: WallEntry */ #line 123 "parser.y" { (yyval.subentry) = dmxConfigSubWall((yyvsp[0].wall)); } -#line 1328 "parser.c" +#line 1341 "parser.c" break; case 16: /* Sub: OptionEntry */ #line 124 "parser.y" { (yyval.subentry) = dmxConfigSubOption((yyvsp[0].option)); } -#line 1334 "parser.c" +#line 1347 "parser.c" break; case 17: /* Sub: ParamEntry */ #line 125 "parser.y" { (yyval.subentry) = dmxConfigSubParam((yyvsp[0].param)); } -#line 1340 "parser.c" +#line 1353 "parser.c" break; case 18: /* OptionEntry: T_OPTION NameList Terminal */ #line 129 "parser.y" { (yyval.option) = dmxConfigCreateOption((yyvsp[-2].token), (yyvsp[-1].string), (yyvsp[0].token)); } -#line 1346 "parser.c" +#line 1359 "parser.c" break; case 19: /* ParamEntry: T_PARAM NameList Terminal */ #line 133 "parser.y" { (yyval.param) = dmxConfigCreateParam((yyvsp[-2].token), NULL, (yyvsp[-1].string), NULL, (yyvsp[0].token)); } -#line 1352 "parser.c" +#line 1365 "parser.c" break; case 20: /* ParamEntry: T_PARAM Open ParamList Close */ @@ -1356,179 +1369,179 @@ { (yyval.param) = dmxConfigCreateParam((yyvsp[-3].token), (yyvsp[-2].token), NULL, (yyvsp[0].token), NULL); (yyval.param)->next = (yyvsp[-1].param); } -#line 1360 "parser.c" +#line 1373 "parser.c" break; case 22: /* ParamList: ParamList Param */ #line 141 "parser.y" { APPEND(DMXConfigParamPtr,(yyvsp[-1].param),(yyvsp[0].param)); (yyval.param) = (yyvsp[-1].param); } -#line 1366 "parser.c" +#line 1379 "parser.c" break; case 23: /* Param: NameList Terminal */ #line 145 "parser.y" { (yyval.param) = dmxConfigCreateParam(NULL, NULL, (yyvsp[-1].string), NULL, (yyvsp[0].token)); } -#line 1372 "parser.c" +#line 1385 "parser.c" break; case 24: /* PartialDim: Dimension Offset */ #line 149 "parser.y" { (yyval.pdim) = dmxConfigCreatePartDim((yyvsp[-1].pair), (yyvsp[0].pair)); } -#line 1378 "parser.c" +#line 1391 "parser.c" break; case 25: /* PartialDim: Dimension */ #line 151 "parser.y" { (yyval.pdim) = dmxConfigCreatePartDim((yyvsp[0].pair), NULL); } -#line 1384 "parser.c" +#line 1397 "parser.c" break; case 26: /* PartialDim: Offset */ #line 153 "parser.y" { (yyval.pdim) = dmxConfigCreatePartDim(NULL, (yyvsp[0].pair)); } -#line 1390 "parser.c" +#line 1403 "parser.c" break; case 27: /* FullDim: PartialDim '/' PartialDim */ #line 157 "parser.y" { (yyval.fdim) = dmxConfigCreateFullDim((yyvsp[-2].pdim), (yyvsp[0].pdim)); } -#line 1396 "parser.c" +#line 1409 "parser.c" break; case 28: /* FullDim: '/' PartialDim */ #line 159 "parser.y" { (yyval.fdim) = dmxConfigCreateFullDim(NULL, (yyvsp[0].pdim)); } -#line 1402 "parser.c" +#line 1415 "parser.c" break; case 29: /* FullDim: PartialDim */ #line 161 "parser.y" { (yyval.fdim) = dmxConfigCreateFullDim((yyvsp[0].pdim), NULL); } -#line 1408 "parser.c" +#line 1421 "parser.c" break; case 30: /* DisplayEntry: Display Name FullDim Origin Terminal */ #line 165 "parser.y" { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-4].token), (yyvsp[-3].string), (yyvsp[-2].fdim), (yyvsp[-1].pair), (yyvsp[0].token)); } -#line 1414 "parser.c" +#line 1427 "parser.c" break; case 31: /* DisplayEntry: Display FullDim Origin Terminal */ #line 167 "parser.y" { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-3].token), NULL, (yyvsp[-2].fdim), (yyvsp[-1].pair), (yyvsp[0].token)); } -#line 1420 "parser.c" +#line 1433 "parser.c" break; case 32: /* DisplayEntry: Display Name Origin Terminal */ #line 169 "parser.y" { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-3].token), (yyvsp[-2].string), NULL, (yyvsp[-1].pair), (yyvsp[0].token)); } -#line 1426 "parser.c" +#line 1439 "parser.c" break; case 33: /* DisplayEntry: Display Name FullDim Terminal */ #line 172 "parser.y" { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-3].token), (yyvsp[-2].string), (yyvsp[-1].fdim), NULL, (yyvsp[0].token)); } -#line 1432 "parser.c" +#line 1445 "parser.c" break; case 34: /* DisplayEntry: Display FullDim Terminal */ #line 174 "parser.y" { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-2].token), NULL, (yyvsp[-1].fdim), NULL, (yyvsp[0].token)); } -#line 1438 "parser.c" +#line 1451 "parser.c" break; case 35: /* DisplayEntry: Display Name Terminal */ #line 176 "parser.y" { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-2].token), (yyvsp[-1].string), NULL, NULL, (yyvsp[0].token)); } -#line 1444 "parser.c" +#line 1457 "parser.c" break; case 36: /* DisplayEntry: Display Terminal */ #line 178 "parser.y" { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-1].token), NULL, NULL, NULL, (yyvsp[0].token)); } -#line 1450 "parser.c" +#line 1463 "parser.c" break; case 37: /* WallEntry: Wall Dimension Dimension NameList Terminal */ #line 182 "parser.y" { (yyval.wall) = dmxConfigCreateWall((yyvsp[-4].token), (yyvsp[-3].pair), (yyvsp[-2].pair), (yyvsp[-1].string), (yyvsp[0].token)); } -#line 1456 "parser.c" +#line 1469 "parser.c" break; case 38: /* WallEntry: Wall Dimension NameList Terminal */ #line 184 "parser.y" { (yyval.wall) = dmxConfigCreateWall((yyvsp[-3].token), (yyvsp[-2].pair), NULL, (yyvsp[-1].string), (yyvsp[0].token)); } -#line 1462 "parser.c" +#line 1475 "parser.c" break; case 39: /* WallEntry: Wall NameList Terminal */ #line 186 "parser.y" { (yyval.wall) = dmxConfigCreateWall((yyvsp[-2].token), NULL, NULL, (yyvsp[-1].string), (yyvsp[0].token)); } -#line 1468 "parser.c" +#line 1481 "parser.c" break; case 41: /* Display: T_DISPLAY T_COMMENT */ #line 190 "parser.y" { (yyval.token) = (yyvsp[-1].token); (yyval.token)->comment = (yyvsp[0].comment)->comment; } -#line 1474 "parser.c" +#line 1487 "parser.c" break; case 43: /* Name: T_STRING T_COMMENT */ #line 194 "parser.y" { (yyval.string) = (yyvsp[-1].string); (yyval.string)->comment = (yyvsp[0].comment)->comment; } -#line 1480 "parser.c" +#line 1493 "parser.c" break; case 45: /* Dimension: T_DIMENSION T_COMMENT */ #line 198 "parser.y" { (yyval.pair) = (yyvsp[-1].pair); (yyval.pair)->comment = (yyvsp[0].comment)->comment; } -#line 1486 "parser.c" +#line 1499 "parser.c" break; case 47: /* Offset: T_OFFSET T_COMMENT */ #line 202 "parser.y" { (yyval.pair) = (yyvsp[-1].pair); (yyval.pair)->comment = (yyvsp[0].comment)->comment; } -#line 1492 "parser.c" +#line 1505 "parser.c" break; case 49: /* Origin: T_ORIGIN T_COMMENT */ #line 206 "parser.y" { (yyval.pair) = (yyvsp[-1].pair); (yyval.pair)->comment = (yyvsp[0].comment)->comment; } -#line 1498 "parser.c" +#line 1511 "parser.c" break; case 51: /* Terminal: ';' T_COMMENT */ #line 210 "parser.y" { (yyval.token) = (yyvsp[-1].token); (yyval.token)->comment = (yyvsp[0].comment)->comment; } -#line 1504 "parser.c" +#line 1517 "parser.c" break; case 53: /* Open: '{' T_COMMENT */ #line 214 "parser.y" { (yyval.token) = (yyvsp[-1].token); (yyval.token)->comment = (yyvsp[0].comment)->comment; } -#line 1510 "parser.c" +#line 1523 "parser.c" break; case 55: /* Close: '}' T_COMMENT */ #line 218 "parser.y" { (yyval.token) = (yyvsp[-1].token); (yyval.token)->comment = (yyvsp[0].comment)->comment; } -#line 1516 "parser.c" +#line 1529 "parser.c" break; case 57: /* Wall: T_WALL T_COMMENT */ #line 222 "parser.y" { (yyval.token) = (yyvsp[-1].token); (yyval.token)->comment = (yyvsp[0].comment)->comment; } -#line 1522 "parser.c" +#line 1535 "parser.c" break; case 59: /* NameList: NameList Name */ #line 226 "parser.y" { APPEND(DMXConfigStringPtr, (yyvsp[-1].string), (yyvsp[0].string)); (yyval.string) = (yyvsp[-1].string); } -#line 1528 "parser.c" +#line 1541 "parser.c" break; -#line 1532 "parser.c" +#line 1545 "parser.c" default: break; } diff -Nru xorg-server-1.20.11/hw/dmx/config/parser.h xorg-server-1.20.13/hw/dmx/config/parser.h --- xorg-server-1.20.11/hw/dmx/config/parser.h 2021-04-13 14:12:40.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/config/parser.h 2021-07-29 18:48:49.000000000 +0000 @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 3.7.3. */ +/* A Bison parser, made by GNU Bison 3.7.6. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation, + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -69,6 +69,7 @@ typedef enum yytokentype yytoken_kind_t; #endif /* Token kinds. */ +#define YYEMPTY -2 #define YYEOF 0 #define YYerror 256 #define YYUNDEF 257 @@ -105,7 +106,7 @@ DMXConfigVirtualPtr virtual; DMXConfigEntryPtr entry; -#line 109 "parser.h" +#line 110 "parser.h" }; typedef union YYSTYPE YYSTYPE; diff -Nru xorg-server-1.20.11/hw/dmx/dmxextension.c xorg-server-1.20.13/hw/dmx/dmxextension.c --- xorg-server-1.20.11/hw/dmx/dmxextension.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/dmxextension.c 2021-07-29 18:48:14.000000000 +0000 @@ -68,9 +68,6 @@ * _any_ header files. */ extern FontPtr defaultFont; -/* Hack to get Present to build (present requires RandR) */ -RESTYPE RRCrtcType; - /** This routine provides information to the DMX protocol extension * about a particular screen. */ Bool diff -Nru xorg-server-1.20.11/hw/dmx/dmxinit.c xorg-server-1.20.13/hw/dmx/dmxinit.c --- xorg-server-1.20.11/hw/dmx/dmxinit.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/dmxinit.c 2021-07-29 18:48:14.000000000 +0000 @@ -109,8 +109,6 @@ Bool dmxGLXFinishSwap = FALSE; #endif -RESTYPE RRProviderType = 0; - Bool dmxIgnoreBadFontPaths = FALSE; Bool dmxAddRemoveScreens = FALSE; diff -Nru xorg-server-1.20.11/hw/dmx/doc/Makefile.in xorg-server-1.20.13/hw/dmx/doc/Makefile.in --- xorg-server-1.20.11/hw/dmx/doc/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/doc/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/dmx/doxygen/Makefile.in xorg-server-1.20.13/hw/dmx/doxygen/Makefile.in --- xorg-server-1.20.11/hw/dmx/doxygen/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/doxygen/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/dmx/examples/Makefile.in xorg-server-1.20.13/hw/dmx/examples/Makefile.in --- xorg-server-1.20.11/hw/dmx/examples/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/examples/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/dmx/glxProxy/Makefile.in xorg-server-1.20.13/hw/dmx/glxProxy/Makefile.in --- xorg-server-1.20.11/hw/dmx/glxProxy/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/glxProxy/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/dmx/input/Makefile.in xorg-server-1.20.13/hw/dmx/input/Makefile.in --- xorg-server-1.20.11/hw/dmx/input/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/input/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/dmx/Makefile.in xorg-server-1.20.13/hw/dmx/Makefile.in --- xorg-server-1.20.11/hw/dmx/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/dmx/man/Makefile.in xorg-server-1.20.13/hw/dmx/man/Makefile.in --- xorg-server-1.20.11/hw/dmx/man/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/man/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/kdrive/ephyr/Makefile.in xorg-server-1.20.13/hw/kdrive/ephyr/Makefile.in --- xorg-server-1.20.11/hw/kdrive/ephyr/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/kdrive/ephyr/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/kdrive/ephyr/man/Makefile.in xorg-server-1.20.13/hw/kdrive/ephyr/man/Makefile.in --- xorg-server-1.20.11/hw/kdrive/ephyr/man/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/kdrive/ephyr/man/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/kdrive/Makefile.in xorg-server-1.20.13/hw/kdrive/Makefile.in --- xorg-server-1.20.11/hw/kdrive/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/kdrive/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/kdrive/src/Makefile.in xorg-server-1.20.13/hw/kdrive/src/Makefile.in --- xorg-server-1.20.11/hw/kdrive/src/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/kdrive/src/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/Makefile.in xorg-server-1.20.13/hw/Makefile.in --- xorg-server-1.20.11/hw/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/vfb/Makefile.in xorg-server-1.20.13/hw/vfb/Makefile.in --- xorg-server-1.20.11/hw/vfb/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/vfb/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/vfb/man/Makefile.in xorg-server-1.20.13/hw/vfb/man/Makefile.in --- xorg-server-1.20.11/hw/vfb/man/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/vfb/man/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/common/Makefile.in xorg-server-1.20.13/hw/xfree86/common/Makefile.in --- xorg-server-1.20.11/hw/xfree86/common/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/common/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. @@ -930,7 +930,8 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -1093,7 +1094,7 @@ uninstall-am: uninstall-sdkHEADERS -.MAKE: all check install install-am install-strip +.MAKE: all check install install-am install-exec install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-generic clean-libtool clean-noinstLTLIBRARIES \ diff -Nru xorg-server-1.20.11/hw/xfree86/common/xf86Bus.c xorg-server-1.20.13/hw/xfree86/common/xf86Bus.c --- xorg-server-1.20.11/hw/xfree86/common/xf86Bus.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/common/xf86Bus.c 2021-07-29 18:48:14.000000000 +0000 @@ -525,8 +525,8 @@ for (i = 0; i < xf86Entities[entityIndex]->numInstances; i++) if (xf86Entities[entityIndex]->devices[i]->screen == instance) - break; - return xf86Entities[entityIndex]->devices[i]; + return xf86Entities[entityIndex]->devices[i]; + return NULL; } /* diff -Nru xorg-server-1.20.11/hw/xfree86/common/xf86Config.c xorg-server-1.20.13/hw/xfree86/common/xf86Config.c --- xorg-server-1.20.11/hw/xfree86/common/xf86Config.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/common/xf86Config.c 2021-07-29 18:48:14.000000000 +0000 @@ -1760,31 +1760,30 @@ count++; dispptr = (XF86ConfDisplayPtr) dispptr->list.next; } - screenp->displays = xnfallocarray(count, sizeof(DispRec)); + screenp->displays = xnfallocarray(count, sizeof(DispPtr)); screenp->numdisplays = count; - /* Fill in the default Virtual size, if any */ - if (conf_screen->scrn_virtualX && conf_screen->scrn_virtualY) { - for (count = 0, dispptr = conf_screen->scrn_display_lst; - dispptr; - dispptr = (XF86ConfDisplayPtr) dispptr->list.next, count++) { - screenp->displays[count].virtualX = conf_screen->scrn_virtualX; - screenp->displays[count].virtualY = conf_screen->scrn_virtualY; + for (count = 0, dispptr = conf_screen->scrn_display_lst; + dispptr; + dispptr = (XF86ConfDisplayPtr) dispptr->list.next, count++) { + + /* Allocate individual Display records */ + screenp->displays[count] = xnfcalloc(1, sizeof(DispRec)); + + /* Fill in the default Virtual size, if any */ + if (conf_screen->scrn_virtualX && conf_screen->scrn_virtualY) { + screenp->displays[count]->virtualX = conf_screen->scrn_virtualX; + screenp->displays[count]->virtualY = conf_screen->scrn_virtualY; } - } - /* Now do the per-Display Virtual sizes */ - count = 0; - dispptr = conf_screen->scrn_display_lst; - while (dispptr) { - configDisplay(&(screenp->displays[count]), dispptr); - count++; - dispptr = (XF86ConfDisplayPtr) dispptr->list.next; + /* Now do the per-Display Virtual sizes */ + configDisplay(screenp->displays[count], dispptr); } /* * figure out how many videoadaptor references there are and fill them in */ + count = 0; conf_adaptor = conf_screen->scrn_adaptor_lst; while (conf_adaptor) { count++; diff -Nru xorg-server-1.20.11/hw/xfree86/common/xf86Helper.c xorg-server-1.20.13/hw/xfree86/common/xf86Helper.c --- xorg-server-1.20.11/hw/xfree86/common/xf86Helper.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/common/xf86Helper.c 2021-07-29 18:48:14.000000000 +0000 @@ -525,8 +525,8 @@ * Find the Display subsection matching the depth/fbbpp and initialise * scrp->display with it. */ - for (i = 0, disp = scrp->confScreen->displays; - i < scrp->confScreen->numdisplays; i++, disp++) { + for (i = 0; i < scrp->confScreen->numdisplays; i++) { + disp = scrp->confScreen->displays[i]; if ((disp->depth == scrp->depth && disp->fbbpp == scrp->bitsPerPixel) || (disp->depth == scrp->depth && disp->fbbpp <= 0) || (disp->fbbpp == scrp->bitsPerPixel && disp->depth <= 0)) { @@ -540,8 +540,8 @@ * depth or fbbpp specified. */ if (i == scrp->confScreen->numdisplays) { - for (i = 0, disp = scrp->confScreen->displays; - i < scrp->confScreen->numdisplays; i++, disp++) { + for (i = 0; i < scrp->confScreen->numdisplays; i++) { + disp = scrp->confScreen->displays[i]; if (disp->depth <= 0 && disp->fbbpp <= 0) { scrp->display = disp; break; @@ -556,24 +556,25 @@ scrp->confScreen->numdisplays++; scrp->confScreen->displays = xnfreallocarray(scrp->confScreen->displays, - scrp->confScreen->numdisplays, sizeof(DispRec)); + scrp->confScreen->numdisplays, sizeof(DispPtr)); xf86DrvMsg(scrp->scrnIndex, X_INFO, "Creating default Display subsection in Screen section\n" "\t\"%s\" for depth/fbbpp %d/%d\n", scrp->confScreen->id, scrp->depth, scrp->bitsPerPixel); - memset(&scrp->confScreen->displays[i], 0, sizeof(DispRec)); - scrp->confScreen->displays[i].blackColour.red = -1; - scrp->confScreen->displays[i].blackColour.green = -1; - scrp->confScreen->displays[i].blackColour.blue = -1; - scrp->confScreen->displays[i].whiteColour.red = -1; - scrp->confScreen->displays[i].whiteColour.green = -1; - scrp->confScreen->displays[i].whiteColour.blue = -1; - scrp->confScreen->displays[i].defaultVisual = -1; - scrp->confScreen->displays[i].modes = xnfalloc(sizeof(char *)); - scrp->confScreen->displays[i].modes[0] = NULL; - scrp->confScreen->displays[i].depth = depth; - scrp->confScreen->displays[i].fbbpp = fbbpp; - scrp->display = &scrp->confScreen->displays[i]; + scrp->confScreen->displays[i] = xnfcalloc(1, sizeof(DispRec)); + memset(scrp->confScreen->displays[i], 0, sizeof(DispRec)); + scrp->confScreen->displays[i]->blackColour.red = -1; + scrp->confScreen->displays[i]->blackColour.green = -1; + scrp->confScreen->displays[i]->blackColour.blue = -1; + scrp->confScreen->displays[i]->whiteColour.red = -1; + scrp->confScreen->displays[i]->whiteColour.green = -1; + scrp->confScreen->displays[i]->whiteColour.blue = -1; + scrp->confScreen->displays[i]->defaultVisual = -1; + scrp->confScreen->displays[i]->modes = xnfalloc(sizeof(char *)); + scrp->confScreen->displays[i]->modes[0] = NULL; + scrp->confScreen->displays[i]->depth = depth; + scrp->confScreen->displays[i]->fbbpp = fbbpp; + scrp->display = scrp->confScreen->displays[i]; } /* diff -Nru xorg-server-1.20.11/hw/xfree86/common/xf86str.h xorg-server-1.20.13/hw/xfree86/common/xf86str.h --- xorg-server-1.20.11/hw/xfree86/common/xf86str.h 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/common/xf86str.h 2021-07-29 18:48:14.000000000 +0000 @@ -349,7 +349,7 @@ MonPtr monitor; GDevPtr device; int numdisplays; - DispPtr displays; + DispPtr *displays; int numxvadaptors; confXvAdaptorPtr xvadaptors; void *options; diff -Nru xorg-server-1.20.11/hw/xfree86/ddc/Makefile.in xorg-server-1.20.13/hw/xfree86/ddc/Makefile.in --- xorg-server-1.20.11/hw/xfree86/ddc/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/ddc/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/dixmods/Makefile.in xorg-server-1.20.13/hw/xfree86/dixmods/Makefile.in --- xorg-server-1.20.11/hw/xfree86/dixmods/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/dixmods/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/doc/Makefile.in xorg-server-1.20.13/hw/xfree86/doc/Makefile.in --- xorg-server-1.20.11/hw/xfree86/doc/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/doc/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/dri/Makefile.in xorg-server-1.20.13/hw/xfree86/dri/Makefile.in --- xorg-server-1.20.11/hw/xfree86/dri/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/dri/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/dri2/Makefile.in xorg-server-1.20.13/hw/xfree86/dri2/Makefile.in --- xorg-server-1.20.11/hw/xfree86/dri2/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/dri2/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/dri2/pci_ids/Makefile.in xorg-server-1.20.13/hw/xfree86/dri2/pci_ids/Makefile.in --- xorg-server-1.20.11/hw/xfree86/dri2/pci_ids/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/dri2/pci_ids/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/drivers/Makefile.in xorg-server-1.20.13/hw/xfree86/drivers/Makefile.in --- xorg-server-1.20.11/hw/xfree86/drivers/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/drivers/modesetting/dri2.c xorg-server-1.20.13/hw/xfree86/drivers/modesetting/dri2.c --- xorg-server-1.20.11/hw/xfree86/drivers/modesetting/dri2.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/modesetting/dri2.c 2021-07-29 18:48:14.000000000 +0000 @@ -549,7 +549,7 @@ return FALSE; #endif - if (ms_crtc_on(config->crtc[i])) + if (xf86_crtc_on(config->crtc[i])) num_crtcs_on++; } diff -Nru xorg-server-1.20.11/hw/xfree86/drivers/modesetting/driver.c xorg-server-1.20.13/hw/xfree86/drivers/modesetting/driver.c --- xorg-server-1.20.11/hw/xfree86/drivers/modesetting/driver.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/modesetting/driver.c 2021-07-29 18:48:14.000000000 +0000 @@ -1747,28 +1747,41 @@ "Failed to initialize the DRI2 extension.\n"); } - if (!(ms->drmmode.present_enable = ms_present_screen_init(pScreen))) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Failed to initialize the Present extension.\n"); - } /* enable reverse prime if we are a GPU screen, and accelerated, and not - * i915. i915 is happy scanning out from sysmem. */ + * i915, evdi or udl. i915 is happy scanning out from sysmem. + * evdi and udl are virtual drivers scanning out from sysmem + * backed dumb buffers. + */ if (pScreen->isGPU) { drmVersionPtr version; /* enable if we are an accelerated GPU screen */ ms->drmmode.reverse_prime_offload_mode = TRUE; - /* disable if we detect i915 */ if ((version = drmGetVersion(ms->drmmode.fd))) { if (!strncmp("i915", version->name, version->name_len)) { ms->drmmode.reverse_prime_offload_mode = FALSE; } + if (!strncmp("evdi", version->name, version->name_len)) { + ms->drmmode.reverse_prime_offload_mode = FALSE; + } + if (!strncmp("udl", version->name, version->name_len)) { + ms->drmmode.reverse_prime_offload_mode = FALSE; + } + if (!ms->drmmode.reverse_prime_offload_mode) { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Disable reverse prime offload mode for %s.\n", version->name); + } drmFreeVersion(version); } } } #endif + if (!(ms->drmmode.present_enable = ms_present_screen_init(pScreen))) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Failed to initialize the Present extension.\n"); + } + pScrn->vtSema = TRUE; diff -Nru xorg-server-1.20.11/hw/xfree86/drivers/modesetting/driver.h xorg-server-1.20.13/hw/xfree86/drivers/modesetting/driver.h --- xorg-server-1.20.11/hw/xfree86/drivers/modesetting/driver.h 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/modesetting/driver.h 2021-07-29 18:48:14.000000000 +0000 @@ -146,7 +146,7 @@ void *match_data); void ms_drm_abort_seq(ScrnInfoPtr scrn, uint32_t seq); -Bool ms_crtc_on(xf86CrtcPtr crtc); +Bool xf86_crtc_on(xf86CrtcPtr crtc); xf86CrtcPtr ms_dri2_crtc_covering_drawable(DrawablePtr pDraw); RRCrtcPtr ms_randr_crtc_covering_drawable(DrawablePtr pDraw); diff -Nru xorg-server-1.20.11/hw/xfree86/drivers/modesetting/drmmode_display.c xorg-server-1.20.13/hw/xfree86/drivers/modesetting/drmmode_display.c --- xorg-server-1.20.11/hw/xfree86/drivers/modesetting/drmmode_display.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/modesetting/drmmode_display.c 2021-07-29 18:48:14.000000000 +0000 @@ -2997,9 +2997,9 @@ output->driver_private = drmmode_output; output->non_desktop = nonDesktop; - output->possible_crtcs = 0x7f; + output->possible_crtcs = 0; for (i = 0; i < koutput->count_encoders; i++) { - output->possible_crtcs &= kencoders[i]->possible_crtcs >> crtcshift; + output->possible_crtcs |= (kencoders[i]->possible_crtcs >> crtcshift) & 0x7f; } /* work out the possible clones later */ output->possible_clones = 0; @@ -3021,8 +3021,14 @@ "DPMS"); } - if (dynamic) + if (dynamic) { output->randr_output = RROutputCreate(xf86ScrnToScreen(pScrn), output->name, strlen(output->name), output); + if (output->randr_output) { + drmmode_output_create_resources(output); + RRPostPendingProperties(output->randr_output); + } + } + return 1; out_free_encoders: diff -Nru xorg-server-1.20.11/hw/xfree86/drivers/modesetting/Makefile.in xorg-server-1.20.13/hw/xfree86/drivers/modesetting/Makefile.in --- xorg-server-1.20.11/hw/xfree86/drivers/modesetting/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/modesetting/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/drivers/modesetting/pageflip.c xorg-server-1.20.13/hw/xfree86/drivers/modesetting/pageflip.c --- xorg-server-1.20.11/hw/xfree86/drivers/modesetting/pageflip.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/modesetting/pageflip.c 2021-07-29 18:48:14.000000000 +0000 @@ -301,7 +301,7 @@ for (i = 0; i < config->num_crtc; i++) { xf86CrtcPtr crtc = config->crtc[i]; - if (!ms_crtc_on(crtc)) + if (!xf86_crtc_on(crtc)) continue; if (!queue_flip_on_crtc(screen, crtc, flipdata, diff -Nru xorg-server-1.20.11/hw/xfree86/drivers/modesetting/present.c xorg-server-1.20.13/hw/xfree86/drivers/modesetting/present.c --- xorg-server-1.20.11/hw/xfree86/drivers/modesetting/present.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/modesetting/present.c 2021-07-29 18:48:14.000000000 +0000 @@ -244,7 +244,7 @@ if (drmmode_crtc->rotate_bo.gbm) return FALSE; - if (ms_crtc_on(config->crtc[i])) + if (xf86_crtc_on(config->crtc[i])) num_crtcs_on++; } @@ -257,6 +257,9 @@ pixmap->devKind != drmmode_bo_get_pitch(&ms->drmmode.front_bo)) return FALSE; + if (!ms->drmmode.glamor) + return FALSE; + #ifdef GBM_BO_WITH_MODIFIERS /* Check if buffer format/modifier is supported by all active CRTCs */ gbm = glamor_gbm_bo_from_pixmap(screen, pixmap); diff -Nru xorg-server-1.20.11/hw/xfree86/drivers/modesetting/vblank.c xorg-server-1.20.13/hw/xfree86/drivers/modesetting/vblank.c --- xorg-server-1.20.11/hw/xfree86/drivers/modesetting/vblank.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/modesetting/vblank.c 2021-07-29 18:48:14.000000000 +0000 @@ -49,7 +49,7 @@ static struct xorg_list ms_drm_queue; static uint32_t ms_drm_seq; -static void ms_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b) +static void box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b) { dest->x1 = a->x1 > b->x1 ? a->x1 : b->x1; dest->x2 = a->x2 < b->x2 ? a->x2 : b->x2; @@ -64,20 +64,7 @@ dest->x1 = dest->x2 = dest->y1 = dest->y2 = 0; } -static void ms_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box) -{ - if (crtc->enabled) { - crtc_box->x1 = crtc->x; - crtc_box->x2 = - crtc->x + xf86ModeWidth(&crtc->mode, crtc->rotation); - crtc_box->y1 = crtc->y; - crtc_box->y2 = - crtc->y + xf86ModeHeight(&crtc->mode, crtc->rotation); - } else - crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0; -} - -static void ms_randr_crtc_box(RRCrtcPtr crtc, BoxPtr crtc_box) +static void rr_crtc_box(RRCrtcPtr crtc, BoxPtr crtc_box) { if (crtc->mode) { crtc_box->x1 = crtc->x; @@ -99,133 +86,44 @@ crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0; } -static int ms_box_area(BoxPtr box) +static int box_area(BoxPtr box) { return (int)(box->x2 - box->x1) * (int)(box->y2 - box->y1); } +static Bool rr_crtc_on(RRCrtcPtr crtc, Bool crtc_is_xf86_hint) +{ + if (!crtc) { + return FALSE; + } + if (crtc_is_xf86_hint && crtc->devPrivate) { + return xf86_crtc_on(crtc->devPrivate); + } else { + return !!crtc->mode; + } +} + Bool -ms_crtc_on(xf86CrtcPtr crtc) +xf86_crtc_on(xf86CrtcPtr crtc) { drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; return crtc->enabled && drmmode_crtc->dpms_mode == DPMSModeOn; } -/* - * Return the first output which is connected to an active CRTC on this screen. - * - * RRFirstOutput() will return an output from a slave screen if it is primary, - * which is not the behavior that ms_covering_crtc() wants. - */ - -static RROutputPtr ms_first_output(ScreenPtr pScreen) -{ - rrScrPriv(pScreen); - RROutputPtr output; - int i, j; - - if (!pScrPriv) - return NULL; - - if (pScrPriv->primaryOutput && pScrPriv->primaryOutput->crtc && - (pScrPriv->primaryOutput->pScreen == pScreen)) { - return pScrPriv->primaryOutput; - } - - for (i = 0; i < pScrPriv->numCrtcs; i++) { - RRCrtcPtr crtc = pScrPriv->crtcs[i]; - - for (j = 0; j < pScrPriv->numOutputs; j++) { - output = pScrPriv->outputs[j]; - if (output->crtc == crtc) - return output; - } - } - return NULL; -} /* * Return the crtc covering 'box'. If two crtcs cover a portion of * 'box', then prefer the crtc with greater coverage. */ - -static xf86CrtcPtr -ms_covering_xf86_crtc(ScreenPtr pScreen, BoxPtr box, Bool screen_is_ms) -{ - ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen); - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); - xf86CrtcPtr crtc, best_crtc; - int coverage, best_coverage; - int c; - BoxRec crtc_box, cover_box; - Bool crtc_on; - - best_crtc = NULL; - best_coverage = 0; - - if (!xf86_config) - return NULL; - - for (c = 0; c < xf86_config->num_crtc; c++) { - crtc = xf86_config->crtc[c]; - - if (screen_is_ms) - crtc_on = ms_crtc_on(crtc); - else - crtc_on = crtc->enabled; - - /* If the CRTC is off, treat it as not covering */ - if (!crtc_on) - continue; - - ms_crtc_box(crtc, &crtc_box); - ms_box_intersect(&cover_box, &crtc_box, box); - coverage = ms_box_area(&cover_box); - if (coverage > best_coverage) { - best_crtc = crtc; - best_coverage = coverage; - } - } - - /* Fallback to primary crtc for drawable's on slave outputs */ - if (best_crtc == NULL && !pScreen->isGPU) { - RROutputPtr primary_output = NULL; - ScreenPtr slave; - - if (dixPrivateKeyRegistered(rrPrivKey)) - primary_output = ms_first_output(scrn->pScreen); - if (!primary_output || !primary_output->crtc) - return NULL; - - crtc = primary_output->crtc->devPrivate; - if (!ms_crtc_on(crtc)) - return NULL; - - xorg_list_for_each_entry(slave, &pScreen->slave_list, slave_head) { - if (!slave->is_output_slave) - continue; - - if (ms_covering_xf86_crtc(slave, box, FALSE)) { - /* The drawable is on a slave output, return primary crtc */ - return crtc; - } - } - } - - return best_crtc; -} - static RRCrtcPtr -ms_covering_randr_crtc(ScreenPtr pScreen, BoxPtr box, Bool screen_is_ms) +rr_crtc_covering_box(ScreenPtr pScreen, BoxPtr box, Bool screen_is_xf86_hint) { - ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen); rrScrPrivPtr pScrPriv; RRCrtcPtr crtc, best_crtc; int coverage, best_coverage; int c; BoxRec crtc_box, cover_box; - Bool crtc_on; best_crtc = NULL; best_coverage = 0; @@ -241,57 +139,47 @@ for (c = 0; c < pScrPriv->numCrtcs; c++) { crtc = pScrPriv->crtcs[c]; - if (screen_is_ms) { - crtc_on = ms_crtc_on((xf86CrtcPtr) crtc->devPrivate); - } else { - crtc_on = !!crtc->mode; - } - /* If the CRTC is off, treat it as not covering */ - if (!crtc_on) + if (!rr_crtc_on(crtc, screen_is_xf86_hint)) continue; - ms_randr_crtc_box(crtc, &crtc_box); - ms_box_intersect(&cover_box, &crtc_box, box); - coverage = ms_box_area(&cover_box); + rr_crtc_box(crtc, &crtc_box); + box_intersect(&cover_box, &crtc_box, box); + coverage = box_area(&cover_box); if (coverage > best_coverage) { best_crtc = crtc; best_coverage = coverage; } } - /* Fallback to primary crtc for drawable's on slave outputs */ - if (best_crtc == NULL && !pScreen->isGPU) { - RROutputPtr primary_output = NULL; - ScreenPtr slave; + return best_crtc; +} - if (dixPrivateKeyRegistered(rrPrivKey)) - primary_output = ms_first_output(scrn->pScreen); - if (!primary_output || !primary_output->crtc) - return NULL; - - crtc = primary_output->crtc; - if (!ms_crtc_on((xf86CrtcPtr) crtc->devPrivate)) - return NULL; +static RRCrtcPtr +rr_crtc_covering_box_on_slave(ScreenPtr pScreen, BoxPtr box) +{ + if (!pScreen->isGPU) { + ScreenPtr slave; + RRCrtcPtr crtc = NULL; xorg_list_for_each_entry(slave, &pScreen->slave_list, slave_head) { if (!slave->is_output_slave) continue; - if (ms_covering_randr_crtc(slave, box, FALSE)) { - /* The drawable is on a slave output, return primary crtc */ + crtc = rr_crtc_covering_box(slave, box, FALSE); + if (crtc) return crtc; - } } } - return best_crtc; + return NULL; } xf86CrtcPtr ms_dri2_crtc_covering_drawable(DrawablePtr pDraw) { ScreenPtr pScreen = pDraw->pScreen; + RRCrtcPtr crtc = NULL; BoxRec box; box.x1 = pDraw->x; @@ -299,13 +187,18 @@ box.x2 = box.x1 + pDraw->width; box.y2 = box.y1 + pDraw->height; - return ms_covering_xf86_crtc(pScreen, &box, TRUE); + crtc = rr_crtc_covering_box(pScreen, &box, TRUE); + if (crtc) { + return crtc->devPrivate; + } + return NULL; } RRCrtcPtr ms_randr_crtc_covering_drawable(DrawablePtr pDraw) { ScreenPtr pScreen = pDraw->pScreen; + RRCrtcPtr crtc = NULL; BoxRec box; box.x1 = pDraw->x; @@ -313,7 +206,11 @@ box.x2 = box.x1 + pDraw->width; box.y2 = box.y1 + pDraw->height; - return ms_covering_randr_crtc(pScreen, &box, TRUE); + crtc = rr_crtc_covering_box(pScreen, &box, TRUE); + if (!crtc) { + crtc = rr_crtc_covering_box_on_slave(pScreen, &box); + } + return crtc; } static Bool diff -Nru xorg-server-1.20.11/hw/xfree86/exa/Makefile.in xorg-server-1.20.13/hw/xfree86/exa/Makefile.in --- xorg-server-1.20.11/hw/xfree86/exa/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/exa/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/exa/man/Makefile.in xorg-server-1.20.13/hw/xfree86/exa/man/Makefile.in --- xorg-server-1.20.11/hw/xfree86/exa/man/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/exa/man/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/fbdevhw/Makefile.in xorg-server-1.20.13/hw/xfree86/fbdevhw/Makefile.in --- xorg-server-1.20.11/hw/xfree86/fbdevhw/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/fbdevhw/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/fbdevhw/man/Makefile.in xorg-server-1.20.13/hw/xfree86/fbdevhw/man/Makefile.in --- xorg-server-1.20.11/hw/xfree86/fbdevhw/man/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/fbdevhw/man/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/glamor_egl/Makefile.in xorg-server-1.20.13/hw/xfree86/glamor_egl/Makefile.in --- xorg-server-1.20.11/hw/xfree86/glamor_egl/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/glamor_egl/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/i2c/Makefile.in xorg-server-1.20.13/hw/xfree86/i2c/Makefile.in --- xorg-server-1.20.11/hw/xfree86/i2c/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/i2c/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/int10/Makefile.in xorg-server-1.20.13/hw/xfree86/int10/Makefile.in --- xorg-server-1.20.11/hw/xfree86/int10/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/int10/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/loader/Makefile.in xorg-server-1.20.13/hw/xfree86/loader/Makefile.in --- xorg-server-1.20.11/hw/xfree86/loader/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/loader/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/Makefile.in xorg-server-1.20.13/hw/xfree86/Makefile.in --- xorg-server-1.20.11/hw/xfree86/Makefile.in 2021-04-13 14:11:58.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. @@ -1028,7 +1028,8 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive -install-exec: install-exec-recursive +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -1137,7 +1138,7 @@ @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: $(am__recursive_targets) all check install install-am \ - install-exec-am install-strip uninstall-am + install-exec install-exec-am install-strip uninstall-am .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ am--depfiles check check-am clean clean-binPROGRAMS \ diff -Nru xorg-server-1.20.11/hw/xfree86/man/Makefile.in xorg-server-1.20.13/hw/xfree86/man/Makefile.in --- xorg-server-1.20.11/hw/xfree86/man/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/man/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/modes/Makefile.in xorg-server-1.20.13/hw/xfree86/modes/Makefile.in --- xorg-server-1.20.11/hw/xfree86/modes/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/modes/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/os-support/bsd/Makefile.in xorg-server-1.20.13/hw/xfree86/os-support/bsd/Makefile.in --- xorg-server-1.20.11/hw/xfree86/os-support/bsd/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/os-support/bsd/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/os-support/bus/Makefile.in xorg-server-1.20.13/hw/xfree86/os-support/bus/Makefile.in --- xorg-server-1.20.11/hw/xfree86/os-support/bus/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/os-support/bus/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/os-support/hurd/Makefile.in xorg-server-1.20.13/hw/xfree86/os-support/hurd/Makefile.in --- xorg-server-1.20.11/hw/xfree86/os-support/hurd/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/os-support/hurd/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/os-support/linux/Makefile.in xorg-server-1.20.13/hw/xfree86/os-support/linux/Makefile.in --- xorg-server-1.20.11/hw/xfree86/os-support/linux/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/os-support/linux/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/os-support/Makefile.in xorg-server-1.20.13/hw/xfree86/os-support/Makefile.in --- xorg-server-1.20.11/hw/xfree86/os-support/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/os-support/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/os-support/misc/Makefile.in xorg-server-1.20.13/hw/xfree86/os-support/misc/Makefile.in --- xorg-server-1.20.11/hw/xfree86/os-support/misc/Makefile.in 2021-04-13 14:11:59.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/os-support/misc/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/os-support/solaris/Makefile.in xorg-server-1.20.13/hw/xfree86/os-support/solaris/Makefile.in --- xorg-server-1.20.11/hw/xfree86/os-support/solaris/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/os-support/solaris/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/os-support/stub/Makefile.in xorg-server-1.20.13/hw/xfree86/os-support/stub/Makefile.in --- xorg-server-1.20.11/hw/xfree86/os-support/stub/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/os-support/stub/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/parser/Makefile.in xorg-server-1.20.13/hw/xfree86/parser/Makefile.in --- xorg-server-1.20.11/hw/xfree86/parser/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/parser/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/ramdac/Makefile.in xorg-server-1.20.13/hw/xfree86/ramdac/Makefile.in --- xorg-server-1.20.11/hw/xfree86/ramdac/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/ramdac/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/shadowfb/Makefile.in xorg-server-1.20.13/hw/xfree86/shadowfb/Makefile.in --- xorg-server-1.20.11/hw/xfree86/shadowfb/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/shadowfb/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/utils/cvt/Makefile.in xorg-server-1.20.13/hw/xfree86/utils/cvt/Makefile.in --- xorg-server-1.20.11/hw/xfree86/utils/cvt/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/utils/cvt/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/utils/gtf/Makefile.in xorg-server-1.20.13/hw/xfree86/utils/gtf/Makefile.in --- xorg-server-1.20.11/hw/xfree86/utils/gtf/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/utils/gtf/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/utils/Makefile.in xorg-server-1.20.13/hw/xfree86/utils/Makefile.in --- xorg-server-1.20.11/hw/xfree86/utils/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/utils/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/utils/man/Makefile.in xorg-server-1.20.13/hw/xfree86/utils/man/Makefile.in --- xorg-server-1.20.11/hw/xfree86/utils/man/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/utils/man/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/vbe/Makefile.in xorg-server-1.20.13/hw/xfree86/vbe/Makefile.in --- xorg-server-1.20.11/hw/xfree86/vbe/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/vbe/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/vgahw/Makefile.in xorg-server-1.20.13/hw/xfree86/vgahw/Makefile.in --- xorg-server-1.20.11/hw/xfree86/vgahw/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/vgahw/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/x86emu/Makefile.in xorg-server-1.20.13/hw/xfree86/x86emu/Makefile.in --- xorg-server-1.20.11/hw/xfree86/x86emu/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/x86emu/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xfree86/xkb/Makefile.in xorg-server-1.20.13/hw/xfree86/xkb/Makefile.in --- xorg-server-1.20.11/hw/xfree86/xkb/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/xkb/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xnest/Makefile.in xorg-server-1.20.13/hw/xnest/Makefile.in --- xorg-server-1.20.11/hw/xnest/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xnest/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xnest/man/Makefile.in xorg-server-1.20.13/hw/xnest/man/Makefile.in --- xorg-server-1.20.11/hw/xnest/man/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xnest/man/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xquartz/bundle/Makefile.in xorg-server-1.20.13/hw/xquartz/bundle/Makefile.in --- xorg-server-1.20.11/hw/xquartz/bundle/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xquartz/GL/Makefile.in xorg-server-1.20.13/hw/xquartz/GL/Makefile.in --- xorg-server-1.20.11/hw/xquartz/GL/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/GL/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xquartz/mach-startup/Makefile.in xorg-server-1.20.13/hw/xquartz/mach-startup/Makefile.in --- xorg-server-1.20.11/hw/xquartz/mach-startup/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/mach-startup/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. @@ -927,7 +927,8 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -1039,7 +1040,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-x11appPROGRAMS -.MAKE: all check install install-am install-strip +.MAKE: all check install install-am install-exec install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool \ diff -Nru xorg-server-1.20.11/hw/xquartz/Makefile.in xorg-server-1.20.13/hw/xquartz/Makefile.in --- xorg-server-1.20.11/hw/xquartz/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xquartz/man/Makefile.in xorg-server-1.20.13/hw/xquartz/man/Makefile.in --- xorg-server-1.20.11/hw/xquartz/man/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/man/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xquartz/pbproxy/Makefile.in xorg-server-1.20.13/hw/xquartz/pbproxy/Makefile.in --- xorg-server-1.20.11/hw/xquartz/pbproxy/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/pbproxy/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xquartz/X11Application.m xorg-server-1.20.13/hw/xquartz/X11Application.m --- xorg-server-1.20.11/hw/xquartz/X11Application.m 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/X11Application.m 2021-07-29 18:48:14.000000000 +0000 @@ -77,6 +77,10 @@ #endif #endif +#ifndef APPKIT_APPFLAGS_HACK +#define APPKIT_APPFLAGS_HACK 1 +#endif + extern Bool noTestExtensions; extern Bool noRenderExtension; @@ -102,6 +106,50 @@ #define ALL_KEY_MASKS (NSShiftKeyMask | NSControlKeyMask | \ NSAlternateKeyMask | NSCommandKeyMask) +#if APPKIT_APPFLAGS_HACK && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500 +// This was removed from the SDK in 10.15 +@interface NSApplication () { +@protected + /* All instance variables are private */ + short _running; + struct __appFlags { + unsigned int _hidden:1; + unsigned int _appleEventActivationInProgress:1; + unsigned int _active:1; + unsigned int _hasBeenRun:1; + unsigned int _doingUnhide:1; + unsigned int _delegateReturnsValidRequestor:1; + unsigned int _deactPending:1; + unsigned int _invalidState:1; + unsigned int _invalidEvent:1; + unsigned int _postedWindowsNeedUpdateNote:1; + unsigned int _wantsToActivate:1; + unsigned int _doingHide:1; + unsigned int _dontSendShouldTerminate:1; + unsigned int _ignoresFullScreen:1; + unsigned int _finishedLaunching:1; + unsigned int _hasEventDelegate:1; + unsigned int _appTerminating:1; + unsigned int _didNSOpenOrPrint:1; + unsigned int _inDealloc:1; + unsigned int _pendingDidFinish:1; + unsigned int _hasKeyFocus:1; + unsigned int _panelsNonactivating:1; + unsigned int _hiddenOnLaunch:1; + unsigned int _openStatus:2; + unsigned int _batchOrdering:1; + unsigned int _waitingForTerminationReply:1; + unsigned int _unused:1; + unsigned int _enumeratingMemoryPressureHandlers:1; + unsigned int _didTryRestoringPersistentState:1; + unsigned int _windowDragging:1; + unsigned int _mightBeSwitching:1; + } _appFlags; + id _mainMenu; +} +@end +#endif + @interface NSApplication (Internal) - (void)_setKeyWindow:(id)window; - (void)_setMainWindow:(id)window; @@ -375,10 +423,12 @@ BOOL order_all_windows = YES, workspaces, ok; for_appkit = NO; +#if APPKIT_APPFLAGS_HACK /* FIXME: This is a hack to avoid passing the event to AppKit which * would result in it raising one of its windows. */ _appFlags._active = YES; +#endif [self set_front_process:nil]; diff -Nru xorg-server-1.20.11/hw/xquartz/xpr/Makefile.in xorg-server-1.20.13/hw/xquartz/xpr/Makefile.in --- xorg-server-1.20.11/hw/xquartz/xpr/Makefile.in 2021-04-13 14:12:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/xpr/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xquartz/xpr/xprCursor.c xorg-server-1.20.13/hw/xquartz/xpr/xprCursor.c --- xorg-server-1.20.11/hw/xquartz/xpr/xprCursor.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/xpr/xprCursor.c 2021-07-29 18:48:14.000000000 +0000 @@ -380,7 +380,9 @@ */ void QuartzSuspendXCursor(ScreenPtr pScreen) -{} +{ + xp_show_cursor(); +} /* * QuartzResumeXCursor diff -Nru xorg-server-1.20.11/hw/xwayland/Makefile.in xorg-server-1.20.13/hw/xwayland/Makefile.in --- xorg-server-1.20.11/hw/xwayland/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/hw/xwayland/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xwayland/xwayland-input.c xorg-server-1.20.13/hw/xwayland/xwayland-input.c --- xorg-server-1.20.11/hw/xwayland/xwayland-input.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/hw/xwayland/xwayland-input.c 2021-07-29 18:48:14.000000000 +0000 @@ -279,6 +279,10 @@ 0, 0xFFFF, 10000, 0, 10000, Absolute); InitValuatorAxisStruct(device, 1, axes_labels[1], 0, 0xFFFF, 10000, 0, 10000, Absolute); + + if (!InitPtrFeedbackClassDeviceStruct(device, xwl_pointer_control)) + return BadValue; + return Success; case DEVICE_ON: diff -Nru xorg-server-1.20.11/hw/xwin/dri/Makefile.in xorg-server-1.20.13/hw/xwin/dri/Makefile.in --- xorg-server-1.20.11/hw/xwin/dri/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/hw/xwin/dri/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xwin/glx/Makefile.in xorg-server-1.20.13/hw/xwin/glx/Makefile.in --- xorg-server-1.20.11/hw/xwin/glx/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/hw/xwin/glx/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. @@ -849,7 +849,8 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -961,7 +962,7 @@ uninstall-am: uninstall-libLTLIBRARIES -.MAKE: all check install install-am install-strip +.MAKE: all check install install-am install-exec install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-generic clean-libLTLIBRARIES clean-libtool \ diff -Nru xorg-server-1.20.11/hw/xwin/Makefile.in xorg-server-1.20.13/hw/xwin/Makefile.in --- xorg-server-1.20.11/hw/xwin/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/hw/xwin/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. @@ -1237,7 +1237,8 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive -install-exec: install-exec-recursive +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -1441,7 +1442,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-xwinconfigDATA .MAKE: $(am__recursive_targets) all check install install-am \ - install-exec-am install-strip + install-exec install-exec-am install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ am--depfiles check check-am clean clean-binPROGRAMS \ diff -Nru xorg-server-1.20.11/hw/xwin/man/Makefile.in xorg-server-1.20.13/hw/xwin/man/Makefile.in --- xorg-server-1.20.11/hw/xwin/man/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/hw/xwin/man/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xwin/winclipboard/Makefile.in xorg-server-1.20.13/hw/xwin/winclipboard/Makefile.in --- xorg-server-1.20.11/hw/xwin/winclipboard/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/hw/xwin/winclipboard/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/hw/xwin/winprefsyacc.c xorg-server-1.20.13/hw/xwin/winprefsyacc.c --- xorg-server-1.20.11/hw/xwin/winprefsyacc.c 2021-04-13 14:12:45.000000000 +0000 +++ xorg-server-1.20.13/hw/xwin/winprefsyacc.c 2021-07-29 18:48:50.000000000 +0000 @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 3.7.3. */ +/* A Bison parser, made by GNU Bison 3.7.6. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation, + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -45,11 +45,11 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ -/* Identify Bison output. */ -#define YYBISON 1 +/* Identify Bison output, and Bison version. */ +#define YYBISON 30706 -/* Bison version. */ -#define YYBISON_VERSION "3.7.3" +/* Bison version string. */ +#define YYBISON_VERSION "3.7.6" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -233,6 +233,7 @@ typedef enum yytokentype yytoken_kind_t; #endif /* Token kinds. */ +#define YYEMPTY -2 #define YYEOF 0 #define YYerror 256 #define YYUNDEF 257 @@ -276,7 +277,7 @@ unsigned long uVal; int iVal; -#line 280 "winprefsyacc.c" +#line 281 "winprefsyacc.c" }; typedef union YYSTYPE YYSTYPE; @@ -402,6 +403,18 @@ typedef short yytype_int16; #endif +/* Work around bug in HP-UX 11.23, which defines these macros + incorrectly for preprocessor constants. This workaround can likely + be removed in 2023, as HPE has promised support for HP-UX 11.23 + (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of + . */ +#ifdef __hpux +# undef UINT_LEAST8_MAX +# undef UINT_LEAST16_MAX +# define UINT_LEAST8_MAX 255 +# define UINT_LEAST16_MAX 65535 +#endif + #if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__ typedef __UINT_LEAST8_TYPE__ yytype_uint8; #elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \ @@ -499,9 +512,9 @@ /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(E) ((void) (E)) +# define YY_USE(E) ((void) (E)) #else -# define YYUSE(E) /* empty */ +# define YY_USE(E) /* empty */ #endif #if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ @@ -844,7 +857,7 @@ /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { - -1, 1, 16, 56, 17, 18, 19, 20, 21, 22, + 0, 1, 16, 56, 17, 18, 19, 20, 21, 22, 71, 72, 23, 54, 63, 64, 24, 45, 83, 84, 85, 66, 67, 25, 46, 49, 89, 90, 26, 59, 27, 28, 29 @@ -1000,7 +1013,7 @@ yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep) { FILE *yyoutput = yyo; - YYUSE (yyoutput); + YY_USE (yyoutput); if (!yyvaluep) return; # ifdef YYPRINT @@ -1008,7 +1021,7 @@ YYPRINT (yyo, yytoknum[yykind], *yyvaluep); # endif YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - YYUSE (yykind); + YY_USE (yykind); YY_IGNORE_MAYBE_UNINITIALIZED_END } @@ -1122,13 +1135,13 @@ yydestruct (const char *yymsg, yysymbol_kind_t yykind, YYSTYPE *yyvaluep) { - YYUSE (yyvaluep); + YY_USE (yyvaluep); if (!yymsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp); YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - YYUSE (yykind); + YY_USE (yykind); YY_IGNORE_MAYBE_UNINITIALIZED_END } @@ -1391,233 +1404,233 @@ case 20: /* trayicon: TRAYICON STRING NEWLINE */ #line 160 "winprefsyacc.y" { SetTrayIcon((yyvsp[-1].sVal)); free((yyvsp[-1].sVal)); } -#line 1395 "winprefsyacc.c" +#line 1408 "winprefsyacc.c" break; case 21: /* rootmenu: ROOTMENU STRING NEWLINE */ #line 163 "winprefsyacc.y" { SetRootMenu((yyvsp[-1].sVal)); free((yyvsp[-1].sVal)); } -#line 1401 "winprefsyacc.c" +#line 1414 "winprefsyacc.c" break; case 22: /* defaultsysmenu: DEFAULTSYSMENU STRING atspot NEWLINE */ #line 166 "winprefsyacc.y" { SetDefaultSysMenu((yyvsp[-2].sVal), (yyvsp[-1].iVal)); free((yyvsp[-2].sVal)); } -#line 1407 "winprefsyacc.c" +#line 1420 "winprefsyacc.c" break; case 23: /* defaulticon: DEFAULTICON STRING NEWLINE */ #line 169 "winprefsyacc.y" { SetDefaultIcon((yyvsp[-1].sVal)); free((yyvsp[-1].sVal)); } -#line 1413 "winprefsyacc.c" +#line 1426 "winprefsyacc.c" break; case 24: /* icondirectory: ICONDIRECTORY STRING NEWLINE */ #line 172 "winprefsyacc.y" { SetIconDirectory((yyvsp[-1].sVal)); free((yyvsp[-1].sVal)); } -#line 1419 "winprefsyacc.c" +#line 1432 "winprefsyacc.c" break; case 25: /* menuline: SEPARATOR NEWLINE newline_or_nada */ #line 175 "winprefsyacc.y" { AddMenuLine("-", CMD_SEPARATOR, ""); } -#line 1425 "winprefsyacc.c" +#line 1438 "winprefsyacc.c" break; case 26: /* menuline: STRING ALWAYSONTOP NEWLINE newline_or_nada */ #line 176 "winprefsyacc.y" { AddMenuLine((yyvsp[-3].sVal), CMD_ALWAYSONTOP, ""); free((yyvsp[-3].sVal)); } -#line 1431 "winprefsyacc.c" +#line 1444 "winprefsyacc.c" break; case 27: /* menuline: STRING EXEC STRING NEWLINE newline_or_nada */ #line 177 "winprefsyacc.y" { AddMenuLine((yyvsp[-4].sVal), CMD_EXEC, (yyvsp[-2].sVal)); free((yyvsp[-4].sVal)); free((yyvsp[-2].sVal)); } -#line 1437 "winprefsyacc.c" +#line 1450 "winprefsyacc.c" break; case 28: /* menuline: STRING MENU STRING NEWLINE newline_or_nada */ #line 178 "winprefsyacc.y" { AddMenuLine((yyvsp[-4].sVal), CMD_MENU, (yyvsp[-2].sVal)); free((yyvsp[-4].sVal)); free((yyvsp[-2].sVal)); } -#line 1443 "winprefsyacc.c" +#line 1456 "winprefsyacc.c" break; case 29: /* menuline: STRING RELOAD NEWLINE newline_or_nada */ #line 179 "winprefsyacc.y" { AddMenuLine((yyvsp[-3].sVal), CMD_RELOAD, ""); free((yyvsp[-3].sVal)); } -#line 1449 "winprefsyacc.c" +#line 1462 "winprefsyacc.c" break; case 32: /* $@1: %empty */ #line 186 "winprefsyacc.y" { OpenMenu((yyvsp[-1].sVal)); free((yyvsp[-1].sVal)); } -#line 1455 "winprefsyacc.c" +#line 1468 "winprefsyacc.c" break; case 33: /* menu: MENU STRING LB $@1 newline_or_nada menulist RB */ #line 186 "winprefsyacc.y" {CloseMenu();} -#line 1461 "winprefsyacc.c" +#line 1474 "winprefsyacc.c" break; case 34: /* iconline: STRING STRING NEWLINE newline_or_nada */ #line 189 "winprefsyacc.y" { AddIconLine((yyvsp[-3].sVal), (yyvsp[-2].sVal)); free((yyvsp[-3].sVal)); free((yyvsp[-2].sVal)); } -#line 1467 "winprefsyacc.c" +#line 1480 "winprefsyacc.c" break; case 37: /* $@2: %empty */ #line 196 "winprefsyacc.y" {OpenIcons();} -#line 1473 "winprefsyacc.c" +#line 1486 "winprefsyacc.c" break; case 38: /* icons: ICONS LB $@2 newline_or_nada iconlist RB */ #line 196 "winprefsyacc.y" {CloseIcons();} -#line 1479 "winprefsyacc.c" +#line 1492 "winprefsyacc.c" break; case 39: /* group1: TOPMOST */ #line 199 "winprefsyacc.y" { (yyval.uVal)=STYLE_TOPMOST; } -#line 1485 "winprefsyacc.c" +#line 1498 "winprefsyacc.c" break; case 40: /* group1: MAXIMIZE */ #line 200 "winprefsyacc.y" { (yyval.uVal)=STYLE_MAXIMIZE; } -#line 1491 "winprefsyacc.c" +#line 1504 "winprefsyacc.c" break; case 41: /* group1: MINIMIZE */ #line 201 "winprefsyacc.y" { (yyval.uVal)=STYLE_MINIMIZE; } -#line 1497 "winprefsyacc.c" +#line 1510 "winprefsyacc.c" break; case 42: /* group1: BOTTOM */ #line 202 "winprefsyacc.y" { (yyval.uVal)=STYLE_BOTTOM; } -#line 1503 "winprefsyacc.c" +#line 1516 "winprefsyacc.c" break; case 43: /* group2: NOTITLE */ #line 205 "winprefsyacc.y" { (yyval.uVal)=STYLE_NOTITLE; } -#line 1509 "winprefsyacc.c" +#line 1522 "winprefsyacc.c" break; case 44: /* group2: OUTLINE */ #line 206 "winprefsyacc.y" { (yyval.uVal)=STYLE_OUTLINE; } -#line 1515 "winprefsyacc.c" +#line 1528 "winprefsyacc.c" break; case 45: /* group2: NOFRAME */ #line 207 "winprefsyacc.y" { (yyval.uVal)=STYLE_NOFRAME; } -#line 1521 "winprefsyacc.c" +#line 1534 "winprefsyacc.c" break; case 46: /* stylecombo: group1 */ #line 210 "winprefsyacc.y" { (yyval.uVal)=(yyvsp[0].uVal); } -#line 1527 "winprefsyacc.c" +#line 1540 "winprefsyacc.c" break; case 47: /* stylecombo: group2 */ #line 211 "winprefsyacc.y" { (yyval.uVal)=(yyvsp[0].uVal); } -#line 1533 "winprefsyacc.c" +#line 1546 "winprefsyacc.c" break; case 48: /* stylecombo: group1 group2 */ #line 212 "winprefsyacc.y" { (yyval.uVal)=(yyvsp[-1].uVal)|(yyvsp[0].uVal); } -#line 1539 "winprefsyacc.c" +#line 1552 "winprefsyacc.c" break; case 49: /* stylecombo: group2 group1 */ #line 213 "winprefsyacc.y" { (yyval.uVal)=(yyvsp[-1].uVal)|(yyvsp[0].uVal); } -#line 1545 "winprefsyacc.c" +#line 1558 "winprefsyacc.c" break; case 50: /* styleline: STRING stylecombo NEWLINE newline_or_nada */ #line 216 "winprefsyacc.y" { AddStyleLine((yyvsp[-3].sVal), (yyvsp[-2].uVal)); free((yyvsp[-3].sVal)); } -#line 1551 "winprefsyacc.c" +#line 1564 "winprefsyacc.c" break; case 53: /* $@3: %empty */ #line 223 "winprefsyacc.y" {OpenStyles();} -#line 1557 "winprefsyacc.c" +#line 1570 "winprefsyacc.c" break; case 54: /* styles: STYLES LB $@3 newline_or_nada stylelist RB */ #line 223 "winprefsyacc.y" {CloseStyles();} -#line 1563 "winprefsyacc.c" +#line 1576 "winprefsyacc.c" break; case 55: /* atspot: %empty */ #line 226 "winprefsyacc.y" { (yyval.iVal)=AT_END; } -#line 1569 "winprefsyacc.c" +#line 1582 "winprefsyacc.c" break; case 56: /* atspot: ATSTART */ #line 227 "winprefsyacc.y" { (yyval.iVal)=AT_START; } -#line 1575 "winprefsyacc.c" +#line 1588 "winprefsyacc.c" break; case 57: /* atspot: ATEND */ #line 228 "winprefsyacc.y" { (yyval.iVal)=AT_END; } -#line 1581 "winprefsyacc.c" +#line 1594 "winprefsyacc.c" break; case 58: /* sysmenuline: STRING STRING atspot NEWLINE newline_or_nada */ #line 231 "winprefsyacc.y" { AddSysMenuLine((yyvsp[-4].sVal), (yyvsp[-3].sVal), (yyvsp[-2].iVal)); free((yyvsp[-4].sVal)); free((yyvsp[-3].sVal)); } -#line 1587 "winprefsyacc.c" +#line 1600 "winprefsyacc.c" break; case 61: /* $@4: %empty */ #line 238 "winprefsyacc.y" {OpenSysMenu();} -#line 1593 "winprefsyacc.c" +#line 1606 "winprefsyacc.c" break; case 62: /* sysmenu: SYSMENU LB NEWLINE $@4 newline_or_nada sysmenulist RB */ #line 238 "winprefsyacc.y" {CloseSysMenu();} -#line 1599 "winprefsyacc.c" +#line 1612 "winprefsyacc.c" break; case 63: /* forceexit: FORCEEXIT NEWLINE */ #line 241 "winprefsyacc.y" { pref.fForceExit = TRUE; } -#line 1605 "winprefsyacc.c" +#line 1618 "winprefsyacc.c" break; case 64: /* silentexit: SILENTEXIT NEWLINE */ #line 244 "winprefsyacc.y" { pref.fSilentExit = TRUE; } -#line 1611 "winprefsyacc.c" +#line 1624 "winprefsyacc.c" break; case 65: /* debug: "DEBUG" STRING NEWLINE */ #line 247 "winprefsyacc.y" { ErrorF("LoadPreferences: %s\n", (yyvsp[-1].sVal)); free((yyvsp[-1].sVal)); } -#line 1617 "winprefsyacc.c" +#line 1630 "winprefsyacc.c" break; -#line 1621 "winprefsyacc.c" +#line 1634 "winprefsyacc.c" default: break; } diff -Nru xorg-server-1.20.11/hw/xwin/winprefsyacc.h xorg-server-1.20.13/hw/xwin/winprefsyacc.h --- xorg-server-1.20.11/hw/xwin/winprefsyacc.h 2021-04-13 14:12:45.000000000 +0000 +++ xorg-server-1.20.13/hw/xwin/winprefsyacc.h 2021-07-29 18:48:50.000000000 +0000 @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 3.7.3. */ +/* A Bison parser, made by GNU Bison 3.7.6. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation, + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -87,6 +87,7 @@ typedef enum yytokentype yytoken_kind_t; #endif /* Token kinds. */ +#define YYEMPTY -2 #define YYEOF 0 #define YYerror 256 #define YYUNDEF 257 @@ -130,7 +131,7 @@ unsigned long uVal; int iVal; -#line 134 "winprefsyacc.h" +#line 135 "winprefsyacc.h" }; typedef union YYSTYPE YYSTYPE; diff -Nru xorg-server-1.20.11/include/Makefile.in xorg-server-1.20.13/include/Makefile.in --- xorg-server-1.20.11/include/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/include/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/install-sh xorg-server-1.20.13/install-sh --- xorg-server-1.20.11/install-sh 2021-04-13 14:11:57.000000000 +0000 +++ xorg-server-1.20.13/install-sh 2021-07-29 18:48:28.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2018-03-11.20; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -69,6 +69,11 @@ # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -99,18 +104,28 @@ --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to bug-automake@gnu.org. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,8 +152,13 @@ -o) chowncmd="$chownprog $2" shift;; + -p) cpprog="$cpprog -p";; + -s) stripcmd=$stripprog;; + -S) backupsuffix="$2" + shift;; + -t) is_target_a_directory=always dst_arg=$2 @@ -255,6 +275,10 @@ dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -301,22 +325,6 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - # With -d, create the new directory with the user-specified mode. # Otherwise, rely on $mkdir_umask. if test -n "$dir_arg"; then @@ -326,52 +334,49 @@ fi posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - # Note that $RANDOM variable is not portable (e.g. dash); Use it - # here however when possible just to lower collision chance. - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p' feature. - if (umask $mkdir_umask && - $mkdirprog $mkdir_mode "$tmpdir" && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - test_tmpdir="$tmpdir/a" - ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; esac if @@ -382,7 +387,7 @@ then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. @@ -411,7 +416,7 @@ prefixes= else if $posix_mkdir; then - (umask=$mkdir_umask && + (umask $mkdir_umask && $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break # Don't fail if two instances are running concurrently. test -d "$prefix" || exit 1 @@ -488,6 +493,13 @@ then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -502,9 +514,9 @@ # file should still install successfully. { test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || + $doit $rmcmd "$dst" 2>/dev/null || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } } || { echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 diff -Nru xorg-server-1.20.11/m4/libtool.m4 xorg-server-1.20.13/m4/libtool.m4 --- xorg-server-1.20.11/m4/libtool.m4 2021-04-13 14:11:48.000000000 +0000 +++ xorg-server-1.20.13/m4/libtool.m4 2021-07-29 18:48:21.000000000 +0000 @@ -1076,7 +1076,7 @@ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; 10.[[012]][[,.]]*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; diff -Nru xorg-server-1.20.11/Makefile.in xorg-server-1.20.13/Makefile.in --- xorg-server-1.20.11/Makefile.in 2021-04-13 14:11:57.000000000 +0000 +++ xorg-server-1.20.13/Makefile.in 2021-07-29 18:48:28.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. @@ -235,9 +235,11 @@ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz GZIP_ENV = --best -DIST_TARGETS = dist-bzip2 dist-gzip +DIST_TARGETS = dist-xz dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -986,6 +988,7 @@ dist-gzip: distdir tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) + dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__post_remove_distdir) @@ -993,7 +996,6 @@ dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__post_remove_distdir) - dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) @@ -1062,7 +1064,7 @@ $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ diff -Nru xorg-server-1.20.11/man/Makefile.in xorg-server-1.20.13/man/Makefile.in --- xorg-server-1.20.11/man/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/man/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/meson.build xorg-server-1.20.13/meson.build --- xorg-server-1.20.11/meson.build 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/meson.build 2021-07-29 18:48:14.000000000 +0000 @@ -3,7 +3,7 @@ 'buildtype=debugoptimized', 'c_std=gnu99', ], - version: '1.20.11', + version: '1.20.13', meson_version: '>= 0.42.0', ) add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c') diff -Nru xorg-server-1.20.11/mi/Makefile.in xorg-server-1.20.13/mi/Makefile.in --- xorg-server-1.20.11/mi/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/mi/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/miext/damage/Makefile.in xorg-server-1.20.13/miext/damage/Makefile.in --- xorg-server-1.20.11/miext/damage/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/miext/damage/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/miext/Makefile.in xorg-server-1.20.13/miext/Makefile.in --- xorg-server-1.20.11/miext/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/miext/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/miext/rootless/Makefile.in xorg-server-1.20.13/miext/rootless/Makefile.in --- xorg-server-1.20.11/miext/rootless/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/miext/rootless/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/miext/shadow/Makefile.in xorg-server-1.20.13/miext/shadow/Makefile.in --- xorg-server-1.20.11/miext/shadow/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/miext/shadow/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/miext/sync/Makefile.in xorg-server-1.20.13/miext/sync/Makefile.in --- xorg-server-1.20.11/miext/sync/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/miext/sync/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/os/Makefile.in xorg-server-1.20.13/os/Makefile.in --- xorg-server-1.20.11/os/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/os/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/present/Makefile.in xorg-server-1.20.13/present/Makefile.in --- xorg-server-1.20.11/present/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/present/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/present/present.c xorg-server-1.20.13/present/present.c --- xorg-server-1.20.11/present/present.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/present/present.c 2021-07-29 18:48:14.000000000 +0000 @@ -59,11 +59,19 @@ { ScreenPtr screen = window->drawable.pScreen; present_screen_priv_ptr screen_priv = present_screen_priv(screen); + RRCrtcPtr crtc = NULL; if (!screen_priv) return NULL; - return screen_priv->get_crtc(screen_priv, window); + crtc = screen_priv->get_crtc(screen_priv, window); + if (crtc && !present_screen_priv(crtc->pScreen)) { + crtc = RRFirstEnabledCrtc(screen); + } + if (crtc && !present_screen_priv(crtc->pScreen)) { + crtc = NULL; + } + return crtc; } /* diff -Nru xorg-server-1.20.11/present/present_scmd.c xorg-server-1.20.13/present/present_scmd.c --- xorg-server-1.20.11/present/present_scmd.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/present/present_scmd.c 2021-07-29 18:48:14.000000000 +0000 @@ -82,6 +82,9 @@ WindowPtr root = screen->root; present_screen_priv_ptr screen_priv = present_screen_priv(screen); + if (crtc) { + screen_priv = present_screen_priv(crtc->pScreen); + } if (reason) *reason = PRESENT_FLIP_REASON_UNKNOWN; @@ -181,11 +184,14 @@ present_get_ust_msc(ScreenPtr screen, RRCrtcPtr crtc, uint64_t *ust, uint64_t *msc) { present_screen_priv_ptr screen_priv = present_screen_priv(screen); + present_screen_priv_ptr crtc_screen_priv = screen_priv; + if (crtc) + crtc_screen_priv = present_screen_priv(crtc->pScreen); if (crtc == NULL) return present_fake_get_ust_msc(screen, ust, msc); else - return (*screen_priv->info->get_ust_msc)(crtc, ust, msc); + return (*crtc_screen_priv->info->get_ust_msc)(crtc, ust, msc); } static void @@ -216,7 +222,7 @@ ret = present_fake_queue_vblank(screen, event_id, msc); else { - present_screen_priv_ptr screen_priv = present_screen_priv(screen); + present_screen_priv_ptr screen_priv = present_screen_priv(crtc->pScreen); ret = (*screen_priv->info->queue_vblank) (crtc, event_id, msc); } return ret; @@ -233,11 +239,12 @@ if (window_priv->crtc == PresentCrtcNeverSet) { window_priv->msc_offset = 0; } else { - /* The old CRTC may have been turned off, in which case + /* The old CRTC may have been turned off or be destroyed, in which case * we'll just use whatever previous MSC we'd seen from this CRTC */ - if (present_get_ust_msc(window->drawable.pScreen, window_priv->crtc, &old_ust, &old_msc) != Success) + if (!RRCrtcExists(window->drawable.pScreen, window_priv->crtc) || + present_get_ust_msc(window->drawable.pScreen, window_priv->crtc, &old_ust, &old_msc) != Success) old_msc = window_priv->msc; window_priv->msc_offset += new_msc - old_msc; @@ -541,6 +548,9 @@ WindowPtr window = vblank->window; ScreenPtr screen = window->drawable.pScreen; present_screen_priv_ptr screen_priv = present_screen_priv(screen); + if (vblank && vblank->crtc) { + screen_priv=present_screen_priv(vblank->crtc->pScreen); + } if (present_execute_wait(vblank, crtc_msc)) return; diff -Nru xorg-server-1.20.11/present/present_vblank.c xorg-server-1.20.13/present/present_vblank.c --- xorg-server-1.20.11/present/present_vblank.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/present/present_vblank.c 2021-07-29 18:48:14.000000000 +0000 @@ -66,6 +66,10 @@ present_vblank_ptr vblank; PresentFlipReason reason = PRESENT_FLIP_REASON_UNKNOWN; + if (target_crtc) { + screen_priv = present_screen_priv(target_crtc->pScreen); + } + vblank = calloc (1, sizeof (present_vblank_rec)); if (!vblank) return NULL; diff -Nru xorg-server-1.20.11/pseudoramiX/Makefile.in xorg-server-1.20.13/pseudoramiX/Makefile.in --- xorg-server-1.20.11/pseudoramiX/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/pseudoramiX/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/randr/Makefile.in xorg-server-1.20.13/randr/Makefile.in --- xorg-server-1.20.11/randr/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/randr/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/randr/randr.c xorg-server-1.20.13/randr/randr.c --- xorg-server-1.20.11/randr/randr.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/randr/randr.c 2021-07-29 18:48:14.000000000 +0000 @@ -693,6 +693,33 @@ return NULL; } +RRCrtcPtr +RRFirstEnabledCrtc(ScreenPtr pScreen) +{ + rrScrPriv(pScreen); + RROutputPtr output; + int i, j; + + if (!pScrPriv) + return NULL; + + if (pScrPriv->primaryOutput && pScrPriv->primaryOutput->crtc && + pScrPriv->primaryOutput->pScreen == pScreen) + return pScrPriv->primaryOutput->crtc; + + for (i = 0; i < pScrPriv->numCrtcs; i++) { + RRCrtcPtr crtc = pScrPriv->crtcs[i]; + + for (j = 0; j < pScrPriv->numOutputs; j++) { + output = pScrPriv->outputs[j]; + if (output->crtc == crtc && crtc->mode) + return crtc; + } + } + return NULL; +} + + CARD16 RRVerticalRefresh(xRRModeInfo * mode) { diff -Nru xorg-server-1.20.11/randr/randrstr.h xorg-server-1.20.13/randr/randrstr.h --- xorg-server-1.20.11/randr/randrstr.h 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/randr/randrstr.h 2021-07-29 18:48:14.000000000 +0000 @@ -593,6 +593,8 @@ extern _X_EXPORT RROutputPtr RRFirstOutput(ScreenPtr pScreen); +extern _X_EXPORT RRCrtcPtr RRFirstEnabledCrtc(ScreenPtr pScreen); + extern _X_EXPORT Bool RROutputSetNonDesktop(RROutputPtr output, Bool non_desktop); extern _X_EXPORT CARD16 @@ -643,6 +645,11 @@ extern _X_EXPORT RRCrtcPtr RRCrtcCreate(ScreenPtr pScreen, void *devPrivate); /* + * Tests if findCrtc belongs to pScreen or slave screens + */ +extern _X_EXPORT Bool RRCrtcExists(ScreenPtr pScreen, RRCrtcPtr findCrtc); + +/* * Set the allowed rotations on a CRTC */ extern _X_EXPORT void diff -Nru xorg-server-1.20.11/randr/rrcrtc.c xorg-server-1.20.13/randr/rrcrtc.c --- xorg-server-1.20.11/randr/rrcrtc.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/randr/rrcrtc.c 2021-07-29 18:48:14.000000000 +0000 @@ -27,7 +27,7 @@ #include -RESTYPE RRCrtcType; +RESTYPE RRCrtcType = 0; /* * Notify the CRTC of some change @@ -960,6 +960,47 @@ return ret; } +static Bool RRCrtcInScreen(ScreenPtr pScreen, RRCrtcPtr findCrtc) +{ + rrScrPrivPtr pScrPriv; + int c; + + if (pScreen == NULL) + return FALSE; + + if (findCrtc == NULL) + return FALSE; + + if (!dixPrivateKeyRegistered(rrPrivKey)) + return FALSE; + + pScrPriv = rrGetScrPriv(pScreen); + for (c = 0; c < pScrPriv->numCrtcs; c++) { + if (pScrPriv->crtcs[c] == findCrtc) + return TRUE; + } + + return FALSE; +} + +Bool RRCrtcExists(ScreenPtr pScreen, RRCrtcPtr findCrtc) +{ + ScreenPtr slave= NULL; + + if (RRCrtcInScreen(pScreen, findCrtc)) + return TRUE; + + xorg_list_for_each_entry(slave, &pScreen->slave_list, slave_head) { + if (!slave->is_output_slave) + continue; + if (RRCrtcInScreen(slave, findCrtc)) + return TRUE; + } + + return FALSE; +} + + /* * Notify the extension that the Crtc gamma has been changed * The driver calls this whenever it has changed the gamma values diff -Nru xorg-server-1.20.11/randr/rrprovider.c xorg-server-1.20.13/randr/rrprovider.c --- xorg-server-1.20.11/randr/rrprovider.c 2021-04-13 14:11:40.000000000 +0000 +++ xorg-server-1.20.13/randr/rrprovider.c 2021-07-29 18:48:14.000000000 +0000 @@ -27,7 +27,7 @@ #include -RESTYPE RRProviderType; +RESTYPE RRProviderType = 0; /* * Initialize provider type error value diff -Nru xorg-server-1.20.11/record/Makefile.in xorg-server-1.20.13/record/Makefile.in --- xorg-server-1.20.11/record/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/record/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/render/Makefile.in xorg-server-1.20.13/render/Makefile.in --- xorg-server-1.20.11/render/Makefile.in 2021-04-13 14:12:01.000000000 +0000 +++ xorg-server-1.20.13/render/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -Nru xorg-server-1.20.11/test/Makefile.in xorg-server-1.20.13/test/Makefile.in --- xorg-server-1.20.11/test/Makefile.in 2021-04-13 14:12:02.000000000 +0000 +++ xorg-server-1.20.13/test/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. @@ -541,6 +541,7 @@ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) @ENABLE_UNIT_TESTS_TRUE@am__EXEEXT_1 = $(XVFB_TESTS) \ @ENABLE_UNIT_TESTS_TRUE@ $(XEPHYR_GLAMOR_TESTS) @@ -1706,7 +1707,7 @@ test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -1857,7 +1858,8 @@ installdirs-am: install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive -install-exec: install-exec-recursive +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -2017,7 +2019,7 @@ uninstall-am: .MAKE: $(am__recursive_targets) all check check-am install install-am \ - install-strip + install-exec install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ am--depfiles check check-TESTS check-am clean clean-generic \ diff -Nru xorg-server-1.20.11/test-driver xorg-server-1.20.13/test-driver --- xorg-server-1.20.11/test-driver 2021-04-13 14:12:02.000000000 +0000 +++ xorg-server-1.20.13/test-driver 2021-07-29 18:48:33.000000000 +0000 @@ -42,11 +42,13 @@ { cat <