Compare revisions

a90f3372 · 8a3ae555 · f79e5368 · cd285922 · a9a5bd00 · b84e7f1c
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,29 +5,80 @@ version: '{build}'
 skip_tags: true
 clone_depth: 8
 environment:
+  APPVEYOR_SAVE_CACHE_ON_ERROR: true
  CYGWIN_MIRROR: http://cygwin.mirror.constant.com
  CACHE: C:\cache
  matrix:
  - BUILD: i686-pc-cygwin
+    CYGWIN_ROOT: C:\cygwin
+    SETUP: setup-x86.exe
  - BUILD: x86_64-pc-cygwin
+    CYGWIN_ROOT: C:\cygwin64
+    SETUP: setup-x86_64.exe
 install:
- if "%BUILD%"=="x86_64-pc-cygwin" set SETUP=setup-x86_64.exe && set CYGWIN_ROOT=C:\cygwin64
- if "%BUILD%"=="i686-pc-cygwin" set SETUP=setup-x86.exe && set CYGWIN_ROOT=C:\cygwin
- curl -fsSL https://gist.githubusercontent.com/jon-turney/0338af595313f598bfab15a0ac0df847/raw/bd0eeca6be899e7846aa988fbcf15e4e12f5f842/zp_libtool_cleanlafiles.sh -o %CYGWIN_ROOT%\etc\postinstall\zp_libtool_cleanlafiles.sh
 - echo Updating Cygwin and installing build prerequisites
- '%CYGWIN_ROOT%\%SETUP% -qnNdO -R "%CYGWIN_ROOT%" -s "%CYGWIN_MIRROR%" -l "%CACHE%" -g -P "meson,binutils,bison,bzip2,diffutils,fileutils,findutils,flex,gawk,gcc-core,make,patch,pkg-config,python3,sed,tar,xorgproto,windowsdriproto,libdmx-devel,libfontenc-devel,libfreetype-devel,libGL-devel,libpixman1-devel,libX11-devel,libXRes-devel,libXau-devel,libXaw-devel,libXdmcp-devel,libXext-devel,libXfont2-devel,libXi-devel,libXinerama-devel,libXmu-devel,libXpm-devel,libXrender-devel,libXtst-devel,libxcb-ewmh-devel,libxcb-icccm-devel,libxcb-image-devel,libxcb-keysyms-devel,libxcb-randr-devel,libxcb-render-devel,libxcb-render-util-devel,libxcb-shape-devel,libxcb-util-devel,libxcb-xkb-devel,libxkbfile-devel,zlib,font-util,khronos-opengl-registry,python3-lxml,xorg-util-macros,xtrans,xkbcomp,xkeyboard-config,libnettle-devel,libepoxy-devel,libtirpc-devel"'
+- "%CYGWIN_ROOT%\\%SETUP% -qnNdO -R %CYGWIN_ROOT% -s %CYGWIN_MIRROR% -l %CACHE% -g -P \
+binutils,\
+bison,\
+ccache,\
+flex,\
+gcc-core,\
+meson,\
+ninja,\
+pkg-config,\
+python38,\
+windowsdriproto,\
+xorgproto,\
+libepoxy-devel,\
+libfontenc-devel,\
+libfreetype-devel,\
+libGL-devel,\
+libnettle-devel,\
+libpixman1-devel,\
+libtirpc-devel,\
+libXRes-devel,\
+libXaw-devel,\
+libXdmcp-devel,\
+libXext-devel,\
+libXfont2-devel,\
+libXi-devel,\
+libXinerama-devel,\
+libXmu-devel,\
+libXpm-devel,\
+libXrender-devel,\
+libXtst-devel,\
+libxcb-composite-devel,\
+libxcb-ewmh-devel,\
+libxcb-icccm-devel,\
+libxcb-image-devel,\
+libxcb-keysyms-devel,\
+libxcb-randr-devel,\
+libxcb-render-devel,\
+libxcb-render-util-devel,\
+libxcb-shape-devel,\
+libxcb-util-devel,\
+libxcb-xkb-devel,\
+libxcvt-devel,\
+libxkbfile-devel,\
+font-util,\
+khronos-opengl-registry,\
+python38-lxml,\
+xkbcomp-devel,\
+xkeyboard-config,\
+xtrans"
 - echo Install done
+- "%CYGWIN_ROOT%\\%SETUP% -qnNdO -R %CYGWIN_ROOT% -s %CYGWIN_MIRROR% -l %CACHE% -g"
 cache:
 - C:\cache
+- '%CYGWIN_ROOT%\home\%USERNAME%\.ccache'
 build_script:
 - SET PATH=%CYGWIN_ROOT%/bin
- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; meson setup --prefix=/usr -Dxv=false -Dxf86bigfont=true -Ddmx=true -Dxephyr=true -Dxnest=true -Dxvfb=true -Dxwin=true -Dxorg=true -Dhal=false -Dudev=false -Dpciaccess=false -Dint10=false build"'
+- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; meson setup --prefix=/usr -Dxv=false -Dxf86bigfont=true -Dxephyr=true -Dxnest=true -Dxvfb=true -Dxwin=true -Dxorg=true -Dpciaccess=false -Dint10=false -Dglamor=false build"'
 - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; meson configure build"'
 - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ninja -C build"'
+- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ccache -s"'
 test_script:
 - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ninja -C build test"'
 after_test:
 - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ninja -C build install"'
-artifacts:
- path: staging
 deploy: off
--- a/.dir-locals.el
+++ b/.dir-locals.el
-((c-mode . ((c-basic-offset . 4) (indent-tabs-mode . nil))))
\ No newline at end of file
+((c-mode . ((c-basic-offset . 4) (indent-tabs-mode . nil))))
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
+# This file contains revisions to be ignored by git blame.
+# These revisions are expected to be formatting-only changes.
+#
+# Calling `git blame --ignore-revs-file .git-blame-ignore-revs` will
+# tell git blame to ignore changes made by these revisions when assigning
+# assigning blame, as if the change never happened.
+#
+# You can enable this as a default for your local repository by running
+# `git config blame.ignoreRevsFile .git-blame-ignore-revs`
+# Important: if you do this, then switch to a branch without this file,
+# `git blame` will fail with an error.
+#
+
+# Introduce a consistent coding style
+9838b7032ea9792bec21af424c53c07078636d21
+
+# Drop trailing whitespaces
+732fd7e571b81d63aa44d6e4cf55883479e88f2f
+
+# glamor: Apply x-indent.sh.
+d84d71029ae9e462559d64eff7259e2cc7732fac
+
+# indent fixes (OMG SO UGLY), and nuke old RCS keywords.
+6d7083bd69724586338d79784655328f1fcd2ae5
--- a/.gitignore
+++ b/.gitignore
-#
-#		X.Org module default exclusion patterns
-#		The next section if for module specific patterns
-#
-#	Do not edit the following section
-# 	GNU Build System (Autotools)
-aclocal.m4
-autom4te.cache/
-autoscan.log
-ChangeLog
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config-ml.in
-config.py
-config.status
-config.status.lineno
-config.sub
-configure
-configure.scan
-depcomp
-.deps/
-INSTALL
-install-sh
-.libs/
-libtool
-libtool.m4
-ltmain.sh
-lt~obsolete.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-Makefile
-Makefile.in
-mdate-sh
-missing
-mkinstalldirs
-*.pc
-py-compile
-stamp-h?
-symlink-tree
-test-driver
-texinfo.tex
-ylwrap
-
-#	Do not edit the following section
-# 	Edit Compile Debug Document Distribute
 *~
-*.[0-9]
-*.[0-9]x
-*.bak
-*.bin
-core
-*.dll
-*.exe
-*-ISO*.bdf
-*-JIS*.bdf
-*-KOI8*.bdf
-*.kld
-*.ko
-*.ko.cmd
-*.lai
-*.l[oa]
-*.[oa]
-*.obj
+*.swp
 *.patch
-*.so
-*.pcf.gz
-*.pdb
-*.tar.bz2
-*.tar.gz
-#
-#		Add & Override patterns for xserver 
-#
-#		Edit the following section as needed
-# For example, !report.pc overrides *.pc. See 'man gitignore'
-# 
-doltcompile
-doltlibtool
-xserver.ent
+tags
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
-image: docker:latest
-services:
-    - docker:dind
+# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
+#
+# This CI uses the freedesktop.org ci-templates.
+# Please see the ci-templates documentation for details:
+# https://freedesktop.pages.freedesktop.org/ci-templates/

-before_script:
-    - echo FROM nwnk/xserver-travis-rawhide:v5 > Dockerfile
-    - echo ADD . /root >> Dockerfile
-    - echo WORKDIR /root >> Dockerfile
-    - docker build -t withgit .
+.templates_sha: &template_sha ef5e4669b7500834a17ffe9277e15fbb6d977fff # see https://docs.gitlab.com/ee/ci/yaml/#includefile

