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 s/__/@/ in inputtestdrv manpage Update manpage subsitution style for 2e497bf8 (cherry picked from commit 0099412ea4347b02e61ea21946f309f2535cc07b) - - - - - db0da823 by Matthieu Herrb at 2021-11-06T19:06:20+02:00 Make xf86CompatOutput() return NULL when there are no privates Some drivers (mach64 w/o DRI for instance) don't initialize privates. Signed-off-by: Matthieu Herrb <[email protected]> (cherry picked from commit 80eeff3ebac772e25c9107199989e677457dbe06) - - - - - 70a0c48f by Povilas Kanapickas at 2021-11-06T21:22:23+02:00 Makefile.am: Add missing meson build files to release tarball - - - - - 6b997fb7 by Povilas Kanapickas at 2021-11-07T01:34:24+02:00 xserver 21.1.1 Signed-off-by: Povilas Kanapickas <[email protected]> - - - - - 6 changed files: - Makefile.am - configure.ac - hw/xfree86/drivers/inputtest/inputtestdrv.man - hw/xfree86/modes/xf86Crtc.h - include/Makefile.am - meson.build Changes: ===================================== Makefile.am ===================================== @@ -147,6 +147,8 @@ EXTRA_DIST += \ damageext/meson.build \ dbe/meson.build \ dix/meson.build \ + doc/dtrace/meson.build \ + doc/meson.build \ dri3/meson.build \ exa/meson.build \ fb/meson.build \ @@ -160,8 +162,10 @@ EXTRA_DIST += \ hw/xfree86/common/meson.build \ hw/xfree86/ddc/meson.build \ hw/xfree86/dixmods/meson.build \ + hw/xfree86/doc/meson.build \ hw/xfree86/dri2/meson.build \ hw/xfree86/dri/meson.build \ + hw/xfree86/drivers/inputtest/meson.build \ hw/xfree86/drivers/modesetting/meson.build \ hw/xfree86/exa/meson.build \ hw/xfree86/fbdevhw/meson.build \ @@ -179,7 +183,12 @@ EXTRA_DIST += \ hw/xfree86/x86emu/meson.build \ hw/xfree86/xkb/meson.build \ hw/xnest/meson.build \ + hw/xquartz/bundle/meson.build \ + hw/xquartz/GL/meson.build \ + hw/xquartz/mach-startup/meson.build \ hw/xquartz/meson.build \ + hw/xquartz/pbproxy/meson.build \ + hw/xquartz/xpr/meson.build \ hw/xwin/dri/meson.build \ hw/xwin/glx/meson.build \ hw/xwin/meson.build \ @@ -187,6 +196,7 @@ EXTRA_DIST += \ include/meson.build \ meson.build \ miext/damage/meson.build \ + miext/rootless/meson.build \ miext/shadow/meson.build \ miext/sync/meson.build \ mi/meson.build \ @@ -198,6 +208,8 @@ EXTRA_DIST += \ render/meson.build \ test/bigreq/meson.build \ test/bigreq/request-length.c \ + test/damage/meson.build \ + test/damage/primitives.c \ test/meson.build \ test/sync/meson.build \ test/sync/sync.c \ ===================================== configure.ac ===================================== @@ -26,8 +26,8 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.60) -AC_INIT([xorg-server], 21.1.0, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server) -RELEASE_DATE="2021-10-27" +AC_INIT([xorg-server], 21.1.1, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server) +RELEASE_DATE="2021-11-07" RELEASE_NAME="Caramel Ice Cream" AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_MACRO_DIR([m4]) ===================================== hw/xfree86/drivers/inputtest/inputtestdrv.man ===================================== @@ -1,6 +1,6 @@ .\" shorthand for double quote that works everywhere. .ds q \N'34' -.TH INPUTTEST __drivermansuffix__ __vendorversion__ +.TH INPUTTEST @drivermansuffix@ @vendorversion@ .SH NAME inputtest \- An X.Org input driver for testing .SH SYNOPSIS @@ -21,7 +21,7 @@ exposed by Xorg. The primary use cases of this input driver are various integration tests that need to interface with the input subsystem. .SH CONFIGURATION DETAILS -Please refer to __xconfigfile__(__filemansuffix__) for general configuration +Please refer to @xconfigfile@(@filemansuffix@) for general configuration details and for options that can be used with all input drivers. This section only covers configuration details specific to this driver. .PP @@ -109,4 +109,4 @@ processed all input events sent to it so far. .SH AUTHORS Povilas Kanapickas <[email protected]> .SH "SEE ALSO" -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) +@xservername@(@appmansuffix@), @xconfigfile@(@filemansuffix@), Xserver(@appmansuffix@), X(@miscmansuffix@) ===================================== hw/xfree86/modes/xf86Crtc.h ===================================== @@ -839,6 +839,9 @@ xf86CompatOutput(ScrnInfoPtr pScrn) { xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); + if (xf86CrtcConfigPrivateIndex == -1) + return NULL; + if (config->compat_output < 0) return NULL; return config->output[config->compat_output]; ===================================== include/Makefile.am ===================================== @@ -82,7 +82,8 @@ EXTRA_DIST = \ xorg-config.h.meson.in \ xorg-server.h.meson.in \ xwin-config.h.meson.in \ - xsha1.h + xsha1.h \ + Xserver.d if XSERVER_DTRACE # Generate dtrace header file for C sources to include ===================================== meson.build ===================================== @@ -3,10 +3,10 @@ project('xserver', 'c', 'buildtype=debugoptimized', 'c_std=gnu99', ], - version: '21.1.0', + version: '21.1.1', meson_version: '>= 0.47.0', ) -release_date = '2021-10-27' +release_date = '2021-11-07' add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc']) cc = meson.get_compiler('c') View it on GitLab: https://salsa.debian.org/xorg-team/xserver/xorg-server/-/compare/27a0ee32ccef8d621aaa758c804fc9a5ceeb5a56...6b997fb74e5c9473ee3989fca8d592a3a0d16067 -- View it on GitLab: https://salsa.debian.org/xorg-team/xserver/xorg-server/-/compare/27a0ee32ccef8d621aaa758c804fc9a5ceeb5a56...6b997fb74e5c9473ee3989fca8d592a3a0d16067 You're receiving this email because of your account on salsa.debian.org.
