Module Name: xsrc
Committed By: mrg
Date: Mon Aug 23 22:32:40 UTC 2021
Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
present.c
xsrc/external/mit/xorg-server/dist/randr: randr.c randrstr.h
Log Message:
merge xorg-server 1.20.13.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/randr/randr.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/randr/randrstr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/configure
diff -u xsrc/external/mit/xorg-server/dist/configure:1.10 xsrc/external/mit/xorg-server/dist/configure:1.11
--- xsrc/external/mit/xorg-server/dist/configure:1.10 Sun Jul 11 00:13:26 2021
+++ xsrc/external/mit/xorg-server/dist/configure Mon Aug 23 22:32:40 2021
@@ -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.12.
+# Generated by GNU Autoconf 2.69 for xorg-server 1.20.13.
#
# Report bugs to <https://gitlab.freedesktop.org/xorg/xserver/issues>.
#
@@ -651,8 +651,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xorg-server'
PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.20.12'
-PACKAGE_STRING='xorg-server 1.20.12'
+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 @@ if test "$ac_init_help" = "long"; then
# 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.12 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 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 1.20.12:";;
+ short | recursive ) echo "Configuration of xorg-server 1.20.13:";;
esac
cat <<\_ACEOF
@@ -2307,10 +2307,10 @@ Optional Packages:
org.x)
--with-bundle-version=VERSION
Version to use for X11.app's CFBundleVersion
- (default: 1.20.12)
+ (default: 1.20.13)
--with-bundle-version-string=VERSION
Version to use for X11.app's
- CFBundleShortVersionString (default: 1.20.12)
+ 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 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xorg-server configure 1.20.12
+xorg-server configure 1.20.13
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3276,7 +3276,7 @@ cat >config.log <<_ACEOF
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.12, 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,7 +3624,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-RELEASE_DATE="2021-07-08"
+RELEASE_DATE="2021-07-29"
RELEASE_NAME="Lemon Pepper Chicken"
@@ -4138,7 +4138,7 @@ fi
# Define the identity of the package.
PACKAGE='xorg-server'
- VERSION='1.20.12'
+ VERSION='1.20.13'
cat >>confdefs.h <<_ACEOF
@@ -16502,7 +16502,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
_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
;;
@@ -23773,7 +23773,7 @@ _ACEOF
if test "${with_bundle_version+set}" = set; then :
withval=$with_bundle_version; BUNDLE_VERSION="${withval}"
else
- BUNDLE_VERSION="1.20.12"
+ BUNDLE_VERSION="1.20.13"
fi
@@ -33618,7 +33618,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# 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.12, 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
@@ -33684,7 +33684,7 @@ _ACEOF
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.12
+xorg-server config.status 1.20.13
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Index: xsrc/external/mit/xorg-server/dist/configure.ac
diff -u xsrc/external/mit/xorg-server/dist/configure.ac:1.12 xsrc/external/mit/xorg-server/dist/configure.ac:1.13
--- xsrc/external/mit/xorg-server/dist/configure.ac:1.12 Sun Jul 11 00:13:26 2021
+++ xsrc/external/mit/xorg-server/dist/configure.ac Mon Aug 23 22:32:40 2021
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.20.12, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
-RELEASE_DATE="2021-07-08"
+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])
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c:1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c:1.6 Sun Jul 11 00:13:27 2021
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c Mon Aug 23 22:32:40 2021
@@ -257,6 +257,9 @@ ms_present_check_unflip(RRCrtcPtr crtc,
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);
Index: xsrc/external/mit/xorg-server/dist/randr/randr.c
diff -u xsrc/external/mit/xorg-server/dist/randr/randr.c:1.5 xsrc/external/mit/xorg-server/dist/randr/randr.c:1.6
--- xsrc/external/mit/xorg-server/dist/randr/randr.c:1.5 Mon Dec 31 09:50:02 2018
+++ xsrc/external/mit/xorg-server/dist/randr/randr.c Mon Aug 23 22:32:40 2021
@@ -693,6 +693,33 @@ RRFirstOutput(ScreenPtr pScreen)
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)
{
Index: xsrc/external/mit/xorg-server/dist/randr/randrstr.h
diff -u xsrc/external/mit/xorg-server/dist/randr/randrstr.h:1.7 xsrc/external/mit/xorg-server/dist/randr/randrstr.h:1.8
--- xsrc/external/mit/xorg-server/dist/randr/randrstr.h:1.7 Sun Jul 11 00:13:27 2021
+++ xsrc/external/mit/xorg-server/dist/randr/randrstr.h Mon Aug 23 22:32:40 2021
@@ -600,6 +600,8 @@ extern _X_EXPORT Bool RRScreenInit(Scree
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