-job:
+# FDO_DISTRIBUTION_TAG is the tag of the docker image used for the build jobs.
+# If the image doesn't exist yet, the docker-image stage generates it.
+#
+# In order to generate a new image, one should generally change the tag.
+# While removing the image from the registry would also work, that's not
+# recommended except for ephemeral images during development: Replacing an
+# image after a significant amount of time might pull in newer versions of
+# gcc/clang or other packages, which might break the build with older commits
+# using the same tag.
+variables:
+    FDO_UPSTREAM_REPO:    'xorg/xserver'
+    MESON_BUILDDIR:       'build'
+    REPO_URL_XORGPROTO:   'https://gitlab.freedesktop.org/xorg/proto/xorgproto.git'
+    XORG_DEBIAN_VERSION:  'bullseye-slim'
+    XORG_DEBIAN_EXEC:     'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
+    XORG_DEBIAN_TAG:      '2025-02-26-xcb-deps'
+    XORG_FREEBSD_VERSION: '14.2'
+    XORG_FREEBSD_EXEC:    ''
+    XORG_FREEBSD_TAG:     '2025-02-18-vm-image'
+
+include:
+  - project: 'freedesktop/ci-templates'
+    ref: *template_sha
+    file:
+      - '/templates/debian.yml'
+      - '/templates/freebsd.yml'
+      - '/templates/ci-fairy.yml'
+  - template: Security/SAST.gitlab-ci.yml
+
+stages:
+    - docker-image
+    - build-and-test
+    - drivers
+    - test
+
+.ci-run-policy:
+  # Retry jobs after runner system failures
+  retry:
+    max: 2
+    when:
+      - runner_system_failure
+  # Cancel CI run if a newer commit is pushed to the same branch
+  interruptible: true
+
+# This is everything but the DDXen
+.dix_paths: &dix_paths
+  # Directories
+  - .gitlab-ci/**/*
+  - composite/**/*
+  - config/**/*
+  - damageext/**/*
+  - dbe/**/*
+  - dix/**/*
+  - doc/**/*
+  - dri3/**/*
+  - exa/**/*
+  - fb/**/*
+  - glamor/**/*
+  - glx/**/*
+  - include/**/*
+  - m4/**/*
+  - man/**/*
+  - mi/**/*
+  - miext/**/*
+  - os/**/*
+  - present/**/*
+  - pseudoramiX/**/*
+  - randr/**/*
+  - record/**/*
+  - render/**/*
+  - test/**/*
+  - Xext/**/*
+  - xfixes/**/*
+  - Xi/**/*
+  - xkb/**/*
+  # Files
+  - hw/meson.build
+  - .gitlab-ci.yml
+  - meson*
+  - xorg-server.m4
+  - xorg-server.pc.in
+  - xserver.ent.in
+
+.xorg_paths: &xorg_paths
+  - hw/xfree86/**/*
+
+.xwayland_paths: &xwayland_paths
+  - hw/xwayland/**/*
+
+.all_ddx_paths:
+  - hw/**/*
+
+.debian:
+  variables:
+    FDO_DISTRIBUTION_VERSION:   '$XORG_DEBIAN_VERSION'
+    FDO_DISTRIBUTION_EXEC:      '$XORG_DEBIAN_EXEC'
+    FDO_DISTRIBUTION_TAG:       '$XORG_DEBIAN_TAG'
+
+.freebsd:
+  variables:
+    FDO_DISTRIBUTION_TAG:       '$XORG_FREEBSD_TAG'
+    FDO_DISTRIBUTION_VERSION:   '$XORG_FREEBSD_VERSION'
+    FDO_DISTRIBUTION_EXEC:      ''
+    FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake libtool xorg-macros xorgproto bash meson ninja pixman xtrans libXau libXdmcp libXfont2 libxkbfile libxcvt libpciaccess font-util libepoll-shim'
+    FDO_IMAGE_SIZE:             '30G'
+
+debian-bullseye:
+  extends:
+    - .fdo.container-build@debian
+    - .ci-run-policy
+    - .debian
+  stage: docker-image
+  variables:
+    GIT_STRATEGY: none
+
+freebsd-image:
+  extends:
+    - .fdo.qemu-build@freebsd@x86_64
+    - .freebsd
+  stage: docker-image
+  variables:
+    GIT_STRATEGY:               none
+
+.xorg-image@debian:
+    extends:
+        - .fdo.distribution-image@debian
+        - .debian
+
+.xorg-image@freebsd:
+    extends:
+        - .fdo.distribution-image@freebsd
+        - .freebsd
+    variables:
+        GIT_DEPTH:                1
+        PKG_CONFIG_PATH:          /usr/share/pkgconfig:/usr/lib/pkgconfig:/usr/pkg/share/pkgconfig:/usr/pkg/lib/pkgconfig:/usr/local/libdata/pkgconfig
+
+.common-build-and-test:
+    extends:
+        - .xorg-image@debian
+        - .ci-run-policy
+    stage: build-and-test
+    artifacts:
+        when: always
+        paths:
+            - $MESON_BUILDDIR/meson-logs/
+            - $MESON_BUILDDIR/test/piglit-results/
+    variables:
+        MESON_ARGS: -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true -Dxcsecurity=true
+        CCACHE_COMPILERCHECK: content
+        CCACHE_DIR: /cache/xserver/cache
+        LC_ALL: C.UTF-8
+    before_script:
+        - export CCACHE_BASEDIR="$PWD"
+        - export PATH="/usr/lib/ccache:$PATH"
+        - ccache --show-stats
+    after_script:
+        - ccache --show-stats
+
+meson:
+    extends: .common-build-and-test
+    script:
+        - .gitlab-ci/meson-build.sh --run-test
+        - .gitlab-ci/check-piglit-results.sh
+        - .gitlab-ci/manpages-check
+        - .gitlab-ci/check-ddx-build.sh
+    variables:
+      XTEST_DIR: /root/xts
+      PIGLIT_DIR: /root/piglit
+      LP_NUM_THREADS: 0
+      MESON_DDX_BUILD_ARGS: >
+        -Dxwayland=${BUILD_XWAYLAND} -Dxorg=${BUILD_XORG} -Dxephyr=${BUILD_XEPHYR} -Dxvfb=${BUILD_XVFB} -Dxnest=${BUILD_XNEST}
+      BUILD_XEPHYR: true
+      BUILD_XNEST: true
+      BUILD_XORG: true
+      BUILD_XVFB: true
+      BUILD_XWAYLAND: true
+      MESON_EXTRA_ARGS: ${MESON_DDX_BUILD_ARGS}
+
+meson-noglamor:
+    extends: meson
+    variables:
+        MESON_EXTRA_ARGS: -Dglamor=false ${MESON_DDX_BUILD_ARGS}
+
+xwayland-nolibdecor:
+    extends: meson
+    variables:
+        BUILD_XEPHYR: false
+        BUILD_XNEST: false
+        BUILD_XORG: false
+        BUILD_XVFB: false
+        MESON_EXTRA_ARGS: -Dlibdecor=false ${MESON_DDX_BUILD_ARGS}
+
+mingw-cross-build:
+    extends: .common-build-and-test
+    script:
+        - .gitlab-ci/meson-build.sh --run-install
+    variables:
+      MESON_ARGS: --cross-file=.gitlab-ci/cross-i686-w64-mingw32.txt -Dglx=false -Dlisten_tcp=true
+
+freebsd:
+    stage: build-and-test
+    extends:
+        - .xorg-image@freebsd
+    variables:
+        MESON_ARGS: -Dglx=false -Dglamor=false -Dudev=false -Dudev_kms=false
    script:
