Strip trailing whitespace from source files

Performed with: `git ls-files | xargs perl -i -p -e 's{[ \t]+$}{}'`

`git diff -w` & `git diff -b` show no diffs from this change

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-fbdev/-/merge_requests/12>

.gitignore

@@ -71,8 +71,8 @@ core
 *.tar.bz2
 *.tar.gz
 #
-#		Add & Override patterns for xf86-video-fbdev 
+#		Add & Override patterns for xf86-video-fbdev
 #
 #		Edit the following section as needed
 # For example, !report.pc overrides *.pc. See 'man gitignore'
-# 
+#

.gitlab-ci.yml

@@ -1,5 +1,98 @@
-variables:
-    FDO_UPSTREAM_REPO:  'xorg/driver/xf86-video-fbdev'
+# 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/
+
+.templates_sha: &template_sha 25e8e9f020880aa35fffe3d6b259b933f0f9449f # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+
 
 include:
-    - local:    '.gitlab-ci/common/xorg-driver.yml'
+  # Arch container builder template
+  - project: 'freedesktop/ci-templates'
+    ref: *template_sha
+    file: '/templates/arch.yml'
+  - project: 'freedesktop/ci-templates'
+    ref: *template_sha
+    file: '/templates/ci-fairy.yml'
+  - template: Security/SAST.gitlab-ci.yml
+
+
+stages:
+  - prep             # prep work like rebuilding the container images if there is a change
+  - build            # for actually building and testing things in a container
+  - test
+  - deploy
+
+
+variables:
+  FDO_UPSTREAM_REPO: 'xorg/driver/xf86-video-fbdev'
+  # The tag should be updated each time the list of packages is updated.
+  # Changing a tag forces the associated image to be rebuilt.
+  # Note: the tag has no meaning, we use a date format purely for readability
+  FDO_DISTRIBUTION_TAG:  '2023-10-01.0'
+  FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake libtool make xorg-util-macros xorgproto xorg-server-devel pixman'
+
+
+#
+# Verify that commit messages are as expected
+#
+check-commits:
+  extends:
+    - .fdo.ci-fairy
+  stage: prep
+  script:
+    - ci-fairy check-commits --junit-xml=results.xml
+  except:
+    - master@xorg/driver/xf86-video-fbdev
+  variables:
+    GIT_DEPTH: 100
+  artifacts:
+    reports:
+      junit: results.xml
+
+#
+# Verify that the merge request has the allow-collaboration checkbox ticked
+#
+check-merge-request:
+  extends:
+    - .fdo.ci-fairy
+  stage: deploy
+  script:
+    - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
+  artifacts:
+    when: on_failure
+    reports:
+      junit: results.xml
+  allow_failure: true
+
+
+#
+# Build a container with the given tag and the packages pre-installed.
+# This only happens if the tag changes, otherwise the existing image is
+# re-used.
+#
+container-prep:
+  extends:
+    - .fdo.container-build@arch
+  stage: prep
+  variables:
+    GIT_STRATEGY: none
+
+
+#
+# The default build, runs on the image built above.
+#
+build:
+  stage: build
+  extends:
+    - .fdo.distribution-image@arch
+  script:
+    - autoreconf -ivf
+    - mkdir _builddir
+    - pushd _builddir > /dev/null
+    - ../configure --disable-silent-rules
+    - make
+    - make check
+    - make distcheck
+    - popd > /dev/null

.gitlab-ci/common/README.md

@@ -1,20 +0,0 @@
-common CI stuff - supposed to be synced across all drivers
-
-moving this to a dedicated CI component is left for a later exercise.
-
-Some scripts can also be used locally, eg. in a VM:
-
-Prepare the image:
-
-    .gitlab-ci/common/debian/image-install.sh
-    .gitlab-ci/common/freebsd/image-install.sh
-
-Build the xserver + driver:
-
-    .gitlab-ci/common/build-driver.sh debian <xserver git ref>
-    .gitlab-ci/common/build-driver.sh freebsd <xserver git ref>
-
-Build just the xserver:
-
-    .gitlab-ci/common/build-xserver.sh debian <xserver git ref>
-    .gitlab-ci/common/build-xserver.sh freebsd <xserver git ref>

.gitlab-ci/common/build-driver.sh

