[Git][xorg-team/xserver/xorg-server][debian-experimental] 8 commits: s/_

Timo Aaltonen pushed to branch debian-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 <matthieu.herrb@laas.fr>
(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 <povilas@radix.lt>

d723e2f9

by Timo Aaltonen at 2021-11-17T16:11:59+02:00

Merge branch 'upstream-experimental' into debian-experimental

b3833c86
by Timo Aaltonen at 2021-11-17T16:13:15+02:00
```
bump the version
```
7c45de8a
by Timo Aaltonen at 2021-11-17T16:18:38+02:00
```
Update signing-key.asc.
```
8652debd
by Timo Aaltonen at 2021-11-17T16:32:06+02:00
```
release to experimental
```

8 changed files:

Makefile.am
configure.ac
debian/changelog
debian/upstream/signing-key.asc
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])

debian/changelog

 -xorg-server (2:21.1.0-1) UNRELEASED; urgency=medium
 +xorg-server (2:21.1.1-1) experimental; urgency=medium
    * New upstream release.
    * 04_compiler_h_inb_outb_mips.diff: Dropped, upstream.
@@ -8,8 +8,9 @@ xorg-server (2:21.1.0-1) UNRELEASED; urgency=medium
    * control: Bump x11proto-dev and libx1-dev depends.
    * control: Add libxcvt-dev to build-depends, xcvt to -core Recommends.
    * control: Bump libdrm-dev build-depends.
 +  * Update signing-key.asc.
 - -- Timo Aaltonen <tjaalton@debian.org>  Tue, 10 Aug 2021 14:15:28 +0300
 + -- Timo Aaltonen <tjaalton@debian.org>  Wed, 17 Nov 2021 16:31:46 +0200
  xorg-server (2:1.20.13-1) experimental; urgency=medium

debian/upstream/signing-key.asc

@@ -648,3 +648,62 @@ ODByFEiWwb92zDjCpGxZjdJXouGWzlEryRWEiXHt/sFILZfBulUkVgwv5fLDBXc6
 qS3VJ3Bs9OlB0zmpT7l8NdQh77UdPTRy469+7JMtpKd1nTo9ECa0/mX0vQnKc=
  =q+02
  -----END PGP PUBLIC KEY BLOCK-----
 +-----BEGIN PGP PUBLIC KEY BLOCK-----
++
 +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
 +1+5AQvEh5elDZGKIcyWtgIoiUd1SjKXR
 +=zdHF
 +-----END PGP PUBLIC KEY BLOCK-----

hw/xfree86/drivers/inputtest/inputtestdrv.man

  .\" 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 <povilas@radix.lt>
  .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')

[Git][xorg-team/xserver/xorg-server][debian-experimental] 8 commits: s/__/@/ in inputtestdrv manpage

Timo Aaltonen pushed to branch debian-experimental at X Strike Force / xserver / xorg-server

Commits:

8 changed files:

Changes: