Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xorg-x11-server for openSUSE:Factory
checked in at 2021-08-02 12:04:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
and /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-server"
Mon Aug 2 12:04:36 2021 rev:396 rq:909450 version:1.20.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes
2021-07-22 22:43:45.867168212 +0200
+++
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1899/xorg-x11-server.changes
2021-08-02 12:04:51.977658631 +0200
@@ -1,0 +2,8 @@
+Fri Jul 30 15:07:59 UTC 2021 - Stefan Dirsch <[email protected]>
+
+- Update to version 1.20.13
+ * bugfix release
+- supersedes U_present-get_crtc-should-not-return-crtc-when-its-scr.patch,
+ U_modesetting-unflip-not-possible-when-glamor-is-not-s.patch
+
+-------------------------------------------------------------------
Old:
----
U_modesetting-unflip-not-possible-when-glamor-is-not-s.patch
U_present-get_crtc-should-not-return-crtc-when-its-scr.patch
xorg-server-1.20.12.tar.xz
New:
----
xorg-server-1.20.13.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.TMW99M/_old 2021-08-02 12:04:53.897658223 +0200
+++ /var/tmp/diff_new_pack.TMW99M/_new 2021-08-02 12:04:53.901658222 +0200
@@ -40,7 +40,7 @@
%endif
Name: xorg-x11-server
-Version: 1.20.12
+Version: 1.20.13
Release: 0
URL: http://xorg.freedesktop.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -252,8 +252,6 @@
Patch1900: u_no-lto-for-tests.patch
Patch1910: u_modesetting-Fix-dirty-updates-for-sw-rotation.patch
-Patch1911: U_present-get_crtc-should-not-return-crtc-when-its-scr.patch
-Patch1912: U_modesetting-unflip-not-possible-when-glamor-is-not-s.patch
%description
This package contains the X.Org Server.
@@ -405,8 +403,6 @@
%patch1801 -p1
%patch1900 -p1
%patch1910 -p1
-%patch1911 -p1
-%patch1912 -p1
%build
%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
++++++ xorg-server-1.20.12.tar.xz -> xorg-server-1.20.13.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xorg-server-1.20.12/ChangeLog
new/xorg-server-1.20.13/ChangeLog
--- old/xorg-server-1.20.12/ChangeLog 2021-07-08 21:22:52.000000000 +0200
+++ new/xorg-server-1.20.13/ChangeLog 2021-07-29 20:48:47.000000000 +0200
@@ -1,3 +1,34 @@
+commit 86a72cb1927dd91132d231bb7920b651704601ef
+Author: Matt Turner <[email protected]>
+Date: Thu Jul 29 11:23:15 2021 -0700
+
+ xserver 1.20.13
+
+ Signed-off-by: Matt Turner <[email protected]>
+
+commit f85e4edba489316950fc3422f39e3c2ef8fb1ac5
+Author: ??ukasz Spintzyk <[email protected]>
+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 <[email protected]>
+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 <[email protected]>
Date: Thu Jul 8 12:15:21 2021 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xorg-server-1.20.12/configure
new/xorg-server-1.20.13/configure
--- old/xorg-server-1.20.12/configure 2021-07-08 21:22:30.000000000 +0200
+++ new/xorg-server-1.20.13/configure 2021-07-29 20:48:26.000000000 +0200
@@ -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 @@
# 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 @@
# 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 @@
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 @@
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 @@
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 @@
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_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 @@
# 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 @@
_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 @@
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 @@
# 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 @@
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\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xorg-server-1.20.12/configure.ac
new/xorg-server-1.20.13/configure.ac
--- old/xorg-server-1.20.12/configure.ac 2021-07-08 21:22:18.000000000
+0200
+++ new/xorg-server-1.20.13/configure.ac 2021-07-29 20:48:13.000000000
+0200
@@ -26,8 +26,8 @@
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])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xorg-server-1.20.12/hw/xfree86/drivers/modesetting/present.c
new/xorg-server-1.20.13/hw/xfree86/drivers/modesetting/present.c
--- old/xorg-server-1.20.12/hw/xfree86/drivers/modesetting/present.c
2021-07-08 21:22:18.000000000 +0200
+++ new/xorg-server-1.20.13/hw/xfree86/drivers/modesetting/present.c
2021-07-29 20:48:14.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xorg-server-1.20.12/m4/libtool.m4
new/xorg-server-1.20.13/m4/libtool.m4
--- old/xorg-server-1.20.12/m4/libtool.m4 2021-07-08 21:22:24.000000000
+0200
+++ new/xorg-server-1.20.13/m4/libtool.m4 2021-07-29 20:48:21.000000000
+0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xorg-server-1.20.12/meson.build
new/xorg-server-1.20.13/meson.build
--- old/xorg-server-1.20.12/meson.build 2021-07-08 21:22:18.000000000 +0200
+++ new/xorg-server-1.20.13/meson.build 2021-07-29 20:48:14.000000000 +0200
@@ -3,7 +3,7 @@
'buildtype=debugoptimized',
'c_std=gnu99',
],
- version: '1.20.12',
+ version: '1.20.13',
meson_version: '>= 0.42.0',
)
add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xorg-server-1.20.12/present/present.c
new/xorg-server-1.20.13/present/present.c
--- old/xorg-server-1.20.12/present/present.c 2021-07-08 21:22:18.000000000
+0200
+++ new/xorg-server-1.20.13/present/present.c 2021-07-29 20:48:14.000000000
+0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xorg-server-1.20.12/randr/randr.c
new/xorg-server-1.20.13/randr/randr.c
--- old/xorg-server-1.20.12/randr/randr.c 2021-07-08 21:22:18.000000000
+0200
+++ new/xorg-server-1.20.13/randr/randr.c 2021-07-29 20:48:14.000000000
+0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xorg-server-1.20.12/randr/randrstr.h
new/xorg-server-1.20.13/randr/randrstr.h
--- old/xorg-server-1.20.12/randr/randrstr.h 2021-07-08 21:22:18.000000000
+0200
+++ new/xorg-server-1.20.13/randr/randrstr.h 2021-07-29 20:48:14.000000000
+0200
@@ -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