@@ -1,61 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-PLATFORM="$1"
-XSERVER_REF="$2"
-
-if [ ! "$PLATFORM" ]; then
-    echo "missing PLATFORM" >&2
-    exit 1
-fi
-
-if [ ! "$XSERVER_REF" ]; then
-    echo "missing XSERVER_REF" >&2
-    exit 1
-fi
-
-.gitlab-ci/common/build-xserver.sh "$PLATFORM" "$XSERVER_REF"
-
-MACH=`gcc -dumpmachine`
-echo "Building on machine $MACH"
-
-case "$PLATFORM" in
-    freebsd)
-        export PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/libdata/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/libdata/pkgconfig"
-        export ACLOCAL_PATH="/usr/share/aclocal:/usr/local/share/aclocal"
-        export CFLAGS="$CFLAGS -I/usr/local/include"
-        export UDEV_CFLAGS=" "
-        export UDEV_LIBS=" "
-    ;;
-    debian)
-        export PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig"
-    ;;
-    *)
-        echo "unknown platform $PLATFORM" >&2
-    ;;
-esac
-
-if [ -f autogen.sh ]; then
-    (
-        echo "building driver via autotools"
-        rm -Rf _builddir
-        mkdir -p _builddir
-        cd _builddir
-        ../autogen.sh --disable-silent-rules
-        make
-        make check
-        make distcheck
-    )
-elif [ -f meson.build ]; then
-    (
-        echo "building driver via meson"
-        meson setup _build
-        cd _build
-        meson compile
-        meson install
-    )
-else
-    echo "failed detecting build system"
-    exit 1
-fi

.gitlab-ci/common/build-xserver.sh

@@ -1,71 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -x
-
-PLATFORM="$1"
-XSERVER_REF="$2"
-
-if [ ! "$XSERVER_REF" ]; then
-    echo "missing XSERVER_REF variable" >&2
-    exit 1
-fi
-
-XSERVER_CLONE=/tmp/xserver
-XSERVER_BUILD=$XSERVER_CLONE/_builddir
-XSERVER_REPO=https://gitlab.freedesktop.org/xorg/xserver.git
-
-MACH=`gcc -dumpmachine`
-
-export PKG_CONFIG_PATH="/usr/lib/$MACH/pkgconfig:/usr/share/pkgconfig:$PKG_CONFIG_PATH"
-export PKG_CONFIG_PATH="/usr/local/lib/$MACH/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:$PKG_CONFIG_PATH"
-
-echo "cloning xserver"
-rm -Rf $XSERVER_CLONE
-git clone --depth=1 -b $XSERVER_REF $XSERVER_REPO $XSERVER_CLONE
-
-echo "checking platform: $PLATFORM"
-case "$PLATFORM" in
-    freebsd)
-        echo "Building on FreeBSD"
-        XSERVER_OS_AUTOCONF_FLAGS="--without-dtrace"
-        XSERVER_MESON_DISABLE="glx udev udev_kms"
-    ;;
-    debian)
-        echo "Building on Debian"
-    ;;
-    *)
-        echo "unknown platform $PLATFORM" >&2
-        exit 1
-    ;;
-esac
-
-if [ -f $XSERVER_CLONE/meson.build ]; then
-    (
-        echo "Building Xserver via meson"
-        for opt in $XSERVER_MESON_DISABLE ; do
-            if grep "'$opt'" $XSERVER_CLONE/meson_options.txt ; then
-                echo "disable $opt"
-                XSERVER_MESON_FLAGS="$XSERVER_MESON_FLAGS -D$opt=false"
-            else
-                echo "no option $opt"
-            fi
-        done
-        mkdir -p $XSERVER_BUILD
-        cd $XSERVER_BUILD
-        meson setup --prefix=/usr $XSERVER_MESON_FLAGS
-        meson compile
-        meson install
-    )
-else
-    (
-        echo "Building Xserver via autotools"
-        cd $XSERVER_CLONE
-        # Workaround glvnd having reset the version in gl.pc from what Mesa used
-        # similar to xserver commit e6ef2b12404dfec7f23592a3524d2a63d9d25802
-        sed -i -e 's/gl >= [79].[12].0/gl >= 1.2/' configure.ac
-        ./autogen.sh --prefix=/usr $XSERVER_AUTOCONF_FLAGS $XSERVER_OS_AUTOCONF_FLAGS
-        make -j`nproc`
-        make -j`nproc` install
-    )
-fi

.gitlab-ci/common/debian/image-install.sh