-        - docker run --volume $HOME/.ccache:/root/.ccache withgit ./test/scripts/build-travis-deps.sh
+      # running of of disk space without this
+      # needed until https://gitlab.freedesktop.org/freedesktop/ci-templates/-/issues/67 is fixed
+      - git gc
+      - git clone --depth=1 $REPO_URL_XORGPROTO dep.xorgproto
+      - /app/vmctl start
+      - set +e
+      - scp -r $PWD "vm:"
+      # need to install newer xorgproto
+      - /app/vmctl exec "cd $CI_PROJECT_NAME/dep.xorgproto && ./autogen.sh --prefix=/usr && make && make install"
+      - /app/vmctl exec "cd $CI_PROJECT_NAME && PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\" MESON_ARGS=\"$MESON_ARGS\" MESON_BUILDDIR=\"$MESON_BUILDDIR\" .gitlab-ci/meson-build.sh --skip-test" && touch .success
+      # test not working yet, so skipped
+      # - scp -r vm:$CI_PROJECT_NAME/test-results.xml .
+      - /app/vmctl stop
+      - set -e
+      - test -e .success || exit 1
+
+meson-dist:
+    extends: .common-build-and-test
+    artifacts:
+        when: always
+        paths:
+            - $MESON_BUILDDIR/meson-logs/
+            - $MESON_BUILDDIR/xserver-*/$MESON_BUILDDIR/meson-logs/
+            - xserver-tarball/install/
+    script:
+        - .gitlab-ci/meson-build.sh --run-dist
+        - mkdir xserver-tarball
+        - tar xf $MESON_BUILDDIR/meson-dist/xserver-*.tar.xz -C xserver-tarball --strip-components=1
+        - .gitlab-ci/meson-build.sh -C xserver-tarball --skip-test --skip-dist --run-install
+    variables:
+      MESON_DIST_ARGS: --no-tests
+      MESON_EXTRA_ARGS: -Dprefix=$CI_PROJECT_DIR/xserver-tarball/install/
+
+xf86-driver-build-test:
+    extends:
+        - .xorg-image@debian
+        - .ci-run-policy
+    stage: drivers
+    parallel:
+        matrix:
+            - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev
+              SHA: xf86-input-evdev-2.10.6
+            - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput
+              SHA: xf86-input-libinput-1.4.0
+            - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse
+              SHA: xf86-input-mouse-1.9.5
+            - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-input-synaptics
+              SHA: xf86-input-synaptics-1.9.2
+            - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu
+              SHA: xf86-video-amdgpu-23.0.0
+            - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati
+              SHA: xf86-video-ati-22.0.0
+            - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel
+              SHA: e6a4c4740c15ace9dd79dc7c18955f2eb413a6a5 # no release yet
+            - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl
+              SHA: 989ff620220e8d0555cec38c1508b57dfbcfb0c6 # no release yet
+            - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa
+              SHA: xf86-video-vesa-2.6.0
+            - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-vmware
+              SHA: xf86-video-vmware-13.4.0
+    script:
+        # built xserver is taken from meson-dist job
+        - export PKG_CONFIG_PATH=$(pwd)/xserver-tarball/install/lib/x86_64-linux-gnu/pkgconfig
+        - export ACLOCAL_PATH=$(pwd)/xserver-tarball/install/share/aclocal/
+        - unset MESON_EXTRA_ARGS
+        - DRIVER=$(basename $REPO)
+        - git clone "$REPO" "$DRIVER"
+        - git -C "$DRIVER" checkout "$SHA"
+        - |
+          if [[ -e "$DRIVER/meson.build" ]] && [[ "$DRIVER" != "xf86-video-intel" ]]; then
+            .gitlab-ci/meson-build.sh -C "$DRIVER" --skip-test
+          else
+             pushd "$DRIVER" || exit 1
+             ./autogen.sh && make
+          fi
+    needs:
+        - meson-dist
+    dependencies:
+        - meson-dist
+    variables:
+        GIT_DEPTH: 1
+        MESON_ARGS: -Dprefix=/usr/
+        MESON_EXTRA_ARGS: -Dxwayland=false -Dxnest=false -Dxvfb=false -Dxquartz=false -Ddocs=false
+    rules:
+      - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+        changes:
+          *dix_paths
+      - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+        changes:
+          *xorg_paths
+
+#
+# Verify that commit messages are as expected
+#
+check-commits:
+  extends:
+    - .fdo.ci-fairy
+  needs: []
+  stage: test
+  script:
+    - ci-fairy check-commits --junit-xml=results.xml
+  except:
+    - master@xorg/xserver
+  variables:
+    GIT_DEPTH: 100
+  artifacts:
+    reports:
+      junit: results.xml
+  allow_failure: true
+
+#
+# Verify that the merge request has the allow-collaboration checkbox ticked
+#
+check-merge-request:
+  extends:
+    - .fdo.ci-fairy
+  needs: []
+  stage: test
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+  script:
+    - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
+  artifacts:
+    when: on_failure
+    reports:
+      junit: results.xml
+  allow_failure: true
+
+#
+# Workflow rules needed due to:
+# https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/438
+#
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_OPEN_MERGE_REQUESTS
+      when: never
+    - if: $CI_PIPELINE_SOURCE == 'push'
--- a/.gitlab-ci/check-ddx-build.sh
+++ b/.gitlab-ci/check-ddx-build.sh
+#!/bin/bash
+
+set -e
+set -o xtrace
+
+check_executable () {
+    if [[ ! -x $MESON_BUILDDIR/$1 ]]; then
+        echo "$1 not found after build"
+        exit 1
+    fi
+    return 0
+}
+
+if [[ -z "$MESON_BUILDDIR" ]]; then
+    echo "\$MESON_BUILDDIR not set"
+    exit 1
+fi
+
+[[ "$BUILD_XEPHYR" == true ]]   && check_executable "hw/kdrive/ephyr/Xephyr"
+[[ "$BUILD_XNEST" == true ]]    && check_executable "hw/xnest/Xnest"
+[[ "$BUILD_XORG" == true ]]     && check_executable "hw/xfree86/Xorg"
+[[ "$BUILD_XVFB" == true ]]     && check_executable "hw/vfb/Xvfb"
+[[ "$BUILD_XWAYLAND" == true ]] && check_executable "hw/xwayland/Xwayland"
+
+exit 0
--- a/.gitlab-ci/check-piglit-results.sh
+++ b/.gitlab-ci/check-piglit-results.sh
+#!/bin/bash
+
+set -e
+set -o xtrace
+
+if [[ -z "$MESON_BUILDDIR" ]]; then
+    echo "\$MESON_BUILDDIR not set"
+    exit 1
+fi
+
+check_piglit_results ()
+{
+    local EXPECTED_RESULTS="$MESON_BUILDDIR"/test/piglit-results/$1
+    local DEPENDENCY="$MESON_BUILDDIR"/$2
+
+    if ! test -e $DEPENDENCY; then
+	return
+    fi
+
+    if test -e $EXPECTED_RESULTS; then
+	return
+    fi
+
+    echo Expected $EXPECTED_RESULTS does not exist
+    exit 1
+}
+
+check_piglit_results xephyr-glamor hw/kdrive/ephyr/Xephyr.p/ephyr_glamor.c.o
+check_piglit_results xvfb hw/vfb/Xvfb
+check_piglit_results xwayland hw/xwayland/Xwayland
--- a/.gitlab-ci/cross-i686-w64-mingw32.txt
+++ b/.gitlab-ci/cross-i686-w64-mingw32.txt
+[binaries]
+c = 'i686-w64-mingw32-gcc'
+cpp = 'i686-w64-mingw32-g++'
+ar = 'i686-w64-mingw32-ar'
+strip = 'i686-w64-mingw32-strip'
+pkgconfig = '/usr/local/bin/i686-w64-mingw32-pkg-config'
+windres = 'i686-w64-mingw32-windres'
+exe_wrapper = 'wine'
+
+[properties]
+# Directory that contains 'bin', 'lib', etc for the toolchain
+root = '/usr/i686-w64-mingw32'
+# Directory that contains 'bin', 'lib', etc which have been cross-compiled
+sys_root = '/usr/i686-w64-mingw32'
+
+[host_machine]
+system = 'windows'
+cpu_family = 'x86'
+cpu = 'i686'
+endian = 'little'
--- a/.gitlab-ci/cross-prereqs-build.sh
+++ b/.gitlab-ci/cross-prereqs-build.sh
+#!/bin/bash
+
+set -e
+set -o xtrace
+
+HOST=$1
+
+# Debian's cross-pkg-config wrappers are broken for MinGW targets, since
+# dpkg-architecture doesn't know about MinGW target triplets.
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=930492
+cat >/usr/local/bin/${HOST}-pkg-config <<EOF
+#!/bin/sh
+
+PKG_CONFIG_SYSROOT_DIR=/usr/${HOST} PKG_CONFIG_LIBDIR=/usr/${HOST}/lib/pkgconfig:/usr/${HOST}/share/pkgconfig pkg-config \$@
+EOF
+chmod +x /usr/local/bin/${HOST}-pkg-config
+
+# when cross-compiling, some autoconf tests cannot be run:
+
+# --enable-malloc0returnsnull
+export xorg_cv_malloc0_returns_null=yes
+
+build() {
+    url=$1
+    commit=$2
+    config=$3
+
+    name=$(basename ${url} .git)
+
+    if [[ $commit =~ ^[[:xdigit:]]{1,}$ ]]
+    then
+        git clone ${url} ${name}
+        git -C ${name} checkout ${commit}
+    else
+        git clone --depth 1 --branch ${commit:-master} --recurse-submodules -c advice.detachedHead=false ${url} ${name}
+    fi
+
+    pushd ${name}
+    NOCONFIGURE=1 ./autogen.sh || ./.bootstrap
+    ./configure ${config} --host=${HOST} --prefix= --with-sysroot=/usr/${HOST}/
+    make -j$(nproc)
+    DESTDIR=/usr/${HOST} make install
+
+    popd
+    rm -rf ${OLDPWD}
+}
+
+build 'https://gitlab.freedesktop.org/pixman/pixman.git' 'pixman-0.38.4'
+build 'https://gitlab.freedesktop.org/xorg/lib/pthread-stubs.git' '0.4'
+# we can't use the xorgproto pkgconfig files from /usr/share/pkgconfig, because
+# these would add -I/usr/include to CFLAGS, which breaks cross-compilation
+build 'https://gitlab.freedesktop.org/xorg/proto/xorgproto.git' 'xorgproto-2024.1' '--datadir=/lib'
+build 'https://gitlab.freedesktop.org/xorg/lib/libXau.git' 'libXau-1.0.9'
+build 'https://gitlab.freedesktop.org/xorg/proto/xcbproto.git' 'xcb-proto-1.14.1'
+build 'https://gitlab.freedesktop.org/xorg/lib/libxcb.git' 'libxcb-1.14'
+build 'https://gitlab.freedesktop.org/xorg/lib/libxtrans.git' 'xtrans-1.4.0'
+# the default value of keysymdefdir is taken from the includedir variable for
+# xproto, which isn't adjusted by pkg-config for the sysroot
+# Using -fcommon to address build failure when cross-compiling for windows.
+# See discussion at https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/913
+CFLAGS="-fcommon" build 'https://gitlab.freedesktop.org/xorg/lib/libX11.git' 'libX11-1.6.9' "--with-keysymdefdir=/usr/${HOST}/include/X11"
+build 'https://gitlab.freedesktop.org/xorg/lib/libxkbfile.git' 'libxkbfile-1.1.0'
+# freetype needs an explicit --build to know it's cross-compiling
+# disable png as freetype tries to use libpng-config, even when cross-compiling
+build 'git://git.savannah.gnu.org/freetype/freetype2.git' 'VER-2-10-1' "--build=$(cc -dumpmachine) --with-png=no"
+build 'https://gitlab.freedesktop.org/xorg//font/util.git' 'font-util-1.3.2'
+build 'https://gitlab.freedesktop.org/xorg/lib/libfontenc.git' 'libfontenc-1.1.4'
+build 'https://gitlab.freedesktop.org/xorg/lib/libXfont.git'  'libXfont2-2.0.3'
+build 'https://gitlab.freedesktop.org/xorg/lib/libXdmcp.git' 'libXdmcp-1.1.3'
+build 'https://gitlab.freedesktop.org/xorg/lib/libXfixes.git' 'libXfixes-5.0.3'
+build 'https://gitlab.freedesktop.org/xorg/lib/libxcb-util.git' 'xcb-util-0.4.1-gitlab'
+build 'https://gitlab.freedesktop.org/xorg/lib/libxcb-image.git' 'xcb-util-image-0.4.1-gitlab'
+build 'https://gitlab.freedesktop.org/xorg/lib/libxcb-wm.git' 'xcb-util-wm-0.4.2'
+
+# workaround xcb_windefs.h leaking all Windows API types into X server build
+# (some of which clash which types defined by Xmd.h) XXX: This is a bit of a
+# hack, as it makes this header depend on xorgproto. Maybe an upstreamable
+# fix would involve a macro defined in the X server (XFree86Server?
+# XCB_NO_WINAPI?), which makes xcb_windefs.h wrap things like XWinsock.h
+# does???
+sed -i s#winsock2#X11/Xwinsock# /usr/${HOST}/include/xcb/xcb_windefs.h
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
+#!/bin/bash
+
+set -e
+set -o xtrace
+
+# Packages which are needed by this script, but not for the xserver build
+EPHEMERAL="
+	libcairo2-dev
+	libexpat-dev
+	libgles2-mesa-dev
+	libxkbcommon-dev
+	x11-utils
+	x11-xserver-utils
+	xauth
+	xvfb
+	"
+
+# Add bullseye-backports for the newer linux-libc-dev & meson packages
+echo 'deb http://deb.debian.org/debian bullseye-backports main' >> /etc/apt/sources.list
+apt update
+
+apt-get install -y \
+	$EPHEMERAL \
+	autoconf \
+	automake \
+	bison \
+	build-essential \
+	ca-certificates \
+	ccache \
+	dpkg-dev \
+	flex \
+	gcc-mingw-w64-i686 \
+	git \
+	libaudit-dev \
+	libbsd-dev \
+	libcairo2 \
+	libcairo2-dev \
+	libdbus-1-dev \
+	libdrm-dev \
+	libegl1-mesa-dev \
+	libepoxy-dev \
+	libevdev2 \
+	libexpat1 \
+	libffi-dev \
+	libgbm-dev \
+	libgcrypt-dev \
+	libgl1-mesa-dev \
+	libgles2 \
+	libglx-mesa0 \
+	libinput10 \
+	libinput-dev \
+	libnvidia-egl-wayland-dev \
+	libpango1.0-0 \
+	libpango1.0-dev \
+	libpciaccess-dev \
+	libpixman-1-dev \
+	libselinux1-dev \
+	libspice-protocol-dev \
+	libsystemd-dev \
+	libtool \
+	libudev-dev \
+	libunwind-dev \
+	libwayland-dev \
+	libx11-dev \
+	libx11-xcb-dev \
+	libxau-dev \
+	libxaw7-dev \
+	libxcb-damage0-dev \
+	libxcb-dri2-0-dev \
+	libxcb-dri3-dev \
+	libxcb-glx0-dev \
+	libxcb-icccm4-dev \
+	libxcb-image0-dev \
+	libxcb-keysyms1-dev \
+	libxcb-randr0-dev \
+	libxcb-render-util0-dev \
+	libxcb-render0-dev \
+	libxcb-shape0-dev \
+	libxcb-shm0-dev \
+	libxcb-sync-dev \
+	libxcb-util0-dev \
+	libxcb-xf86dri0-dev \
+	libxcb-xinput-dev \
+	libxcb-xkb-dev \
+	libxcb-xv0-dev \
+	libxcb1-dev \
+	libxcursor-dev \
+	libxdamage-dev \
+	libxdmcp-dev \
+	libxext-dev \
+	libxfixes-dev \
+	libxfont-dev \
+	libxi-dev \
+	libxinerama-dev \
+	libxkbcommon0 \
+	libxkbfile-dev \
+	libxmu-dev \
+	libxmuu-dev \
+	libxpm-dev \
+	libxrandr-dev \
+	libxrender-dev \
+	libxres-dev \
+	libxshmfence-dev \
+	libxss-dev \
+	libxt-dev \
+	libxtst-dev \
+	libxv-dev \
+	libxvmc-dev \
+	libxxf86vm-dev \
+	libz-mingw-w64-dev \
+	linux-libc-dev/bullseye-backports \
+	mesa-common-dev \
+	meson/bullseye-backports \
+	mingw-w64-tools \
+	nettle-dev \
+	pkg-config \
+	python3-attr \
+	python3-jinja2 \
+	python3-mako \
+	python3-numpy \
+	python3-six \
+	valgrind \
+	weston \
+	x11-xkb-utils \
+	xfonts-utils \
+	xkb-data \
+	xtrans-dev \
+	xutils-dev
+
+.gitlab-ci/cross-prereqs-build.sh i686-w64-mingw32
+
+cd /root
+
+# Xwayland requires drm 2.4.116 for drmSyncobjEventfd
+git clone https://gitlab.freedesktop.org/mesa/drm --depth 1 --branch=libdrm-2.4.116
+cd drm
+meson _build
+ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
+cd ..
+rm -rf drm
+
+# xserver requires libxcvt
+git clone https://gitlab.freedesktop.org/xorg/lib/libxcvt.git --depth 1 --branch=libxcvt-0.1.0
+cd libxcvt
+meson _build
+ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
+cd ..
+rm -rf libxcvt
+
+# xserver requires xorgproto >= 2024.1 for XWAYLAND
+git clone https://gitlab.freedesktop.org/xorg/proto/xorgproto.git --depth 1 --branch=xorgproto-2024.1
+pushd xorgproto
+./autogen.sh
+make -j${FDO_CI_CONCURRENT:-4} install
+popd
+rm -rf xorgproto
+
+# wayland-protocols requires wayland-scanner 1.20, but Debian bullseye has 1.18 only
+git clone https://gitlab.freedesktop.org/wayland/wayland.git --depth 1 --branch=1.21.0
+cd wayland
+meson -Dtests=false -Ddocumentation=false -Ddtd_validation=false _build
+ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
+cd ..
+rm -rf wayland
+
+# Xwayland requires wayland-protocols >= 1.38, but Debian bullseye has 1.20 only
+git clone https://gitlab.freedesktop.org/wayland/wayland-protocols.git --depth 1 --branch=1.38
+cd wayland-protocols
+meson _build
+ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
+cd ..
+rm -rf wayland-protocols
+
+# Install libdecor for Xwayland
+git clone https://gitlab.freedesktop.org/libdecor/libdecor.git --depth 1 --branch=0.1.1
+cd libdecor
+meson _build -D{demo,install_demo}=false
+ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
+cd ..
+rm -rf libdecor
+
+# Install libei for Xwayland
+git clone https://gitlab.freedesktop.org/libinput/libei.git --depth 1 --branch=1.0.0
+cd libei
+meson setup _build -Dtests=disabled -Ddocumentation=[] -Dliboeffis=enabled
+ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
+cd ..
+rm -rf libei
+
+git clone https://gitlab.freedesktop.org/mesa/piglit.git
+cd piglit
+git checkout 265896c86f90cb72e8f218ba6a3617fca8b9a1e3
+cd ..
+
+git clone https://gitlab.freedesktop.org/xorg/test/xts
+cd xts
+git checkout 12a887c2c72c4258962b56ced7b0aec782f1ffed
+./autogen.sh
+xvfb-run make -j${FDO_CI_CONCURRENT:-4}
+cd ..
+
+git clone https://gitlab.freedesktop.org/xorg/test/rendercheck
+cd rendercheck
+git checkout 67a820621b1475ebfcf3d4f9d7f03a5fc3b9769a
+meson build
+ninja -j${FDO_CI_CONCURRENT:-4} -C build install
+cd ..
+
+rm -rf piglit/.git xts/.git piglit/tests/spec/ rendercheck/
+
+echo '[xts]' > piglit/piglit.conf
+echo 'path=/root/xts' >> piglit/piglit.conf
+
+find -name \*.a -o -name \*.o -o -name \*.c -o -name \*.h -o -name \*.la\* | xargs rm
+strip xts/xts5/*/.libs/*
+
+apt-get purge -y \
+	$EPHEMERAL
+
+apt-get autoremove -y --purge
--- a/.gitlab-ci/manpages-check
+++ b/.gitlab-ci/manpages-check
+#!/bin/sh
+
+find build/ -regex ".*\.[1-9]$" -exec grep -E \
+@vendorversion@\|\
+@xorgversion@\|\
+@xservername@\|\
+@xconfigfile@\|\
+@projectroot@\|\
+@apploaddir@\|\
+@appmansuffix@\|\
+@drivermansuffix@\|\
+@adminmansuffix@\|\
+@libmansuffix@\|\
+@miscmansuffix@\|\
+@filemansuffix@\|\
+@logdir@\|\
+@datadir@\|\
+@mandir@\|\
+@sysconfdir@\|\
+@xconfigdir@\|\
+@xkbdir@\|\
+@XKB_DFLT_RULES@\|\
+@XKB_DFLT_MODEL@\|\
+@XKB_DFLT_LAYOUT@\|\
+@XKB_DFLT_VARIANT@\|\
+@XKB_DFLT_OPTIONS@\|\
+@bundle_id_prefix@\|\
+@modulepath@\|\
+@suid_wrapper_dir@\|\
+@default_font_path@\
+ '{}' + && { echo "Missing manpage substitutions detected!" >&2 ; exit 1; }
+
+exit 0
--- a/.gitlab-ci/meson-build.sh
+++ b/.gitlab-ci/meson-build.sh
+#!/usr/bin/env bash
+#
+# This script is sourced from here:
+# https://gitlab.freedesktop.org/whot/meson-helper
+#
+# SPDX-License-Identifier: MIT
+#
+# Usage:
+#     meson-build.sh
+#       [-C directory]			... change to directory before doing anything
+#	[--skip-build]			... skip the compilation
+#	[--skip-test|--run-test]	... skip or explicitly run meson test
+#	[--skip-dist|--run-dist]	... skip or explicitly run meson dist
+#	[--skip-install|--run-install]	... skip or explicitly run meson install
+#
+#
+# Environment variables:
+#    If the .meson_environment file exists in $PWD, it is sourced at the start of the script.
+#    This file is sourced before the -C directory option takes effect.
+#
+#    MESON_BUILDDIR
+#    MESON_ARGS, MESON_EXTRA_ARGS:
+#	Args passed to meson setup. The MESON_EXTRA_ARGS exist to make it easier for
+#	callers to have a default set of arguments and a variable set of arguments.
+#    MESON_TEST_ARGS, MESON_DIST_ARGS, MESON_INSTALL_ARGS:
+#	Args passed directly to the respective meson command. If these args are set it implies
+#	--run-$cmd. Use --skip-$cmd to skip.
+#    NINJA_ARGS - args passed to ninja via meson compile
+
+set -x
+if [[ -f .meson_environment ]]; then
+	. .meson_environment
+fi
+
+# If test args are set, we assume we want to run the tests
+MESON_RUN_TEST="$MESON_TEST_ARGS"
+MESON_RUN_INSTALL="$MESON_INSTALL_ARGS"
+MESON_RUN_DIST="$MESON_DIST_ARGS"
+
+while [[ $# -gt 0 ]]; do
+	case $1 in
+		-C)
+			directory=$2
+			shift 2
+			pushd "$directory" || exit 1
+			;;
+		--skip-setup)
+			shift
+			MESON_SKIP_SETUP="1"
+			;;
+		--skip-build)
+			shift
+			MESON_SKIP_BUILD="1"
+			;;
+		--skip-test)
+			shift
+			MESON_RUN_TEST=""
+			;;
+		--run-test)
+			shift
+			MESON_RUN_TEST="1"
+			;;
+		--skip-dist)
+			shift
+			MESON_RUN_DIST=""
+			;;
+		--run-dist)
+			shift
+			MESON_RUN_DIST="1"
+			;;
+		--skip-install)
+			shift
+			MESON_RUN_INSTALL=""
+			;;
+		--run-install)
+			shift
+			MESON_RUN_INSTALL="1"
+			;;
+		*)
+			echo "Unknow commandline argument $1"
+			exit 1
+			;;
+	esac
+done
+
+if [[ -z "$MESON_BUILDDIR" ]]; then
+	echo "\$MESON_BUILDDIR undefined."
+	exit 1
+fi
+
+# emulate a few gitlab variables to make it easier to
+# run and debug locally.
+if [[ -z "$CI_JOB_ID" ]] || [[ -z "$CI_JOB_NAME" ]]; then
+	echo "Missing \$CI_JOB_ID or \$CI_JOB_NAME".
+	CI_PROJECT_NAME=$(basename "$PWD")
+	CI_JOB_ID=$(date +%s)
+	CI_JOB_NAME="$CI_PROJECT_NAME-job-local"
+	echo "Simulating gitlab environment: "
+	echo " CI_JOB_ID=$CI_JOB_ID"
+	echo " CI_JOB_NAME=$CI_JOB_NAME"
+fi
+
+if [[ -n "$FDO_CI_CONCURRENT" ]]; then
+	jobcount="-j$FDO_CI_CONCURRENT"
+	export MESON_TESTTHREADS="$FDO_CI_CONCURRENT"
+fi
+
+if [[ -n "$MESON_EXTRA_ARGS" ]]; then
+	MESON_ARGS="$MESON_ARGS $MESON_EXTRA_ARGS"
+fi
+
+echo "*************************************************"
+echo "builddir: $MESON_BUILDDIR"
+echo "meson args: $MESON_ARGS"
+echo "ninja args: $NINJA_ARGS"
+echo "meson test args: $MESON_TEST_ARGS"
+echo "job count: ${jobcount-0}"
+echo "*************************************************"
+
+set -e
+
+if [[ -z "$MESON_SKIP_SETUP" ]]; then
+	rm -rf "$MESON_BUILDDIR"
+	meson setup "$MESON_BUILDDIR" $MESON_ARGS
+fi
+meson configure "$MESON_BUILDDIR"
+
+if [[ -z "$MESON_SKIP_BUILD" ]]; then
+	if [[ -n "$NINJA_ARGS" ]]; then
+		ninja_args="--ninja-args $NINJA_ARGS"
+	fi
+	meson compile -v -C "$MESON_BUILDDIR" $jobcount $ninja_args
+fi
+
+if [[ -n "$MESON_RUN_TEST" ]]; then
+	meson test -C "$MESON_BUILDDIR" --print-errorlogs $MESON_TEST_ARGS
+fi
+
+if [[ -n "$MESON_RUN_INSTALL" ]]; then
+	meson install --no-rebuild  -C "$MESON_BUILDDIR" $MESON_INSTALL_ARGS
+fi
+
+if [[ -n "$MESON_RUN_DIST" ]]; then
+	meson dist -C "$MESON_BUILDDIR" $MESON_DIST_ARGS
+fi
--- a/.mailmap
+++ b/.mailmap
+Adam Jackson <ajax@redhat.com> <ajax@aspartame.nwnk.net>
+Adam Jackson <ajax@redhat.com> <ajax@benzedrine.nwnk.net>
+Adam Jackson <ajax@redhat.com> <ajax@nwnk.net>
+Adam Jackson <ajax@redhat.com> <ajax@theobromine.nwnk.net>
+
+Adam Tkac <atkac@redhat.com> <vonsch@gmail.com>
+
+Alan Coopersmith <alan.coopersmith@oracle.com> <alan.coopersmith@sun.com>
+Alan Coopersmith <alan.coopersmith@oracle.com> <alanc@alf.(none)>
+
+Alan Hourihane <alanh@vmware.com> <alanh@fairlite.demon.co.uk>
+Alan Hourihane <alanh@vmware.com> <alanh@tungstengraphics.com>
+
+Alex Deucher <alexdeucher@gmail.com> <agd5f@yahoo.com>
+Alex Deucher <alexdeucher@gmail.com> <alex@botch2.(none)>
+Alex Deucher <alexdeucher@gmail.com> <alex@botch2.com>
+Alex Deucher <alexdeucher@gmail.com> <alex@cube.(none)>
+Alex Deucher <alexdeucher@gmail.com> <alex@samba.(none)>
+Alex Deucher <alexdeucher@gmail.com> <alexander.deucher@amd.com>
+
+Alexandr Shadchin <alexandr.shadchin@gmail.com> <Alexandr.Shadchin@gmail.com>
+
+Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> <ander@mandriva.com.br>
+
+Arjan van de Ven <arjan@infradead.org> <arjan@linux.intel.com>
+
+Arkadiusz Miśkiewicz <arekm@maven.pl>
+
+Axel Davy <davyaxel0@gmail.com> <axel.davy@ens.fr>
+
+Bart Trojanowski <bart@jukie.net> <bart@symbio-technologies.com>
+
+Ben Byer <bbyer@apple.com> <bbyer@bbyer.(none)>
+Ben Byer <bbyer@apple.com> <bbyer@bbyer.apple.com>
+Ben Byer <bbyer@apple.com> <bbyer@bbyer.local>
+Ben Byer <bbyer@apple.com> <bbyer@bushing.apple.com>
+Ben Byer <bbyer@apple.com> <bbyer@freedesktop.org>
+Ben Byer <bbyer@apple.com> <bbyer@xyzzy.local>
+
+Ben Gamari <bgamari.foss@gmail.com> <bgamari@gmail.com>
+
+Ben Skeggs <bskeggs@redhat.com> <skeggsb@gmail.com>
+
+Benjamin Close <benjamin.close@clearchain.com> <Benjamin.Close@clearchain.com>
+
+Benjamin Tissoires <benjamin.tissoires@gmail.com> <tissoire@cena.fr>
+
+Brian Paul <brianp@vmware.com> Brian <brian@i915.localnet.net>
+Brian Paul <brianp@vmware.com> Brian <brian@yutani.localnet.net>
+Brian Paul <brianp@vmware.com> <brian.paul@tungstengraphics.com>
+
+Brice Goglin <bgoglin@debian.org> <brice.goglin@ens-lyon.org>
+
+Carl Worth <cworth@cworth.org> <cworth@samich.home.cworth.org>
+Carl Worth <cworth@cworth.org> <root@samich.home.cworth.org>
+
+Chase Douglas <chase.douglas@canonical.com> <chase.douglas@ubuntu.com>
+Chase Douglas <chase.douglas@canonical.com> <chasedouglas@gmail.com>
+
+Christian König <christian.koenig@amd.com> <christian.koenig at amd.com>
+
+Colin Guthrie <gmane@colin.guthr.ie> <cguthrie@mandriva.org>
+
+Colin Harrison <colin@xming.myzen.co.uk> <colin.harrison-at-virgin.net>
+Colin Harrison <colin@xming.myzen.co.uk> <colin.harrison@virgin.net>
+
+Dan Nicholson <dbn.lists@gmail.com> <dan@conor.dwcab.com>
+
+Daniel Drake <drake@endlessm.com> <d.drake@mmm.com>
+Daniel Drake <drake@endlessm.com> <dsd@gentoo.org>
+Daniel Drake <drake@endlessm.com> <dsd@laptop.org>
+
+Daniel Martin <consume.noise@gmail.com> <daniel.martin@secunet.com>
+
+Daniel Stone <daniels@collabora.com> <daniel.stone@nokia.com>
+Daniel Stone <daniels@collabora.com> <daniel@fooishbar.org>
+
+Dave Airlie <airlied@redhat.com> <airlied@clockmaker.usersys.redhat.com>
+Dave Airlie <airlied@redhat.com> <airlied@gmail.com>
+Dave Airlie <airlied@redhat.com> <airlied@linux.ie>
+Dave Airlie <airlied@redhat.com> <airlied@panoply-rh.(none)>
+Dave Airlie <airlied@redhat.com> <airlied@pegasus.(none)>
+
+David Heidelberg <david@ixit.cz> David Heidelberger <david.heidelberger@ixit.cz>
+
+David Miller <davem@davemloft.net>
+
+David Nusinow <dnusinow@debian.org> <david@nee.(none)>
+
+David Reveman <reveman@chromium.org> <c99drn@cs.umu.se>
+David Reveman <reveman@chromium.org> <davidr@novell.com>
+
+Demi Marie Obenour <demiobenour@gmail.com> <demi@invisiblethingslab.com>
+
+Dodji Seketeli <dodji@seketeli.org> <dodji@openedhand.com>
+
+Donnie Berkholz <dberkholz@gentoo.org> <donnie@supernova.(none)>
+Donnie Berkholz <dberkholz@gentoo.org> <spyderous@gentoo.org>
+
+Drew Parsons <dparsons@debian.org> <drew@emerall.com>
+Drew Parsons <dparsons@debian.org> <drew@pug.localdomain>
+
+Eamon Walsh <ewalsh@tycho.nsa.gov> <efw@eamonwalsh.com>
+Eamon Walsh <ewalsh@tycho.nsa.gov> <ewalsh@epoch.ncsc.mil>
+Eamon Walsh <ewalsh@tycho.nsa.gov> <ewalsh@moss-huskies.epoch.ncsc.mil>
+Eamon Walsh <ewalsh@tycho.nsa.gov> <ewalsh@moss-uranus.epoch.ncsc.mil>
+
+Egbert Eich <eich@suse.de> <eich@freedesktop.org>
+Egbert Eich <eich@suse.de> <eich@ovid.suse.de>
+Egbert Eich <eich@suse.de> <eich@pdx.freedesktop.org>
+
+Emil Velikov <emil.l.velikov@gmail.com> <emil.velikov@collabora.com>
+
+Emma Anholt <emma@anholt.net> <anholt@FreeBSD.org>
+Emma Anholt <emma@anholt.net> <eric@anholt.net>
+
+Eric Engestrom <eric@igalia.com> <eric@engestrom.ch>
+Eric Engestrom <eric@igalia.com> <eric.engestrom@imgtec.com>
+
+Éric Piel <eric.piel@trempin-utc.net>
+Éric Piel <eric.piel@trempin-utc.net> <E.A.B.Piel@tudelft.nl>
+
+Erik Andrén <erik.andren@gmail.com>
+
+Faith Ekstrand <faith.ekstrand@collabora.com> <jason@jlekstrand.net>
+Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@intel.com>
+Faith Ekstrand <faith.ekstrand@collabora.com> <faith@gfxstrand.net>
+
+Felix Kuehling <felix.kuehling@amd.com> <fxkuehl@gmx.de>
+
+François Tigeot <ftigeot@wolfpond.org>
+
+George Sapountzis <gsapountzis@gmail.com> <gsap7@yahoo.gr>
+
+George Staplin <gstaplin@apple.com> <gps@Georges-Workstation.local>
+George Staplin <gstaplin@apple.com> <georgestaplin@george-staplins-mac-pro.local>
+
+Haihao Xiang <haihao.xiang@intel.com>
+
+Hans de Goede <hdegoede@redhat.com>
+Hans de Goede <hdegoede@redhat.com> <j.w.r.degoede@hhs.nl>
+
+Henry Zhao <henry.zhao@oracle.com> <henryz@localhost.localdomain>
+
+Ian Romanick <ian.d.romanick@intel.com> <idr@localhost.localdomain>
+Ian Romanick <ian.d.romanick@intel.com> <idr@umwelt.(none)>
+Ian Romanick <ian.d.romanick@intel.com> <idr@us.ibm.com>
+
+Jan Beich <jbeich@freebsd.org> <jbeich@FreeBSD.org>
+
+Jay Cotton <jay.cotton@oracle.com> <jay.cotton@sun.com>
+
+Jeffrey Smith <whydoubt@gmail.com>
+Jeffrey Smith <whydoubt@gmail.com> <whydoubt@yahoo.com>
+
+Jeremy C. Reed <reed@glacier.reedmedia.net> <reed@reedmedia.net>
+
+Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Jeremy Huddleston Sequoia <jeremyhu@apple.com> <jeremy@dhcp-38-248.EECS.Berkeley.EDU>
+Jeremy Huddleston Sequoia <jeremyhu@apple.com> <jeremy@tifa-2.local>
+Jeremy Huddleston Sequoia <jeremyhu@apple.com> <jeremy@tifa.local>
+Jeremy Huddleston Sequoia <jeremyhu@apple.com> <jeremy@yuffie.local>
+Jeremy Huddleston Sequoia <jeremyhu@apple.com> <jeremyhu@freedesktop.org>
+
+Jeremy Uejio <jeremy.uejio@oracle.com> <jeremy.uejio@sun.com>
+
+Jerome Glisse <jglisse@redhat.com> <glisse@freedesktop.org>
+
+Jesse Adkins <jesserayadkins@gmail.com> <jesse_adkins7@yahoo.com>
+
+Jesse Barnes <jesse.barnes@intel.com> <jbarnes@jbarnes-mobile.amr.corp.intel.com>
+Jesse Barnes <jesse.barnes@intel.com> <jbarnes@jbarnes-t61.(none)>
+Jesse Barnes <jesse.barnes@intel.com> <jbarnes@nietzche.virtuousgeek.org>
+Jesse Barnes <jesse.barnes@intel.com> <jbarnes@virtuousgeek.org>
+
+Joel Bosveld <joel.bosveld@gmail.com> <Joel.Bosveld@gmail.com>
+
+John Tapsell <johnflux@gmail.com> <john.tapsell@john-desktop.(none)>
+
+Jon Turney <jon.turney@dronecode.org.uk>
+
+Julien Isorce <j.isorce@samsung.com> <julien.isorce@gmail.com>
+
+Keith Packard <keithp@keithp.com> <keithp@dulcimer.keithp.com>
+Keith Packard <keithp@keithp.com> <keithp@guitar.keithp.com>
+Keith Packard <keithp@keithp.com> <keithp@koto.keithp.com>
+Keith Packard <keithp@keithp.com> <keithp@mandolin.keithp.com>
+Keith Packard <keithp@keithp.com> <keithp@neko.keithp.com>
+Keith Packard <keithp@keithp.com> <keithp@ukulele.keithp.com>
+Keith Packard <keithp@keithp.com> <keithp@viola.jf.intel.com>
+
+Kevin E Martin <kem@redhat.com> <kem@freedesktop.org>
+Kevin E Martin <kem@redhat.com> <kem@kem.org>
+
+Kristian Høgsberg <krh@bitplanet.net>
+Kristian Høgsberg <krh@bitplanet.net> <krh@redhat.com>
+Kristian Høgsberg <krh@bitplanet.net> <krh@sasori.boston.redhat.com>
+Kristian Høgsberg <krh@bitplanet.net> <krh@temari.boston.redhat.com>
+
+Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br> <lbsousajr@gmail.com>
+
+Lina Versace <lina@kiwitree.net> <chad.versace@linux.intel.com>
+
+Lucas Stach <dev@lynxeye.de> <l.stach@pengutronix.de>
+
+Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
+Łukasz Spintzyk <lukasz.spintzyk@synaptics.com> <lukasz.spintzyk@gmail.com>
+
+Lyude Paul <lyude@redhat.com>
+Lyude Paul <lyude@redhat.com> <cpaul@redhat.com>
+
+Maarten Lankhorst <maarten.lankhorst@ubuntu.com> <dev@mblankhorst.nl>
+Maarten Lankhorst <maarten.lankhorst@ubuntu.com> <maarten.lankhorst@canonical.com>
+
+Marc Aurele La France <tsi@ualberta.ca> <tsi@ualberta.edu>
+
+Mario Kleiner <mario.kleiner.de@gmail.com> <mario.kleiner@tuebingen.mpg.de>
+
+Mark Kettenis <kettenis@openbsd.org> <mark.kettenis@xs4all.nl>
+
+Matthew Allum <mallum@openedhand.com> <breakfast@10.am>
+Matthew Allum  <mallum@openedhand.com> <mallum@polystyrene.(none)>
+
+Matthieu Herrb <matthieu@herrb.eu> <matthieu.herrb@laas.fr>
+Matthieu Herrb <matthieu@herrb.eu> <matthieu@bluenote.herrb.com>
+Matthieu Herrb <matthieu@herrb.eu> <matthieu@blues.laas.fr>
+Matthieu Herrb <matthieu@herrb.eu> <matthieu@crux.(none)>
+Matthieu Herrb <matthieu@herrb.eu> <matthieu@deville.herrb.com>
+Matthieu Herrb <matthieu@herrb.eu> <matthieu@laas.fr>
+Matthieu Herrb <matthieu@herrb.eu> <matthieu@roadrock.(none)>
+
+Max Schwarz <Max@x-quadraht.de> <max.schwarz@online.de>
+
+Maya Rashish <maya@NetBSD.org>
+Maya Rashish <maya@NetBSD.org> <coypu@sdf.org>
+
+Michal Srb <msrb@suse.com> <msrb@novell.com>
+
+Michal Suchanek <hramrach@gmail.com> <hramrach@centrum.cz>
+
+Michał Górny <gentoo@mgorny.alt.pl>
+Michał Górny <gentoo@mgorny.alt.pl> <mgorny@gentoo.org>
+
+Michael Vogt <mvo@ubuntu.com> <michael.vogt@ubuntu.com>
+
+Michel Dänzer <michel@daenzer.net>
+Michel Dänzer <michel@daenzer.net> <daenzer@debian.org>
+Michel Dänzer <michel@daenzer.net> <daenzer@vmware.com>
+Michel Dänzer <michel@daenzer.net> <mdaenzer@redhat.com>
+Michel Dänzer <michel@daenzer.net> <michel.daenzer@amd.com>
+Michel Dänzer <michel@daenzer.net> <michel@tungstengraphics.com>
+
+Michele Baldessari <michele@redhat.com> <michele@acksyn.org>
+
+Neil Roberts <nroberts@igalia.com> <neil@linux.intel.com>
+
+nerdopolis <bluescreen_avenger@verizon.net> nerdopolis <rbos@rbos>
+
+Nicolai Hähnle <nicolai.haehnle@amd.com>
+Nicolai Hähnle <nicolai.haehnle@amd.com> <nhaehnle@gmail.com>
+
+Niveditha Rau <niveditha.rau@oracle.com> <niveditha.rau@sun.com>
+
+Oliver McFadden <oliver.mcfadden@linux.intel.com> <oliver.mcfadden@nokia.com>
+
+Olivier Fourdan <ofourdan@redhat.com> <fourdan@xfce.org>
+
+Owen W. Taylor <otaylor@fishsoup.net>
+Owen W. Taylor <otaylor@fishsoup.net> <otaylor@huygens.home.fishsoup.net>
+Owen W. Taylor <otaylor@fishsoup.net> <otaylor@redhat.com>
+
+Pauli Nieminen <pauli.nieminen@linux.intel.com> <ext-pauli.nieminen@nokia.com>
+
+Paulo Zanoni <paulo.r.zanoni@intel.com> Paulo Ricardo Zanoni <prz05@c3sl.ufpr.br>
+Paulo Zanoni <paulo.r.zanoni@intel.com> Paulo Ricardo Zanoni <pzanoni@mandriva.com>
+
+Pekka Paalanen <pekka.paalanen@collabora.co.uk> <pekka.paalanen@collabora.com>
+
+Peter Harris <pharris@opentext.com> <peter.harris@hummingbird.com>
+
+Peter Hutterer <peter.hutterer@who-t.net> <peter.hutterer@redhat.com>
+Peter Hutterer <peter.hutterer@who-t.net> <peter@cs.unisa.edu.au>
+Peter Hutterer <peter.hutterer@who-t.net> <whot@potoroo.wearablelab.ml.unisa.edu.au>
+Peter Hutterer <peter.hutterer@who-t.net> rpm-build <rpm-build>
+
+Pierre Willenbrock <pierre@pirsoft.de> <pierre@pirsoft.dnsalias.org>
+
+Qiang Yu <yuq825@gmail.com> <Qiang.Yu@amd.com>
+
+Rami Ylimaki <rami.ylimaki@vincit.fi>
+Rami Ylimaki <rami.ylimaki@vincit.fi> <ext-rami.ylimaki@nokia.com>
+
+Rémi Cardona <remi@gentoo.org>
+Rémi Cardona <remi@gentoo.org> <remi.cardona@lri.fr>
+
+Rob Clark <robclark@freedesktop.org> <robdclark@gmail.com>
+
+Roland Bär <roland@verifysoft.de>
+
+Roland Scheidegger <sroland@vmware.com> <rscheidegger_lists@hispeed.ch>
+Roland Scheidegger <sroland@vmware.com> <sroland@tungstengraphics.com>
+
+Roman Gilg <subdiff@gmail.com>
+Roman Kapl <code@rkapl.cz>
+
+Ross Burton <ross.burton@intel.com> <ross@burtonini.com>
+Ross Burton <ross.burton@intel.com> <ross@linux.intel.com>
+
+Sam Lau <sam.lau@oracle.com> <sam.lau@sun.com>
+
+Simon Farnsworth <simon.farnsworth@onelan.com> <simon.farnsworth@onelan.co.uk>
+
+Sjoerd Simons <sjoerd@collabora.com> <sjoerd.simons@collabora.co.uk>
+
+Søren Sandmann Pedersen <sandmann@redhat.com>
+Søren Sandmann Pedersen <sandmann@redhat.com> <soren.sandmann@gmail.com>
+Søren Sandmann Pedersen <sandmann@redhat.com> <sandmann@daimi.au.dk>
+Søren Sandmann Pedersen <sandmann@redhat.com> <ssp@l3000.localdomain>
+Søren Sandmann Pedersen <sandmann@redhat.com> <ssp@redhat.com>
+Søren Sandmann Pedersen <sandmann@redhat.com> <ssp@dhcp83-218.boston.redhat.com>
+
+Stuart Kreitman <stuart.kreitman@oracle.com> <stuart.kreitman@sun.com>
+
+Thierry Reding <treding@nvidia.com> <thierry.reding@avionic-design.de>
+Thierry Reding <treding@nvidia.com> <thierry.reding@gmail.com>
+
+Thomas Hellstrom <thellstrom@vmware.com> <thomas-at-tungstengraphics-dot-com>
+Thomas Hellstrom <thellstrom@vmware.com> <thomas-at-tungstengraphics.com>
+Thomas Hellstrom <thellstrom@vmware.com> <unichrome@shipmail.org>
+
+Thomas Jaeger <thjaeger@gmail.com> <ThJaeger@gmail.com>
+
+Tiago Vignatti <tiago.vignatti@nokia.com>
+Tiago Vignatti <tiago.vignatti@nokia.com> <tiago.vignatti@Nokia.com>
+Tiago Vignatti <tiago.vignatti@nokia.com> <tiagov@balalaika.(none)>
+Tiago Vignatti <tiago.vignatti@nokia.com> <tv02@c3sl.ufpr.br>
+Tiago Vignatti <tiago.vignatti@nokia.com> <vignatti@c3sl.ufpr.br>
+
+Timo Aaltonen <tjaalton@debian.org> <tjaalton@cc.hut.fi>
+Timo Aaltonen <tjaalton@debian.org> <tjaalton@ubuntu.com>
+
+Tomas Carnecky <tomas.carnecky@gmail.com> <tom@dbservice.com>
+
+Tormod Volden <debian.tormod@gmail.com> <lists.tormod@gmail.com>
+Tormod Volden <debian.tormod@gmail.com> <bugzi06.fdo.tormod@xoxy.net>
+
+Ville Syrjälä <ville.syrjala@linux.intel.com>
+Ville Syrjälä <ville.syrjala@linux.intel.com> <syrjala@sci.fi>
+Ville Syrjälä <ville.syrjala@linux.intel.com> <ville.syrjala@nokia.com>
+
+Yuriy Vasilev <uuvasiliev@yandex.ru>
+
+Zack Rusin <zackr@vmware.com> <zack@kde.org>
+Zack Rusin <zackr@vmware.com> <zack@tungstengraphics.com>
+
+Zephaniah E. Hull <warp@aehallh.com> <warp@agamemnon.b5>
+
+Zhenyu Wang <zhenyuw@linux.intel.com> <zhenyu.z.wang@intel.com>
+
+Zhigang Gong <zhigang.gong@intel.com> <zhigang.gong@gmail.com>
+Zhigang Gong <zhigang.gong@intel.com> <zhigang.gong@linux.intel.com>
+
+Zoltán Böszörményi <zboszor@gmail.com>
+Zoltán Böszörményi <zboszor@gmail.com> <zboszor@pr.hu>
--- a/.travis.yml
+++ b/.travis.yml
 language: c
-cache: ccache
+cache:
+    ccache: true
+    directories:
+        - $HOME/Library/Caches/Homebrew
 branches:
    except:
        - /appveyor.*/

