mirror of
https://github.com/X11Libre/xf86-video-v4l.git
synced 2026-03-25 18:11:00 +00:00
Compare commits
2 Commits
wip/ci
...
tracking/x
| Author | SHA1 | Date | |
|---|---|---|---|
|
a0eaca36a7 | ||
|
eb1e55874c |
100
.gitlab-ci.yml
100
.gitlab-ci.yml
@@ -1,6 +1,98 @@
|
||||
variables:
|
||||
FDO_UPSTREAM_REPO: 'xorg/driver/xf86-video-v4l'
|
||||
FREEBSD_SKIP: 'true' # only works on Linux
|
||||
# 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-v4l'
|
||||
# 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-v4l
|
||||
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
|
||||
|
||||
@@ -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>
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
}
|
||||
@@ -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"
|
||||
@@ -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
|
||||
|
||||
@@ -1,219 +0,0 @@
|
||||
# version 0.1.22
|
||||
variables:
|
||||
DEBIAN_VERSION: 'bookworm-slim'
|
||||
DEBIAN_TAG: "2025-03-07"
|
||||
DEBIAN_EXEC: 'bash .gitlab-ci/common/debian/image-install.sh'
|
||||
DEBIAN_SKIP: "false" # to enable, it has to be litterally "true"
|
||||
|
||||
FREEBSD_TAG: '2025-03-07'
|
||||
FREEBSD_VERSION: '14.2'
|
||||
# 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 ef5e4669b7500834a17ffe9277e15fbb6d977fff # 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_DISTRIBUTION_PLATFORM: "amd64"
|
||||
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_DISTRIBUTION_PLATFORM: "i386"
|
||||
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.0.99.1",
|
||||
"xorg-server-21.1.16",
|
||||
"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.16",
|
||||
"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
|
||||
29
man/v4l.man
29
man/v4l.man
@@ -1,7 +1,6 @@
|
||||
.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man,v 1.2 2001/01/27 18:20:55 dawes Exp $
|
||||
.\" shorthand for double quote that works everywhere.
|
||||
.ds q \N'34'
|
||||
.TH V4L __drivermansuffix__ __vendorversion__
|
||||
.TH V4L 4 2009-01-09 __vendorversion__
|
||||
.SH NAME
|
||||
v4l \- video4linux driver
|
||||
.SH SYNOPSIS
|
||||
@@ -12,11 +11,15 @@ v4l \- video4linux driver
|
||||
.B EndSection
|
||||
.fi
|
||||
.SH DESCRIPTION
|
||||
.B v4l
|
||||
is an __xservername__ driver for video4linux cards. It provides a Xvideo
|
||||
extension port for video overlay. Just add the driver to the module
|
||||
list within the module section of your __xconfigfile__ file if you want
|
||||
to use it. There are no config options.
|
||||
.B v4l
|
||||
is an
|
||||
.B Xorg
|
||||
driver for video4linux cards.
|
||||
It provides a Xvideo extension port for video overlay.
|
||||
Just add the driver to the module list within the module section of your
|
||||
.B xorg.conf
|
||||
file if you want to use it.
|
||||
There are no config options.
|
||||
.P
|
||||
Note that the extmod module is also required for the Xvideo
|
||||
support (and lots of other extensions too).
|
||||
@@ -30,10 +33,14 @@ overlay.
|
||||
bt848/bt878-based TV cards are the most popular hardware these
|
||||
days.
|
||||
.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 xorg.conf (5)
|
||||
for general configuration details.
|
||||
This section only covers configuration details specific to this driver.
|
||||
.SH "SEE ALSO"
|
||||
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
|
||||
.BR Xorg (1),
|
||||
.BR Xserver (1),
|
||||
.BR xorg.conf (5),
|
||||
.BR X (7)
|
||||
.SH AUTHORS
|
||||
Authors include: Gerd Knorr <kraxel@bytesex.org>
|
||||
|
||||
@@ -914,12 +914,9 @@ AddV4LEnc(XF86VideoEncodingPtr enc, int entry,
|
||||
{
|
||||
char *name;
|
||||
|
||||
#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(10, 0)
|
||||
if (asprintf(&name, "%s-%s", norm, fixname(input)) < 0)
|
||||
name = NULL;
|
||||
#else
|
||||
name = Xprintf("%s-%s", norm, fixname(input));
|
||||
#endif
|
||||
|
||||
if (name == NULL)
|
||||
return -1;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user