@@ -1,88 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o xtrace
-
-echo 'deb-src https://deb.debian.org/debian bullseye main' >>/etc/apt/sources.list.d/deb-src.list
-echo 'deb-src https://deb.debian.org/debian bullseye-updates main' >>/etc/apt/sources.list.d/deb-src.list
-apt-get update
-
-apt-get autoremove -y --purge
-
-apt-get install -y --no-remove \
-	autoconf \
-	automake \
-	build-essential \
-	libtool \
-	pkg-config \
-	ca-certificates \
-	git \
-	debian-archive-keyring \
-	python3 python3-setuptools libxshmfence-dev \
-	clang \
-	libxvmc-dev libxcb1-dev libx11-xcb-dev libxcb-dri2-0-dev libxcb-util-dev \
-	libxfixes-dev libxcb-xfixes0-dev libxrender-dev libxdamage-dev libxrandr-dev \
-	libxcursor-dev libxss-dev libxinerama-dev libxtst-dev libpng-dev libssl-dev \
-	libxcb-dri3-dev libxxf86vm-dev libxfont-dev libxkbfile-dev libdrm-dev \
-	libgbm-dev libgl1-mesa-dev libpciaccess-dev libpixman-1-dev libudev-dev \
-	libgcrypt-dev libepoxy-dev libevdev-dev libmtdev-dev libinput-dev \
-	mesa-common-dev libspice-protocol-dev libspice-server-dev \
-	meson \
-	nettle-dev \
-	pkg-config \
-	valgrind \
-	x11-xkb-utils xfonts-utils xutils-dev x11proto-dev
-
-build_autoconf() {
-    local subdir="$1"
-    shift
-    (
-        cd $subdir
-        ./autogen.sh "$@"
-        make -j${FDO_CI_CONCURRENT:-4}
-        make -j${FDO_CI_CONCURRENT:-4} install
-    )
-}
-
-build_meson() {
-    local subdir="$1"
-    shift
-    (
-        cd $subdir
-        meson _build -Dprefix=/usr "$@"
-        ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
-    )
-}
-
-do_clone() {
-    git clone "$1" --depth 1 --branch="$2"
-}
-
-mkdir -p /tmp/build-deps
-cd /tmp/build-deps
-
-# xserver 1.18 and older branches require libXfont 1.5 instead of 2.0
-echo "Installing libXfont 1.5"
-do_clone https://gitlab.freedesktop.org/xorg/lib/libXfont.git libXfont-1.5-branch
-build_autoconf libXfont
-
-echo "Installing font-util"
-do_clone https://gitlab.freedesktop.org/xorg/font/util.git font-util-1.4.1
-build_autoconf util --prefix=/usr
-
-echo "Installing libxcvt"
-do_clone https://gitlab.freedesktop.org/xorg/lib/libxcvt.git libxcvt-0.1.0
-build_meson libxcvt
-
-# xserver requires xorgproto >= 2024.1 for XWAYLAND
-echo "Installing xorgproto"
-do_clone https://gitlab.freedesktop.org/xorg/proto/xorgproto.git xorgproto-2024.1
-build_autoconf xorgproto
-
-# Xwayland requires drm 2.4.116 for drmSyncobjEventfd
-# xf86-video-freedreno and xf86-video-omap need extra features
-echo "Installing libdrm"
-do_clone https://gitlab.freedesktop.org/mesa/drm libdrm-2.4.116
-build_meson drm -Dfreedreno=enabled -Dnouveau=enabled -Domap=enabled
-
-rm -Rf /tmp/build-deps

.gitlab-ci/common/freebsd/FreeBSD.conf

@@ -1,8 +0,0 @@
-# using the latest branch
-FreeBSD: {
-  url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest",
-  mirror_type: "srv",
-  signature_type: "fingerprints",
-  fingerprints: "/usr/share/keys/pkg",
-  enabled: yes
-}

.gitlab-ci/common/freebsd/image-install.sh

