Timo Aaltonen pushed to branch upstream-experimental at X Strike Force / xserver / xorg-server
Commits:
-
fdb266ff
by Jon Turney at 2021-11-06T19:06:10+02:00
-
db0da823
by Matthieu Herrb at 2021-11-06T19:06:20+02:00
-
70a0c48f
by Povilas Kanapickas at 2021-11-06T21:22:23+02:00
-
6b997fb7
by Povilas Kanapickas at 2021-11-07T01:34:24+02:00
6 changed files:
- Makefile.am
- configure.ac
- hw/xfree86/drivers/inputtest/inputtestdrv.man
- hw/xfree86/modes/xf86Crtc.h
- include/Makefile.am
- meson.build
Changes:
| ... | ... | @@ -147,6 +147,8 @@ EXTRA_DIST += \ |
| 147 | 147 |
damageext/meson.build \
|
| 148 | 148 |
dbe/meson.build \
|
| 149 | 149 |
dix/meson.build \
|
| 150 |
+ doc/dtrace/meson.build \
|
|
| 151 |
+ doc/meson.build \
|
|
| 150 | 152 |
dri3/meson.build \
|
| 151 | 153 |
exa/meson.build \
|
| 152 | 154 |
fb/meson.build \
|
| ... | ... | @@ -160,8 +162,10 @@ EXTRA_DIST += \ |
| 160 | 162 |
hw/xfree86/common/meson.build \
|
| 161 | 163 |
hw/xfree86/ddc/meson.build \
|
| 162 | 164 |
hw/xfree86/dixmods/meson.build \
|
| 165 |
+ hw/xfree86/doc/meson.build \
|
|
| 163 | 166 |
hw/xfree86/dri2/meson.build \
|
| 164 | 167 |
hw/xfree86/dri/meson.build \
|
| 168 |
+ hw/xfree86/drivers/inputtest/meson.build \
|
|
| 165 | 169 |
hw/xfree86/drivers/modesetting/meson.build \
|
| 166 | 170 |
hw/xfree86/exa/meson.build \
|
| 167 | 171 |
hw/xfree86/fbdevhw/meson.build \
|
| ... | ... | @@ -179,7 +183,12 @@ EXTRA_DIST += \ |
| 179 | 183 |
hw/xfree86/x86emu/meson.build \
|
| 180 | 184 |
hw/xfree86/xkb/meson.build \
|
| 181 | 185 |
hw/xnest/meson.build \
|
| 186 |
+ hw/xquartz/bundle/meson.build \
|
|
| 187 |
+ hw/xquartz/GL/meson.build \
|
|
| 188 |
+ hw/xquartz/mach-startup/meson.build \
|
|
| 182 | 189 |
hw/xquartz/meson.build \
|
| 190 |
+ hw/xquartz/pbproxy/meson.build \
|
|
| 191 |
+ hw/xquartz/xpr/meson.build \
|
|
| 183 | 192 |
hw/xwin/dri/meson.build \
|
| 184 | 193 |
hw/xwin/glx/meson.build \
|
| 185 | 194 |
hw/xwin/meson.build \
|
| ... | ... | @@ -187,6 +196,7 @@ EXTRA_DIST += \ |
| 187 | 196 |
include/meson.build \
|
| 188 | 197 |
meson.build \
|
| 189 | 198 |
miext/damage/meson.build \
|
| 199 |
+ miext/rootless/meson.build \
|
|
| 190 | 200 |
miext/shadow/meson.build \
|
| 191 | 201 |
miext/sync/meson.build \
|
| 192 | 202 |
mi/meson.build \
|
| ... | ... | @@ -198,6 +208,8 @@ EXTRA_DIST += \ |
| 198 | 208 |
render/meson.build \
|
| 199 | 209 |
test/bigreq/meson.build \
|
| 200 | 210 |
test/bigreq/request-length.c \
|
| 211 |
+ test/damage/meson.build \
|
|
| 212 |
+ test/damage/primitives.c \
|
|
| 201 | 213 |
test/meson.build \
|
| 202 | 214 |
test/sync/meson.build \
|
| 203 | 215 |
test/sync/sync.c \
|
| ... | ... | @@ -26,8 +26,8 @@ dnl |
| 26 | 26 |
dnl Process this file with autoconf to create configure.
|
| 27 | 27 |
|
| 28 | 28 |
AC_PREREQ(2.60)
|
| 29 |
-AC_INIT([xorg-server], 21.1.0, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
|
|
| 30 |
-RELEASE_DATE="2021-10-27"
|
|
| 29 |
+AC_INIT([xorg-server], 21.1.1, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
|
|
| 30 |
+RELEASE_DATE="2021-11-07"
|
|
| 31 | 31 |
RELEASE_NAME="Caramel Ice Cream"
|
| 32 | 32 |
AC_CONFIG_SRCDIR([Makefile.am])
|
| 33 | 33 |
AC_CONFIG_MACRO_DIR([m4])
|
| 1 | 1 |
.\" shorthand for double quote that works everywhere.
|
| 2 | 2 |
.ds q \N'34'
|
| 3 |
-.TH INPUTTEST __drivermansuffix__ __vendorversion__
|
|
| 3 |
+.TH INPUTTEST @drivermansuffix@ @vendorversion@
|
|
| 4 | 4 |
.SH NAME
|
| 5 | 5 |
inputtest \- An X.Org input driver for testing
|
| 6 | 6 |
.SH SYNOPSIS
|
| ... | ... | @@ -21,7 +21,7 @@ exposed by Xorg. The primary use cases of this input driver are various |
| 21 | 21 |
integration tests that need to interface with the input subsystem.
|
| 22 | 22 |
|
| 23 | 23 |
.SH CONFIGURATION DETAILS
|
| 24 |
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
|
|
| 24 |
+Please refer to @xconfigfile@(@filemansuffix@) for general configuration
|
|
| 25 | 25 |
details and for options that can be used with all input drivers. This
|
| 26 | 26 |
section only covers configuration details specific to this driver.
|
| 27 | 27 |
.PP
|
| ... | ... | @@ -109,4 +109,4 @@ processed all input events sent to it so far. |
| 109 | 109 |
.SH AUTHORS
|
| 110 | 110 |
Povilas Kanapickas <povilas@radix.lt>
|
| 111 | 111 |
.SH "SEE ALSO"
|
| 112 |
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
|
|
| 112 |
+@xservername@(@appmansuffix@), @xconfigfile@(@filemansuffix@), Xserver(@appmansuffix@), X(@miscmansuffix@)
|
| ... | ... | @@ -839,6 +839,9 @@ xf86CompatOutput(ScrnInfoPtr pScrn) |
| 839 | 839 |
{
|
| 840 | 840 |
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
|
| 841 | 841 |
|
| 842 |
+ if (xf86CrtcConfigPrivateIndex == -1)
|
|
| 843 |
+ return NULL;
|
|
| 844 |
+ |
|
| 842 | 845 |
if (config->compat_output < 0)
|
| 843 | 846 |
return NULL;
|
| 844 | 847 |
return config->output[config->compat_output];
|
| ... | ... | @@ -82,7 +82,8 @@ EXTRA_DIST = \ |
| 82 | 82 |
xorg-config.h.meson.in \
|
| 83 | 83 |
xorg-server.h.meson.in \
|
| 84 | 84 |
xwin-config.h.meson.in \
|
| 85 |
- xsha1.h
|
|
| 85 |
+ xsha1.h \
|
|
| 86 |
+ Xserver.d
|
|
| 86 | 87 |
|
| 87 | 88 |
if XSERVER_DTRACE
|
| 88 | 89 |
# Generate dtrace header file for C sources to include
|
| ... | ... | @@ -3,10 +3,10 @@ project('xserver', 'c', |
| 3 | 3 |
'buildtype=debugoptimized',
|
| 4 | 4 |
'c_std=gnu99',
|
| 5 | 5 |
],
|
| 6 |
- version: '21.1.0',
|
|
| 6 |
+ version: '21.1.1',
|
|
| 7 | 7 |
meson_version: '>= 0.47.0',
|
| 8 | 8 |
)
|
| 9 |
-release_date = '2021-10-27'
|
|
| 9 |
+release_date = '2021-11-07'
|
|
| 10 | 10 |
|
| 11 | 11 |
add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])
|
| 12 | 12 |
cc = meson.get_compiler('c')
|