+os: osx
+osx_image: xcode9.2
+
 matrix:
  include:
-    - os: linux
-      dist: trusty
-      services: docker
-      env: DISTRO=rawhide:v5
-    - os: osx
-      osx_image: xcode9.2
-      env: DISTRO=xcode9.2
+    - env: TOOL=meson
+    - env: TOOL=autotools

 install:
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache ; fi
-
-before_script:
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull nwnk/xserver-travis-$DISTRO ; fi
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM nwnk/xserver-travis-$DISTRO > Dockerfile ; fi
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile ; fi
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit . ; fi
+    - brew update
+    - HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache meson

 script:
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run --volume $HOME/.ccache:/root/.ccache withgit /bin/sh -c "cd /root && ./test/scripts/build-travis-deps.sh" ; fi
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./test/scripts/build-travis-osx.sh ; fi
+    - ./test/scripts/build-travis-osx.sh $TOOL
    - ccache -s
+
+before_cache:
+    - brew cleanup
--- a/Makefile.am
+++ b/Makefile.am
-AUTOMAKE_OPTIONS=nostdinc
-
-# Required for automake < 1.14
-ACLOCAL_AMFLAGS = -I m4
-
-if COMPOSITE
-COMPOSITE_DIR=composite
-endif
-
-if GLX
-GLX_DIR=glx
-endif
-
-if DBE
-DBE_DIR=dbe
-endif
-
-if RECORD
-RECORD_DIR=record
-endif
-
-if DRI3
-DRI3_DIR=dri3
-endif
-
-if PRESENT
-PRESENT_DIR=present
-endif
-
-if PSEUDORAMIX
-PSEUDORAMIX_DIR=pseudoramiX
-endif
-
-if GLAMOR
-GLAMOR_DIR=glamor
-endif
-
-SUBDIRS = \
-	doc \
-	man \
-	include \
-	dix  \
-	fb \
-	mi \
-	Xext \
-	miext \
-	os \
-	randr \
-	render  \
-	Xi \
-	xkb \
-	$(PSEUDORAMIX_DIR) \
-	$(DBE_DIR) \
-	$(RECORD_DIR) \
-	xfixes \
-	damageext \
-	$(COMPOSITE_DIR) \
-	$(GLX_DIR) \
-	$(PRESENT_DIR) \
-	$(DRI3_DIR) \
-	exa \
-	$(GLAMOR_DIR) \
-	config \
-	hw \
-	test
-
-if XORG
-aclocaldir = $(datadir)/aclocal
-aclocal_DATA = xorg-server.m4
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xorg-server.pc
-endif
-
-EXTRA_DIST = xorg-server.pc.in xorg-server.m4 autogen.sh
-
-DISTCHECK_CONFIGURE_FLAGS=\
-	--with-xkb-path=$(XKB_BASE_DIRECTORY) \
-	--with-xkb-bin-directory=$(XKB_BIN_DIRECTORY) \
-	--with-xkb-output='$${datadir}/X11/xkb/compiled'
-
-.PHONY: ChangeLog INSTALL
-
-INSTALL:
-	$(INSTALL_CMD)
-
-ChangeLog:
-	$(CHANGELOG_CMD)
-
-dist-hook: ChangeLog INSTALL
-
-DIST_SUBDIRS = \
-	doc \
-	man \
-	include \
-	dix  \
-	fb \
-	mi \
-	Xext \
-	miext \
-	os \
-	pseudoramiX \
-	randr \
-	render  \
-	Xi \
-	xkb \
-	dbe \
-	record \
-	xfixes \
-	damageext \
-	composite \
-	glx \
-	exa \
-	glamor \
-	config \
-	dri3 \
-	present \
-	hw \
-	test
-
-# gross hack
-relink: all
-	$(AM_V_at)$(MAKE) -C hw relink
-
-install-headers: Makefile
-	+find . -name Makefile | while read m; do			\
-		if grep -q install-sdkHEADERS $$m; then			\
-			(cd `dirname "$$m"` && make install-sdkHEADERS)	\
-		fi							\
-	done
-
-distcheck-hook:
-	cd $(srcdir) && \
-	meson setup _distcheck_build && \
-	meson configure _distcheck_build && \
-	ninja -C _distcheck_build && \
-	rm -rf _distcheck_build && \
-	cd -
-
-EXTRA_DIST += \
-	meson_options.txt \
-	include/xorg-config.h.meson.in \
-	include/xwin-config.h.meson.in \
-	hw/xfree86/loader/symbol-test.c \
-	hw/xfree86/common/xf86Build.sh \
-	composite/meson.build \
-	config/meson.build \
-	damageext/meson.build \
-	dbe/meson.build \
-	dix/meson.build \
-	dri3/meson.build \
-	exa/meson.build \
-	fb/meson.build \
-	glamor/meson.build \
-	glx/meson.build \
-	hw/dmx/config/meson.build \
-	hw/dmx/examples/meson.build \
-	hw/dmx/glxProxy/meson.build \
-	hw/dmx/input/meson.build \
-	hw/dmx/meson.build \
-	hw/kdrive/ephyr/meson.build \
-	hw/kdrive/meson.build \
-	hw/kdrive/src/meson.build \
-	hw/meson.build \
-	hw/vfb/meson.build \
-	hw/xfree86/common/meson.build \
-	hw/xfree86/ddc/meson.build \
-	hw/xfree86/dixmods/meson.build \
-	hw/xfree86/dri2/meson.build \
-	hw/xfree86/dri/meson.build \
-	hw/xfree86/drivers/modesetting/meson.build \
-	hw/xfree86/exa/meson.build \
-	hw/xfree86/fbdevhw/meson.build \
-	hw/xfree86/glamor_egl/meson.build \
-	hw/xfree86/i2c/meson.build \
-	hw/xfree86/int10/meson.build \
-	hw/xfree86/loader/meson.build \
-	hw/xfree86/meson.build \
-	hw/xfree86/modes/meson.build \
-	hw/xfree86/os-support/meson.build \
-	hw/xfree86/parser/meson.build \
-	hw/xfree86/ramdac/meson.build \
-	hw/xfree86/shadowfb/meson.build \
-	hw/xfree86/vbe/meson.build \
-	hw/xfree86/vgahw/meson.build \
-	hw/xfree86/x86emu/meson.build \
-	hw/xfree86/xkb/meson.build \
-	hw/xnest/meson.build \
-	hw/xquartz/meson.build \
-	hw/xwayland/meson.build \
-	hw/xwin/dri/meson.build \
-	hw/xwin/glx/meson.build \
-	hw/xwin/meson.build \
-	hw/xwin/winclipboard/meson.build \
-	include/meson.build \
-	meson.build \
-	miext/damage/meson.build \
-	miext/shadow/meson.build \
-	miext/sync/meson.build \
-	mi/meson.build \
-	os/meson.build \
-	present/meson.build \
-	pseudoramiX/meson.build \
-	randr/meson.build \
-	record/meson.build \
-	render/meson.build \
-	test/bigreq/meson.build \
-	test/bigreq/request-length.c \
-	test/meson.build \
-	test/sync/meson.build \
-	test/sync/sync.c \
-	Xext/meson.build \
-	xfixes/meson.build \
-	Xi/meson.build \
-	xkb/meson.build
--- a/README
+++ b/README
-					X Server
+X Server
+--------

 The X server accepts requests from client applications to create windows,
 which are (normally rectangular) "virtual screens" that the client program
@@ -16,29 +17,19 @@ https://en.wikipedia.org/wiki/X_server
 All questions regarding this software should be directed at the
 Xorg mailing list:

-        https://lists.freedesktop.org/mailman/listinfo/xorg
+  https://lists.freedesktop.org/mailman/listinfo/xorg

-Please submit bug reports to the Xorg bugzilla:
+The primary development code repository can be found at:

-        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
-        git://anongit.freedesktop.org/git/xorg/xserver
-
-        https://cgit.freedesktop.org/xorg/xserver
+  https://gitlab.freedesktop.org/xorg/xserver

 For patch submission instructions, see:

-	https://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
-        https://wiki.x.org/wiki/GitPage
+  https://www.x.org/wiki/Development/Documentation/SubmittingPatches

 As with other projects hosted on freedesktop.org, X.Org follows its
 Code of Conduct, based on the Contributor Covenant. Please conduct
 yourself in a respectful and civilized manner when using the above
 mailing lists, bug trackers, etc:

-	https://www.freedesktop.org/wiki/CodeOfConduct
+  https://www.freedesktop.org/wiki/CodeOfConduct
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
-noinst_LTLIBRARIES = libXext.la libXvidmode.la
-
-AM_CFLAGS = $(DIX_CFLAGS)
-
-if XORG
-sdk_HEADERS = xvdix.h xvmcext.h geext.h geint.h shmint.h syncsdk.h
-endif
-
-# Sources always included in libXextbuiltin.la, libXext.la
-BUILTIN_SRCS =			\
-	bigreq.c		\
-        geext.c			\
-	shape.c			\
-	sleepuntil.c		\
-	sleepuntil.h		\
-	sync.c			\
-	syncsdk.h		\
-	syncsrv.h		\
-	xcmisc.c		\
-	xtest.c
-BUILTIN_LIBS =
-
-# Optional sources included if extension enabled by configure.ac rules
-
-# MIT Shared Memory extension
-MITSHM_SRCS = shm.c shmint.h
-if MITSHM
-BUILTIN_SRCS += $(MITSHM_SRCS)
-endif
-
-# XVideo extension
-XV_SRCS = xvmain.c xvdisp.c xvmc.c xvdix.h xvmcext.h xvdisp.h
-if XV
-BUILTIN_SRCS  += $(XV_SRCS)
-endif
-
-# XResource extension: lets clients get data about per-client resource usage
-RES_SRCS = hashtable.c hashtable.h xres.c
-if RES
-BUILTIN_SRCS  += $(RES_SRCS)
-endif
-
-# MIT ScreenSaver extension
-SCREENSAVER_SRCS = saver.c
-if SCREENSAVER
-BUILTIN_SRCS  += $(SCREENSAVER_SRCS)
-endif
-
-# Xinerama extension: making multiple video devices act as one virtual screen
-XINERAMA_SRCS = panoramiX.c panoramiX.h panoramiXh.h panoramiXsrv.h panoramiXprocs.c panoramiXSwap.c 
-if XINERAMA
-BUILTIN_SRCS += $(XINERAMA_SRCS)
-if XORG
-sdk_HEADERS += panoramiXsrv.h panoramiX.h
-endif
-endif
-
-# X-ACE extension: provides hooks for building security policy extensions
-# like XC-Security, X-SELinux & XTSol
-XACE_SRCS = xace.c xace.h xacestr.h
-if XACE
-BUILTIN_SRCS += $(XACE_SRCS)
-if XORG
-sdk_HEADERS += xace.h xacestr.h
-endif
-endif
-
-# SELinux extension: provides SELinux policy support for X objects
-# requires X-ACE extension
-XSELINUX_SRCS = xselinux_ext.c xselinux_hooks.c xselinux_label.c xselinux.h xselinuxint.h
-if XSELINUX
-BUILTIN_SRCS += $(XSELINUX_SRCS)
-BUILTIN_LIBS += $(SELINUX_LIBS)
-endif
-
-# Security extension: multi-level security to protect clients from each other
-XCSECURITY_SRCS = security.c securitysrv.h
-if XCSECURITY   
-BUILTIN_SRCS += $(XCSECURITY_SRCS)
-endif
-
-# XF86 Big Font extension
-BIGFONT_SRCS = xf86bigfont.c xf86bigfontsrv.h
-if XF86BIGFONT
-BUILTIN_SRCS += $(BIGFONT_SRCS)
-endif
-
-# DPMS extension
-DPMS_SRCS = dpms.c dpmsproc.h
-if DPMSExtension
-BUILTIN_SRCS += $(DPMS_SRCS)
-endif
-
-# Now take all of the above, mix well, bake for 10 minutes and get libXext*.la
-
-libXext_la_SOURCES =		$(BUILTIN_SRCS)
-libXext_la_LIBADD =		$(BUILTIN_LIBS)
-
-# XVidMode extension
-libXvidmode_la_SOURCES = vidmode.c
-
-EXTRA_DIST = \
-	$(MITSHM_SRCS) \
-	$(XV_SRCS) \
-	$(RES_SRCS) \
-	$(SCREENSAVER_SRCS) \
-	$(XACE_SRCS) \
-	$(XCSECURITY_SRCS) \
-	$(XSELINUX_SRCS) \
-	$(XINERAMA_SRCS) \
-	$(BIGFONT_SRCS) \
-	$(DPMS_SRCS) \
-        $(GE_SRCS)
-
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -26,19 +26,20 @@ from The Open Group.

 */

-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif

 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/bigreqsproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
-#include <X11/extensions/bigreqsproto.h>
 #include "opaque.h"
-#include "extinit.h"
+#include "extinit_priv.h"

 static int
 ProcBigReqDispatch(ClientPtr client)
@@ -46,9 +47,6 @@ ProcBigReqDispatch(ClientPtr client)
    REQUEST(xBigReqEnableReq);
    xBigReqEnableReply rep;

-    if (client->swapped) {
-        swaps(&stuff->length);
-    }
    if (stuff->brReqType != X_BigReqEnable)
        return BadRequest;
    REQUEST_SIZE_MATCH(xBigReqEnableReq);

--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -26,12 +26,14 @@ Equipment Corporation.

 ******************************************************************/

-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif

 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "os/screensaver.h"
+#include "Xext/geext.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -39,9 +41,12 @@ Equipment Corporation.
 #include "opaque.h"
 #include <X11/extensions/dpmsproto.h>
 #include "dpmsproc.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
+#include "protocol-versions.h"
+
+Bool noDPMSExtension = FALSE;

 CARD16 DPMSPowerLevel = 0;
 Bool DPMSDisabledSwitch = FALSE;
@@ -50,6 +55,178 @@ CARD32 DPMSSuspendTime = -1;
 CARD32 DPMSOffTime = -1;
 Bool DPMSEnabled;