@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-# note: really wanna install to /usr/local, since that's explicitly searched first,
-# so we always catch the locally installed before any system/ports provided one
-# otherwise we might run into trouble like trying to use outdated xorgproto
-build_autoconf() {
-    local subdir="$1"
-    shift
-    (
-        cd $subdir
-        ./autogen.sh --prefix=/usr/local "$@"
-        make -j${FDO_CI_CONCURRENT:-4}
-        make -j${FDO_CI_CONCURRENT:-4} install
-    )
-}
-
-build_meson() {
-    local subdir="$1"
-    shift
-    (
-        cd $subdir
-        meson _build -Dprefix=/usr/local "$@"
-        ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
-    )
-}
-
-do_clone() {
-    git clone "$1" --depth 1 --branch="$2"
-}
-
-cp .gitlab-ci/common/freebsd/FreeBSD.conf /etc/pkg
-
-pkg upgrade -f -y
-
-pkg install -y \
-    git gcc pkgconf autoconf automake libtool xorg-macros xorgproto meson \
-    ninja pixman xtrans libXau libXdmcp libXfont libXfont2 libxkbfile libxcvt \
-    libpciaccess font-util libepoll-shim libdrm mesa-libs libdrm libglu mesa-dri \
-    libepoxy nettle xkbcomp libXvMC xcb-util valgrind libXcursor libXScrnSaver \
-    libXinerama libXtst evdev-proto libevdev libmtdev libinput spice-protocol \
-    libspice-server
-
-[ -f /bin/bash ] || ln -sf /usr/local/bin/bash /bin/bash
-
-# Xwayland requires drm 2.4.116 for drmSyncobjEventfd
-# xf86-video-freedreno and xf86-video-omap need extra features
-echo "Installing libdrm"
-do_clone https://gitlab.freedesktop.org/mesa/drm libdrm-2.4.116
-(
-    cd drm
-    git config user.email "buildbot@freebsd"
-    git config user.name "FreeBSD build bot"
-    git am ../.gitlab-ci/common/freebsd/libdrm-2.4.116.patch
-)
-build_meson drm -Dfreedreno=enabled -Dnouveau=enabled -Domap=enabled
-
-echo "=== post-install script END"

.gitlab-ci/common/freebsd/libdrm-2.4.116.patch

@@ -1,109 +0,0 @@
-From a87432dbb281ddf1c50a5e78091d38f0dac79416 Mon Sep 17 00:00:00 2001
-From: "Enrico Weigelt, metux IT consult" <info@metux.net>
-Date: Fri, 7 Jun 2024 15:18:47 +0200
-Subject: [PATCH 1/2] fix FTBS on FreeBSD (or non-Linux in general)
-
-Several drivers still including <linux/stddef.h>, but not using anything
-from it, thus breaking build on non-Linux platforms (eg. FreeBSD).
-Since not needed at all, just stop including it.
-
-Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
----
- etnaviv/etnaviv_device.c          | 1 -
- exynos/exynos_drm.c               | 1 -
- exynos/exynos_fimg2d.c            | 1 -
- omap/omap_drm.c                   | 1 -
- tests/exynos/exynos_fimg2d_test.c | 1 -
- 5 files changed, 5 deletions(-)
-
-diff --git a/etnaviv/etnaviv_device.c b/etnaviv/etnaviv_device.c
-index 699df256..a63bd15d 100644
---- a/etnaviv/etnaviv_device.c
-+++ b/etnaviv/etnaviv_device.c
-@@ -25,7 +25,6 @@
-  */
- 
- #include <stdlib.h>
--#include <linux/stddef.h>
- #include <linux/types.h>
- #include <errno.h>
- #include <sys/mman.h>
-diff --git a/exynos/exynos_drm.c b/exynos/exynos_drm.c
-index 3e322a17..fb4cd8de 100644
---- a/exynos/exynos_drm.c
-+++ b/exynos/exynos_drm.c
-@@ -31,7 +31,6 @@
- #include <unistd.h>
- 
- #include <sys/mman.h>
--#include <linux/stddef.h>
- 
- #include <xf86drm.h>
- 
-diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c
-index ac6fa687..f0aee962 100644
---- a/exynos/exynos_fimg2d.c
-+++ b/exynos/exynos_fimg2d.c
-@@ -30,7 +30,6 @@
- #include <assert.h>
- 
- #include <sys/mman.h>
--#include <linux/stddef.h>
- 
- #include <xf86drm.h>
- 
-diff --git a/omap/omap_drm.c b/omap/omap_drm.c
-index aa273660..42d35ef7 100644
---- a/omap/omap_drm.c
-+++ b/omap/omap_drm.c
-@@ -27,7 +27,6 @@
-  */
- 
- #include <stdlib.h>
--#include <linux/stddef.h>
- #include <linux/types.h>
- #include <errno.h>
- #include <sys/mman.h>
-diff --git a/tests/exynos/exynos_fimg2d_test.c b/tests/exynos/exynos_fimg2d_test.c
-index d85e2f6b..b1baa503 100644
---- a/tests/exynos/exynos_fimg2d_test.c
-+++ b/tests/exynos/exynos_fimg2d_test.c
-@@ -31,7 +31,6 @@
- #include <unistd.h>
- 
- #include <sys/mman.h>
--#include <linux/stddef.h>
- 
- #include <xf86drm.h>
- #include <xf86drmMode.h>
--- 
-2.39.2
-
-From 79123db12c6c5f42747fae02068b482055e8c376 Mon Sep 17 00:00:00 2001
-From: "Enrico Weigelt, metux IT consult" <info@metux.net>
-Date: Fri, 7 Jun 2024 15:43:13 +0200
-Subject: [PATCH 2/2] omap: fix FTBS on FreeBSD and drop unneeded include
-
-No need to explicitly include <linux/types.h>, since drm.h already does that,
-but conditionally only Linux only.
-
-Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
----
- omap/omap_drm.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/omap/omap_drm.c b/omap/omap_drm.c
-index 42d35ef7..93d2207f 100644
---- a/omap/omap_drm.c
-+++ b/omap/omap_drm.c
-@@ -27,7 +27,6 @@
-  */
- 
- #include <stdlib.h>
--#include <linux/types.h>
- #include <errno.h>
- #include <sys/mman.h>
- #include <fcntl.h>
--- 
-2.39.2
-

.gitlab-ci/common/xorg-driver.yml

@@ -1,216 +0,0 @@
-# version 0.1.19
-variables:
-    DEBIAN_VERSION:   'bullseye-slim'
-    DEBIAN_TAG:       "2024-06-06.09"
-    DEBIAN_EXEC:      'bash .gitlab-ci/common/debian/image-install.sh'
-    DEBIAN_SKIP:      "false" # to enable, it has to be litterally "true"
-
-    FREEBSD_TAG:      '2024-06-06.06'
-    FREEBSD_VERSION:  '14.0'
-# image is yet too small for that - need a more complicated way :(
-#    FREEBSD_EXEC:     "bash .gitlab-ci/common/freebsd/image-install.sh"
-    FREEBSD_SKIP:     "false" # to enable, it has to be litterally "true"
-
-.templates_sha: &template_sha bc70242ffb8402243e934659ecc1a2d1c89eca2b # see https://docs.gitlab.com/ee/ci/yaml/#includefile
-
-include:
-    - project:  'freedesktop/ci-templates'
-      ref:      *template_sha
-      file:     '/templates/debian.yml'
-    - project:  'freedesktop/ci-templates'
-      ref:      *template_sha
-      file:     '/templates/freebsd.yml'
-    - project:  'freedesktop/ci-templates'
-      ref:      *template_sha
-      file:     '/templates/ci-fairy.yml'
-    - template: Security/SAST.gitlab-ci.yml
-
-stages:
-    - images
-    - build
-    - test
-
-# standard commits quality check
-check-commits:
-    extends:
-        - .fdo.ci-fairy
-    stage: test
-    script:
-        - ci-fairy check-commits --junit-xml=results.xml
-    except:
-        - master@$FDO_UPSTREAM_REPO
-    variables:
-        GIT_DEPTH: 100
-    artifacts:
-        reports:
-            junit: results.xml
-    allow_failure: true
-    needs:
-
-# standard merge request quality checks
-check-merge-request:
-    extends:
-      - .fdo.ci-fairy
-    stage: test
-    script:
-      - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
-    artifacts:
-        when: on_failure
-        reports:
-            junit: results.xml
-    allow_failure: true
-    needs:
-
-# create debian build image
-image@debian@amd64:
-    extends:
-        - .xorg.distro@debian@amd64
-        - .fdo.container-build@debian
-    stage: images
-    variables:
-        GIT_STRATEGY: none
-    rules:
-        - if: $DEBIAN_SKIP != "true"
-          when: always
-    needs:
-
-image@debian@i386:
-    extends:
-        - .xorg.distro@debian@i386
-        - .fdo.container-build@debian
-    stage: images
-    variables:
-        GIT_STRATEGY: none
-    rules:
-        - if: $DEBIAN_SKIP != "true"
-          when: always
-    needs:
-
-# inherit this to define FDO_DISTRIBUTION_* variables for Debian
-.xorg.distro@debian@amd64:
-    variables:
-        FDO_DISTRIBUTION_VERSION:   "$DEBIAN_VERSION"
-        FDO_DISTRIBUTION_EXEC:      "$DEBIAN_EXEC"
-        FDO_DISTRIBUTION_TAG:       "amd64-$DEBIAN_TAG"
-        FDO_BASE_IMAGE:             "amd64/debian:$DEBIAN_VERSION"
-
-.xorg.distro@debian@i386:
-    variables:
-        FDO_DISTRIBUTION_VERSION:   "$DEBIAN_VERSION"
-        FDO_DISTRIBUTION_EXEC:      "$DEBIAN_EXEC"
-        FDO_DISTRIBUTION_TAG:       "i386-$DEBIAN_TAG"
-        FDO_BASE_IMAGE:             "i386/debian:$DEBIAN_VERSION"
-
-# overwrite this one if another matrix is needed
-.xorg.driver_matrix@debian:
-    parallel:
-        matrix:
-            - CC:           [ "gcc", "clang" ]
-              XSERVER_REF:  [
-# these break on Debian
-#                "xorg-server-1.18.4",
-#                "xorg-server-1.19.7",
-                "xorg-server-1.20.14",
-                "xorg-server-21.1.13",
-                "master"
-              ]
-
-# default build with meson on Debian
-.xorg.driver_common@debian:
-    needs:
-        - image@debian@i386
-        - image@debian@amd64
-    extends:
-        - .fdo.distribution-image@debian
-    stage: build
-    script:
-        - .gitlab-ci/common/build-driver.sh "debian" "$XSERVER_REF"
-    variables:
-        CFLAGS: "-pipe -g -O2"
-    rules:
-        - if: $DEBIAN_SKIP != "true"
-          when: always
-
-# overwrite this when you need some special Debian build
-build@debian@amd64:
-    extends:
-        - .xorg.driver_matrix@debian
-        - .xorg.driver_common@debian
-        - .xorg.distro@debian@amd64
-
-build@debian@i386:
-    extends:
-        - .xorg.driver_matrix@debian
-        - .xorg.driver_common@debian
-        - .xorg.distro@debian@i386
-
-# inherit this to define FDO_DISTRIBUTION_* variables for FreeBSD
-.xorg.distro@freebsd:
-    variables:
-        FDO_DISTRIBUTION_VERSION:   "$FREEBSD_VERSION"
-        FDO_DISTRIBUTION_EXEC:      "$FREEBSD_EXEC"
-        FDO_DISTRIBUTION_TAG:       "$FREEBSD_TAG"
-
-# create base image for FreeBSD
-image@freebsd:
-    extends:
-        - .xorg.distro@freebsd
-        - .fdo.qemu-build@freebsd@x86_64
-    stage: images
-    variables:
-        GIT_STRATEGY: none
-    rules:
-        - if: $FREEBSD_SKIP != "true"
-          when: always
-
-# inherit this to get the default build matrix
-.xorg.driver_matrix@freebsd:
-    parallel:
-        matrix:
-            - CC:           [ "gcc", "clang" ]
-              XSERVER_REF:  [
-#                "xorg-server-1.18.4", # this breaks due name clash on "bool"
-#                "xorg-server-1.19.7",
-#                "xorg-server-1.20.14", # breaks meson ... see: 331850ce6f0c48a1cfc489da2a27ca0220997a2f -- server-1.20-branch
-                "xorg-server-21.0.99.1",
-                "xorg-server-21.1.13",
-                "master"
-              ]
-
-# common build for driver on FreeBSD. meson and autoconf are both handled by this
-.xorg.driver_common@freebsd:
-    needs:
-        - image@freebsd
-    stage: build
-    extends:
-        - .fdo.distribution-image@freebsd
-        - .xorg.distro@freebsd
-    script:
-        # FIXME: increasing image and running image-install.sh should be done
-        # at container image build time, but would have to replicate too much
-        # of the cbuild script here. better wait until CI folks have increased
-        # the image size or provide hooks for that
-        - xz -d -T0 /app/image.raw.xz
-        - rm -f /app/image.raw.xz
-        - truncate -s +5G /app/image.raw
-        - /app/vmctl start
-        - set +e
-        - /app/vmctl exec "service growfs onestart"
-        - scp -r $PWD "vm:"
-        - /app/vmctl exec "cd $CI_PROJECT_NAME && .gitlab-ci/common/freebsd/image-install.sh"
-        - /app/vmctl exec "cd $CI_PROJECT_NAME && .gitlab-ci/common/build-driver.sh freebsd $XSERVER_REF" && touch .success
-        # copy any test results from the VM to our container so we can
-        # save them as artifacts
-        - scp -r vm:$CI_PROJECT_NAME/test-results.xml . || true # this is allowed to fail
-        - /app/vmctl stop
-        - set -e
-        - test -e .success || exit 1
-    rules:
-        - if: $FREEBSD_SKIP != "true"
-          when: always
-
-# overwrite this if you need some special FreeBSD build
-build@freebsd:
-    extends:
-        - .xorg.driver_matrix@freebsd
-        - .xorg.driver_common@freebsd

configure.ac

@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-fbdev],
-        [0.5.0],
+        [0.5.1],
         [https://gitlab.freedesktop.org/xorg/driver/xf86-video-fbdev/issues],
         [xf86-video-fbdev])
 AC_CONFIG_SRCDIR([Makefile.am])

man/Makefile.am

@@ -20,7 +20,7 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
-# 
+#
 
 drivermandir = $(DRIVER_MAN_DIR)
 

man/fbdev.man

@@ -14,49 +14,64 @@ fbdev \- video driver for framebuffer device
 .fi
 .SH DESCRIPTION
 .B fbdev
-is an __xservername__ driver for framebuffer devices.  This is a non-accelerated
-driver, the following framebuffer depths are supported: 8, 15, 16, 24.
-All visual types are supported for depth 8, and TrueColor visual is
-supported for the other depths.  Multi-head configurations are supported.
+is an
+.B __xservername__
+driver for framebuffer devices.
+This is a non-accelerated driver,
+the following framebuffer depths are supported: 8, 15, 16, 24.
+All visual types are supported for depth 8,
+and TrueColor visual is supported for the other depths.
+Multi-head configurations are supported.
 .SH SUPPORTED HARDWARE
-The 
+The
 .B fbdev
 driver supports all hardware where a framebuffer driver is available.
-fbdev uses the os-specific submodule fbdevhw(__drivermansuffix__) to talk
-to the kernel
-device driver.  Currently a fbdevhw module is available for linux.
+fbdev uses the os-specific submodule
+.BR fbdevhw (__drivermansuffix__)
+to talk to the kernel device driver.
+Currently a fbdevhw module is available for Linux.
 .SH CONFIGURATION DETAILS
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
-details.  This section only covers configuration details specific to
-this driver.
+Please refer to
+.BR __xconfigfile__ (__filemansuffix__)
+for general configuration details.
+This section only covers configuration details specific to this driver.
 .PP
-For this driver it is not required to specify modes in the screen 
-section of the config file.  The
+For this driver it is not required to specify modes
+in the screen section of the config file.
+The
 .B fbdev
-driver can pick up the currently used video mode from the framebuffer 
+driver can pick up the currently used video mode from the framebuffer
 driver and will use it if there are no video modes configured.
 .PP
-For PCI boards you might have to add a BusID line to the Device
-section.  See above for a sample line.
+For PCI boards you might have to add a BusID line to the Device section.
+See above for a sample line.
 .PP
-The following driver 
+The following driver
 .B Options
 are supported:
 .TP
 .BI "Option \*qfbdev\*q \*q" string \*q
-The framebuffer device to use. Default: /dev/fb0.
+The framebuffer device to use.
+Default: /dev/fb0.
 .TP
 .BI "Option \*qShadowFB\*q \*q" boolean \*q
-Enable or disable use of the shadow framebuffer layer. Mandatory for 24bpp
-framebuffers on newer servers. Default: on.
+Enable or disable use of the shadow framebuffer layer.
+Mandatory for 24bpp framebuffers on newer servers.
+Default: on.
 .TP
 .BI "Option \*qRotate\*q \*q" string \*q
-Enable rotation of the display. The supported values are "CW" (clockwise,
-90 degrees), "UD" (upside down, 180 degrees) and "CCW" (counter clockwise,
-270 degrees). Implies use of the shadow framebuffer layer. Disabled for 24bpp
-framebuffers. Default: off.
+Enable rotation of the display.
+The supported values are "CW" (clockwise, 90 degrees),
+"UD" (upside down, 180 degrees)
+and "CCW" (counter clockwise, 270 degrees).
+Implies use of the shadow framebuffer layer.
+Disabled for 24bpp framebuffers.
+Default: off.
 .SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__),
-X(__miscmansuffix__), fbdevhw(__drivermansuffix__)
+.BR __xservername__ (__appmansuffix__),
+.BR __xconfigfile__ (__filemansuffix__),
+.BR Xserver (__appmansuffix__),
+.BR X (__miscmansuffix__),
+.BR fbdevhw (__drivermansuffix__)
 .SH AUTHORS
 Authors include: Gerd Knorr, Michel D\(:anzer, Geert Uytterhoeven

src/fbdev.c

@@ -197,7 +197,7 @@ FBDevGetRec(ScrnInfoPtr pScrn)
 {
 	if (pScrn->driverPrivate != NULL)
 		return TRUE;
-	
+
 	pScrn->driverPrivate = XNFcallocarray(sizeof(FBDevRec), 1);
 	return TRUE;
 }
@@ -263,7 +263,7 @@ static Bool FBDevPciProbe(DriverPtr drv, int entity_num,
 
     if (!xf86LoadDrvSubModule(drv, "fbdevhw"))
 	return FALSE;
-	    
+
     pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, NULL,
 				NULL, NULL, NULL, NULL);
     if (pScrn) {
@@ -286,7 +286,7 @@ static Bool FBDevPciProbe(DriverPtr drv, int entity_num,
 	    pScrn->ValidMode     = fbdevValidMode;
 
 	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
-		       "claimed PCI slot %d@%d:%d:%d\n", 
+		       "claimed PCI slot %d@%d:%d:%d\n",
 		       dev->bus, dev->domain, dev->dev, dev->func);
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 		       "using %s\n", device ? device : "default device");
@@ -320,12 +320,12 @@ FBDevProbe(DriverPtr drv, int flags)
 	if (flags & PROBE_DETECT)
 		return FALSE;
 
-	if ((numDevSections = xf86MatchDevice(FBDEV_DRIVER_NAME, &devSections)) <= 0) 
+	if ((numDevSections = xf86MatchDevice(FBDEV_DRIVER_NAME, &devSections)) <= 0)
 	    return FALSE;
-	
+
 	if (!xf86LoadDrvSubModule(drv, "fbdevhw"))
 	    return FALSE;
-	    
+
 	for (i = 0; i < numDevSections; i++) {
 	    Bool isPci = FALSE;
 
@@ -346,7 +346,7 @@ FBDevProbe(DriverPtr drv, int flags)
 #ifndef XSERVER_LIBPCIACCESS
 		    /* XXX what about when there's no busID set? */
 		    int entity;
-		    
+
 		    entity = xf86ClaimPciSlot(bus,device,func,drv,
 					      0,devSections[i],
 					      TRUE);
@@ -367,11 +367,11 @@ FBDevProbe(DriverPtr drv, int flags)
 					      devSections[i], TRUE);
 		    pScrn = xf86ConfigFbEntity(pScrn,0,entity,
 					       NULL,NULL,NULL,NULL);
-		   
+
 		}
 		if (pScrn) {
 		    foundScreen = TRUE;
-		    
+
 		    pScrn->driverVersion = FBDEV_VERSION;
 		    pScrn->driverName    = FBDEV_DRIVER_NAME;
 		    pScrn->name          = FBDEV_NAME;
@@ -383,7 +383,7 @@ FBDevProbe(DriverPtr drv, int flags)
 		    pScrn->EnterVT       = fbdevEnterVT;
 		    pScrn->LeaveVT       = fbdevLeaveVT;
 		    pScrn->ValidMode     = fbdevValidMode;
-		    
+
 		    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 			       "using %s\n", dev ? dev : "default device");
 		}
@@ -571,7 +571,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "checking modes against monitor...\n");
 	{
 		DisplayModePtr mode, first = mode = pScrn->modes;
-		
+
 		if (mode != NULL) do {
 			mode->status = xf86CheckModeForMonitor(mode, pScrn->monitor);
 			mode = mode->next;
@@ -710,7 +710,7 @@ FBDevShadowInit(ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     FBDevPtr fPtr = FBDEVPTR(pScrn);
-    
+
     if (!shadowSetup(pScreen)) {
 	return FALSE;
     }
@@ -1006,7 +1006,7 @@ FBDevCloseScreen(ScreenPtr pScreen)
 {
 	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 	FBDevPtr fPtr = FBDEVPTR(pScrn);
-	
+
 	fbdevHWRestore(pScrn);
 	fbdevHWUnmapVidmem(pScrn);
 	if (fPtr->shadow) {
@@ -1238,7 +1238,7 @@ static Bool
 FBDevDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr)
 {
     xorgHWFlags *flag;
-    
+
     switch (op) {
 	case GET_REQUIRED_HW_INTERFACES:
 	    flag = (CARD32*)ptr;