+static int DPMSReqCode = 0;
+static RESTYPE ClientType, DPMSEventType;  /* resource types for event masks */
+static XID eventResource;
+
+typedef struct _DPMSEvent *DPMSEventPtr;
+typedef struct _DPMSEvent {
+    DPMSEventPtr next;
+    ClientPtr client;
+    XID clientResource;
+    unsigned int mask;
+} DPMSEventRec;
+
+ /*ARGSUSED*/ static int
+DPMSFreeClient(void *data, XID id)
+{
+    DPMSEventPtr pEvent;
+    DPMSEventPtr *pHead, pCur, pPrev;
+
+    pEvent = (DPMSEventPtr) data;
+    dixLookupResourceByType((void *) &pHead, eventResource, DPMSEventType,
+                            NullClient, DixUnknownAccess);
+    if (pHead) {
+        pPrev = 0;
+        for (pCur = *pHead; pCur && pCur != pEvent; pCur = pCur->next)
+            pPrev = pCur;
+        if (pCur) {
+            if (pPrev)
+                pPrev->next = pEvent->next;
+            else
+                *pHead = pEvent->next;
+        }
+    }
+    free((void *) pEvent);
+    return 1;
+}
+
+ /*ARGSUSED*/ static int
+DPMSFreeEvents(void *data, XID id)
+{
+    DPMSEventPtr *pHead, pCur, pNext;
+
+    pHead = (DPMSEventPtr *) data;
+    for (pCur = *pHead; pCur; pCur = pNext) {
+        pNext = pCur->next;
+        FreeResource(pCur->clientResource, ClientType);
+        free((void *) pCur);
+    }
+    free((void *) pHead);
+    return 1;
+}
+
+static void
+SDPMSInfoNotifyEvent(xGenericEvent * from,
+                     xGenericEvent * to)
+{
+    *to = *from;
+    swaps(&to->sequenceNumber);
+    swapl(&to->length);
+    swaps(&to->evtype);
+    if (from->evtype == DPMSInfoNotify) {
+        xDPMSInfoNotifyEvent *c = (xDPMSInfoNotifyEvent *) to;
+        swapl(&c->timestamp);
+        swaps(&c->power_level);
+    }
+}
+
+static int
+ProcDPMSSelectInput(register ClientPtr client)
+{
+    REQUEST(xDPMSSelectInputReq);
+    DPMSEventPtr pEvent, pNewEvent, *pHead;
+    XID clientResource;
+    int i;
+
+    REQUEST_SIZE_MATCH(xDPMSSelectInputReq);
+    i = dixLookupResourceByType((void **)&pHead, eventResource, DPMSEventType,
+                                client,
+                                DixWriteAccess);
+    if (stuff->eventMask == DPMSInfoNotifyMask) {
+        if (i == Success && pHead) {
+            /* check for existing entry. */
+            for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
+                if (pEvent->client == client) {
+                    pEvent->mask = stuff->eventMask;
+                    return Success;
+                }
+            }
+        }
+
+        /* build the entry */
+        pNewEvent = (DPMSEventPtr)malloc(sizeof(DPMSEventRec));
+        if (!pNewEvent)
+            return BadAlloc;
+        pNewEvent->next = 0;
+        pNewEvent->client = client;
+        pNewEvent->mask = stuff->eventMask;
+        /*
+         * add a resource that will be deleted when
+         * the client goes away
+         */
+        clientResource = FakeClientID(client->index);
+        pNewEvent->clientResource = clientResource;
+        if (!AddResource(clientResource, ClientType, (void *)pNewEvent))
+            return BadAlloc;
+        /*
+         * create a resource to contain a pointer to the list
+         * of clients selecting input
+         */
+        if (i != Success || !pHead) {
+            pHead = (DPMSEventPtr *)malloc(sizeof(DPMSEventPtr));
+            if (!pHead ||
+                    !AddResource(eventResource, DPMSEventType, (void *)pHead)) {
+                FreeResource(clientResource, X11_RESTYPE_NONE);
+                return BadAlloc;
+            }
+            *pHead = 0;
+        }
+        pNewEvent->next = *pHead;
+        *pHead = pNewEvent;
+    }
+    else if (stuff->eventMask == 0) {
+        /* delete the interest */
+        if (i == Success && pHead) {
+            pNewEvent = 0;
+            for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
+                if (pEvent->client == client)
+                    break;
+                pNewEvent = pEvent;
+            }
+            if (pEvent) {
+                FreeResource(pEvent->clientResource, ClientType);
+                if (pNewEvent)
+                    pNewEvent->next = pEvent->next;
+                else
+                    *pHead = pEvent->next;
+                free(pEvent);
+            }
+        }
+    }
+    else {
+        client->errorValue = stuff->eventMask;
+        return BadValue;
+    }
+    return Success;
+}
+
+static void
+SendDPMSInfoNotify(void)
+{
+    DPMSEventPtr *pHead, pEvent;
+    xDPMSInfoNotifyEvent se;
+    int i;
+
+    i = dixLookupResourceByType((void **)&pHead, eventResource, DPMSEventType,
+                                serverClient,
+                                DixReadAccess);
+    if (i != Success || !pHead)
+        return;
+    for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
+        if ((pEvent->mask & DPMSInfoNotifyMask) == 0)
+            continue;
+        se.type = GenericEvent;
+        se.extension = DPMSReqCode;
+        se.length = (sizeof(xDPMSInfoNotifyEvent) - 32) >> 2;
+        se.evtype = DPMSInfoNotify;
+        se.timestamp = currentTime.milliseconds;
+        se.power_level = DPMSPowerLevel;
+        se.state = DPMSEnabled;
+        WriteEventsToClient(pEvent->client, 1, (xEvent *)&se);
+    }
+}
+
 Bool
 DPMSSupported(void)
 {
@@ -86,6 +263,7 @@ int
 DPMSSet(ClientPtr client, int level)
 {
    int rc, i;
+    int old_level = DPMSPowerLevel;

    DPMSPowerLevel = level;

@@ -109,6 +287,9 @@ DPMSSet(ClientPtr client, int level)
        if (screenInfo.gpuscreens[i]->DPMS != NULL)
            screenInfo.gpuscreens[i]->DPMS(screenInfo.gpuscreens[i], level);

+    if (DPMSPowerLevel != old_level)
+        SendDPMSInfoNotify();
+
    return Success;
 }

@@ -120,8 +301,8 @@ ProcDPMSGetVersion(ClientPtr client)
        .type = X_Reply,
        .sequenceNumber = client->sequence,
        .length = 0,
-        .majorVersion = DPMSMajorVersion,
-        .minorVersion = DPMSMinorVersion
+        .majorVersion = SERVER_DPMS_MAJOR_VERSION,
+        .minorVersion = SERVER_DPMS_MINOR_VERSION
    };

    REQUEST_SIZE_MATCH(xDPMSGetVersionReq);
@@ -212,8 +393,10 @@ ProcDPMSEnable(ClientPtr client)
    REQUEST_SIZE_MATCH(xDPMSEnableReq);

    DPMSEnabled = TRUE;
-    if (!was_enabled)
+    if (!was_enabled) {
        SetScreenSaverTimer();
+        SendDPMSInfoNotify();
+    }

    return Success;
 }
@@ -221,6 +404,8 @@ ProcDPMSEnable(ClientPtr client)
 static int
 ProcDPMSDisable(ClientPtr client)
 {
+    Bool was_enabled = DPMSEnabled;
+
    /* REQUEST(xDPMSDisableReq); */

    REQUEST_SIZE_MATCH(xDPMSDisableReq);
@@ -228,6 +413,8 @@ ProcDPMSDisable(ClientPtr client)
    DPMSSet(client, DPMSModeOn);

    DPMSEnabled = FALSE;
+    if (was_enabled)
+        SendDPMSInfoNotify();

    return Success;
 }
@@ -298,6 +485,8 @@ ProcDPMSDispatch(ClientPtr client)
        return ProcDPMSForceLevel(client);
    case X_DPMSInfo:
        return ProcDPMSInfo(client);
+    case X_DPMSSelectInput:
+        return ProcDPMSSelectInput(client);
    default:
        return BadRequest;
    }
@@ -307,42 +496,16 @@ static int _X_COLD
 SProcDPMSGetVersion(ClientPtr client)
 {
    REQUEST(xDPMSGetVersionReq);
-
-    swaps(&stuff->length);
    REQUEST_SIZE_MATCH(xDPMSGetVersionReq);
    swaps(&stuff->majorVersion);
    swaps(&stuff->minorVersion);
    return ProcDPMSGetVersion(client);
 }

-static int _X_COLD
-SProcDPMSCapable(ClientPtr client)
-{
-    REQUEST(xDPMSCapableReq);
-
-    swaps(&stuff->length);
-    REQUEST_SIZE_MATCH(xDPMSCapableReq);
-
-    return ProcDPMSCapable(client);
-}
-
-static int _X_COLD
-SProcDPMSGetTimeouts(ClientPtr client)
-{
-    REQUEST(xDPMSGetTimeoutsReq);
-
-    swaps(&stuff->length);
-    REQUEST_SIZE_MATCH(xDPMSGetTimeoutsReq);
-
-    return ProcDPMSGetTimeouts(client);
-}
-
 static int _X_COLD
 SProcDPMSSetTimeouts(ClientPtr client)
 {
    REQUEST(xDPMSSetTimeoutsReq);
-
-    swaps(&stuff->length);
    REQUEST_SIZE_MATCH(xDPMSSetTimeoutsReq);

    swaps(&stuff->standby);
@@ -351,34 +514,10 @@ SProcDPMSSetTimeouts(ClientPtr client)
    return ProcDPMSSetTimeouts(client);
 }

-static int _X_COLD
-SProcDPMSEnable(ClientPtr client)
-{
-    REQUEST(xDPMSEnableReq);
-
-    swaps(&stuff->length);
-    REQUEST_SIZE_MATCH(xDPMSEnableReq);
-
-    return ProcDPMSEnable(client);
-}
-
-static int _X_COLD
-SProcDPMSDisable(ClientPtr client)
-{
-    REQUEST(xDPMSDisableReq);
-
-    swaps(&stuff->length);
-    REQUEST_SIZE_MATCH(xDPMSDisableReq);
-
-    return ProcDPMSDisable(client);
-}
-
 static int _X_COLD
 SProcDPMSForceLevel(ClientPtr client)
 {
    REQUEST(xDPMSForceLevelReq);
-
-    swaps(&stuff->length);
    REQUEST_SIZE_MATCH(xDPMSForceLevelReq);

    swaps(&stuff->level);
@@ -387,15 +526,15 @@ SProcDPMSForceLevel(ClientPtr client)
 }

 static int _X_COLD
-SProcDPMSInfo(ClientPtr client)
+SProcDPMSSelectInput(ClientPtr client)
 {
-    REQUEST(xDPMSInfoReq);
+    REQUEST(xDPMSSelectInputReq);
+    REQUEST_SIZE_MATCH(xDPMSSelectInputReq);
+    swapl(&stuff->eventMask);
+    return ProcDPMSSelectInput(client);
+}

-    swaps(&stuff->length);
-    REQUEST_SIZE_MATCH(xDPMSInfoReq);

-    return ProcDPMSInfo(client);
-}

 static int _X_COLD
 SProcDPMSDispatch(ClientPtr client)
@@ -405,19 +544,21 @@ SProcDPMSDispatch(ClientPtr client)
    case X_DPMSGetVersion:
        return SProcDPMSGetVersion(client);
    case X_DPMSCapable:
-        return SProcDPMSCapable(client);
+        return ProcDPMSCapable(client);
    case X_DPMSGetTimeouts:
-        return SProcDPMSGetTimeouts(client);
+        return ProcDPMSGetTimeouts(client);
    case X_DPMSSetTimeouts:
        return SProcDPMSSetTimeouts(client);
    case X_DPMSEnable:
-        return SProcDPMSEnable(client);
+        return ProcDPMSEnable(client);
    case X_DPMSDisable:
-        return SProcDPMSDisable(client);
+        return ProcDPMSDisable(client);
    case X_DPMSForceLevel:
        return SProcDPMSForceLevel(client);
    case X_DPMSInfo:
-        return SProcDPMSInfo(client);
+        return ProcDPMSInfo(client);
+    case X_DPMSSelectInput:
+        return SProcDPMSSelectInput(client);
    default:
        return BadRequest;
    }
@@ -432,6 +573,8 @@ DPMSCloseDownExtension(ExtensionEntry *e)
 void
 DPMSExtensionInit(void)
 {
+    ExtensionEntry *extEntry;
+
 #define CONDITIONALLY_SET_DPMS_TIMEOUT(_timeout_value_)         \
    if (_timeout_value_ == -1) { /* not yet set from config */  \
        _timeout_value_ = ScreenSaverTime;                      \
@@ -444,8 +587,15 @@ DPMSExtensionInit(void)
    DPMSPowerLevel = DPMSModeOn;
    DPMSEnabled = DPMSSupported();

-    if (DPMSEnabled)
-        AddExtension(DPMSExtensionName, 0, 0,
-                     ProcDPMSDispatch, SProcDPMSDispatch,
-                     DPMSCloseDownExtension, StandardMinorOpcode);
+    ClientType = CreateNewResourceType(DPMSFreeClient, "DPMSClient");
+    DPMSEventType = CreateNewResourceType(DPMSFreeEvents, "DPMSEvent");
+    eventResource = FakeClientID(0);
+
+    if (DPMSEnabled && ClientType && DPMSEventType &&
+        (extEntry = AddExtension(DPMSExtensionName, 0, 0,
+                                 ProcDPMSDispatch, SProcDPMSDispatch,
+                                 DPMSCloseDownExtension, StandardMinorOpcode))) {
+        DPMSReqCode = extEntry->base;
+        GERegisterExtension(DPMSReqCode, SDPMSInfoNotifyEvent);
+    }
 }
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -23,26 +23,34 @@
 * Author: Peter Hutterer, University of South Australia, NICTA
 */

-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 #include "windowstr.h"
 #include <X11/extensions/ge.h>

-#include "geint.h"
 #include "geext.h"
 #include "protocol-versions.h"
-#include "extinit.h"
+#include "extinit_priv.h"
+
+#define MAXEXTENSIONS   128

 DevPrivateKeyRec GEClientPrivateKeyRec;

-GEExtension GEExtensions[MAXEXTENSIONS];
+#define GEClientPrivateKey (&GEClientPrivateKeyRec)
+
+/** Struct to keep information about registered extensions */
+typedef struct _GEExtension {
+    /** Event swapping routine */
+    void (*evswap) (xGenericEvent *from, xGenericEvent *to);
+} GEExtension, *GEExtensionPtr;
+
+static GEExtension GEExtensions[MAXEXTENSIONS];
+
+typedef struct _GEClientInfo {
+    CARD32 major_version;
+    CARD32 minor_version;
+} GEClientInfoRec, *GEClientInfoPtr;

-/* Major available requests */
-static const int version_requests[] = {
-    X_GEQueryVersion,           /* before client sends QueryVersion */
-    X_GEQueryVersion,           /* must be set to last request in version 1 */
-};
+#define GEGetClient(pClient)    ((GEClientInfoPtr)(dixLookupPrivate(&((pClient)->devPrivates), GEClientPrivateKey)))

 /* Forward declarations */
 static void SGEGenericEvent(xEvent *from, xEvent *to);
@@ -89,11 +97,6 @@ ProcGEQueryVersion(ClientPtr client)
    return Success;
 }

-static int (*ProcGEVector[GENumberRequests]) (ClientPtr) = {
-    /* Version 1.0 */
-    ProcGEQueryVersion,
-};
-
 /************************************************************/
 /*                swapped request handlers                  */
 /************************************************************/
@@ -101,19 +104,12 @@ static int _X_COLD
 SProcGEQueryVersion(ClientPtr client)
 {
    REQUEST(xGEQueryVersionReq);
-
-    swaps(&stuff->length);
    REQUEST_SIZE_MATCH(xGEQueryVersionReq);
    swaps(&stuff->majorVersion);
    swaps(&stuff->minorVersion);
-    return (*ProcGEVector[stuff->ReqType]) (client);
+    return ProcGEQueryVersion(client);
 }

-static int (*SProcGEVector[GENumberRequests]) (ClientPtr) = {
-    /* Version 1.0 */
-    SProcGEQueryVersion
-};
-
 /************************************************************/
 /*                callbacks                                 */
 /************************************************************/
@@ -122,26 +118,29 @@ static int (*SProcGEVector[GENumberRequests]) (ClientPtr) = {
 static int
 ProcGEDispatch(ClientPtr client)
 {
-    GEClientInfoPtr pGEClient = GEGetClient(client);
-
-    REQUEST(xGEReq);
+    REQUEST(xReq);

-    if (pGEClient->major_version >= ARRAY_SIZE(version_requests))
+    switch (stuff->data) {
+    case X_GEQueryVersion:
+        return ProcGEQueryVersion(client);
+    default:
        return BadRequest;
-    if (stuff->ReqType > version_requests[pGEClient->major_version])
-        return BadRequest;
-
-    return (ProcGEVector[stuff->ReqType]) (client);
+    }
 }

 /* dispatch swapped requests */
 static int _X_COLD
 SProcGEDispatch(ClientPtr client)
 {
-    REQUEST(xGEReq);
-    if (stuff->ReqType >= GENumberRequests)
+    REQUEST(xReq);
+    swaps(&stuff->length);
+
+    switch (stuff->data) {
+    case X_GEQueryVersion:
+        return SProcGEQueryVersion(client);
+    default:
        return BadRequest;
-    return (*SProcGEVector[stuff->ReqType]) (client);
+    }
 }

 /* Reset extension. Called on server shutdown. */
@@ -180,24 +179,16 @@ SGEGenericEvent(xEvent *from, xEvent *to)
 void
 GEExtensionInit(void)
 {
-    ExtensionEntry *extEntry;
-
    if (!dixRegisterPrivateKey
        (&GEClientPrivateKeyRec, PRIVATE_CLIENT, sizeof(GEClientInfoRec)))
        FatalError("GEExtensionInit: GE private request failed.\n");

-    if ((extEntry = AddExtension(GE_NAME,
-                                 0, GENumberErrors,
-                                 ProcGEDispatch, SProcGEDispatch,
-                                 GEResetProc, StandardMinorOpcode)) != 0) {
-        memset(GEExtensions, 0, sizeof(GEExtensions));
-
-        EventSwapVector[GenericEvent] = (EventSwapPtr) SGEGenericEvent;
-    }
-    else {
+    if (!AddExtension(GE_NAME, 0, GENumberErrors, ProcGEDispatch, SProcGEDispatch,
+                      GEResetProc, StandardMinorOpcode))
        FatalError("GEInit: AddExtensions failed.\n");
-    }

+    memset(GEExtensions, 0, sizeof(GEExtensions));
+    EventSwapVector[GenericEvent] = (EventSwapPtr) SGEGenericEvent;
 }

 /************************************************************/
@@ -221,14 +212,3 @@ GERegisterExtension(int extension,
    /* extension opcodes are > 128, might as well save some space here */
    GEExtensions[EXT_MASK(extension)].evswap = ev_swap;
 }
-
-/* Sets type and extension field for a generic event. This is just an
- * auxiliary function, extensions could do it manually too.
- */
-void
-GEInitEvent(xGenericEvent *ev, int extension)
-{
-    ev->type = GenericEvent;
-    ev->extension = extension;
-    ev->length = 0;
-}
No results found