Support french keyboard layout

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = tab
+indent_size = 8
+max_line_length = 80
+
+[*.xml]
+indent_style = space
+indent_size = 2
+tab_width = 8

.gitignore

@@ -1,112 +1,12 @@
-*.announce
-*.deps
-*.jpg
-*.la
-*.lo
-*.log
-*.o
-*.pc
-*.sig
-*.so
 *.swp
 .*.sw?
 .sw?
 *.sublime-project
 *.sublime-workspace
-*.tar.xz
-*.trs
 *~
 ctags
 cscope.out
-.libs
-.dirstamp
-/aclocal.m4
-/autom4te.cache
-/build-aux/
-/config.guess
-/config.h
-/config.h.in
-/config.log
-/config.mk
-/config.status
-/config.sub
-/configure
-/depcomp
-/doc/doxygen/*.doxygen
-/docs/developer
-/docs/tools
-/install-sh
-/libtool
-/ltmain.sh
-/logs
-/missing
-/stamp-h1
-/test-driver
-/weston.ini
-Makefile
-Makefile.in
 TAGS
-protocol/.*.valid
-protocol/*.[ch]
 
 00*.patch
-
-weston-calibrator
-weston-clickdot
-weston-cliptest
-weston-confine
-weston-dnd
-weston-editor
-weston-eventdemo
-weston-flower
-weston-fullscreen
-weston-gears
-weston-image
-weston-nested
-weston-nested-client
-weston-presentation-shm
-weston-resizor
-weston-scaler
-weston-simple-dmabuf-intel
-weston-simple-dmabuf-v4l
-weston-simple-egl
-weston-simple-shm
-weston-simple-touch
-weston-simple-damage
-weston-smoke
-weston-stacking
-weston-subsurfaces
-weston-transformed
-weston-view
-
-weston-keyboard
-libtoytoolkit.a
-weston-desktop-shell
-weston-ivi-shell-user-interface
-weston-info
-weston-screenshooter
-weston-tablet-shell
-weston-terminal
-weston-multi-resource
-weston-simple-im
-weston
-weston-launch
-spring-tool
-
-*.weston
-*.test
-*.ivi
-wcap-decode
-matrix-test
-setbacklight
-weston.1
-weston-drm.7
-weston.ini.5
-
-/libweston/git-version.h
-/libweston/version.h
-
-/tests/weston-ivi.ini
-internal-screenshot-00.png
-
-/zuctest
+build/*

.gitlab-ci.yml

@@ -0,0 +1,111 @@
+# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0:
+
+variables:
+  FDO_UPSTREAM_REPO: wayland/weston
+
+
+include:
+  - project: 'freedesktop/ci-templates'
+    ref: 59de540b620c45739871d1a073d76d5521989d11
+    file: '/templates/debian.yml'
+
+
+stages:
+  - container_prep
+  - build
+  - pages
+
+
+.debian:
+  variables:
+    FDO_DISTRIBUTION_VERSION: buster
+    FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/debian-install.sh'
+    FDO_DISTRIBUTION_TAG: '2020-06-24.0'
+
+
+container_prep:
+  extends:
+    - .debian
+    - .fdo.container-build@debian
+  stage: container_prep
+
+
+.build-native:
+  extends:
+    - .debian
+    - .fdo.distribution-image@debian
+  stage: build
+  before_script:
+  - git clone --depth=1 https://gitlab.freedesktop.org/wayland/wayland-protocols
+  - export WAYLAND_PROTOCOLS_DIR="$(pwd)/prefix-wayland-protocols"
+  - export PKG_CONFIG_PATH="$WAYLAND_PROTOCOLS_DIR/share/pkgconfig:$PKG_CONFIG_PATH"
+  - export MAKEFLAGS="-j4"
+  - cd wayland-protocols
+  - git show -s HEAD
+  - mkdir build
+  - cd build
+  - ../autogen.sh --prefix="$WAYLAND_PROTOCOLS_DIR"
+  - make install
+  - cd ../../
+  - export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+  - export BUILD_ID="weston-$CI_JOB_NAME"
+  - export PREFIX="$(pwd)/prefix-$BUILD_ID"
+  - export BUILDDIR="$(pwd)/build-$BUILD_ID"
+  - export TESTS_RES_PATH="$BUILDDIR/tests-res.txt"
+  - mkdir "$BUILDDIR" "$PREFIX"
+
+.build-native-meson:
+  extends: .build-native
+  tags:
+    - kvm
+  script:
+  - export PATH=~/.local/bin:$PATH
+  - cd "$BUILDDIR"
+  - meson --prefix="$PREFIX" ${MESON_OPTIONS} ..
+  - ninja -k0
+  - ninja install
+  - virtme-run --rw --pwd --kimg /weston-virtme/bzImage --script-dir ../.gitlab-ci/virtme-scripts
+  - TEST_RES=$(cat $TESTS_RES_PATH)
+  - rm $TESTS_RES_PATH
+  - ninja clean
+  - cp -R /weston-virtme ./
+  - rm weston-virtme/bzImage
+  - exit $TEST_RES
+  artifacts:
+    name: weston-$CI_COMMIT_SHA
+    when: always
+    paths:
+    - build-*/meson-logs
+    - build-*/weston-virtme
+    - prefix-*
+
+build-native-meson-default-options:
+  variables:
+    MESON_OPTIONS: >
+      -Dwerror=true
+      -Ddoc=true
+  extends: .build-native-meson
+
+build-native-meson-no-gl-renderer:
+  variables:
+    MESON_OPTIONS: >
+      -Dsimple-clients=damage,im,shm,touch,dmabuf-v4l
+      -Drenderer-gl=false
+      -Dremoting=false
+      -Dpipewire=false
+      -Dwerror=true
+  extends: .build-native-meson
+
+pages:
+  stage: pages
+  dependencies:
+    - build-native-meson-default-options
+  script:
+  - export PREFIX=$(pwd)/prefix-weston-build-native-meson-default-options
+  - mkdir public
+  - cp -R $PREFIX/share/doc/weston/* public/
+  artifacts:
+    paths:
+    - public
+  only:
+    - master

.gitlab-ci/debian-install.sh

@@ -0,0 +1,150 @@
+#!/bin/bash
+
+set -o xtrace -o errexit
+
+# These get temporary installed for building Linux and then force-removed.
+LINUX_DEV_PKGS="
+	bc
+	bison
+	flex
+	libelf-dev
+"
+
+# These get temporary installed for building Mesa and then force-removed.
+MESA_DEV_PKGS="
+	bison
+	flex
+	gettext
+	libwayland-egl-backend-dev
+	libxrandr-dev
+	llvm-8-dev
+	python-mako
+	python3-mako
+	wayland-protocols
+"
+
+# Needed for running the custom-built mesa
+MESA_RUNTIME_PKGS="
+	libllvm8
+"
+
+echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list
+apt-get update
+apt-get -y --no-install-recommends install \
+	autoconf \
+	automake \
+	build-essential \
+	curl \
+	doxygen \
+	freerdp2-dev \
+	git \
+	libcairo2-dev \
+	libcolord-dev \
+	libdbus-1-dev \
+	libegl1-mesa-dev \
+	libevdev-dev \
+	libexpat1-dev \
+	libffi-dev \
+	libgbm-dev \
+	libgdk-pixbuf2.0-dev \
+	libgles2-mesa-dev \
+	libglu1-mesa-dev \
+	libgstreamer1.0-dev \
+	libgstreamer-plugins-base1.0-dev \
+	libinput-dev \
+	libjpeg-dev \
+	libjpeg-dev \
+	liblcms2-dev \
+	libmtdev-dev \
+	libpam0g-dev \
+	libpango1.0-dev \
+	libpipewire-0.2-dev \
+	libpixman-1-dev \
+	libpng-dev \
+	libsystemd-dev \
+	libtool \
+	libudev-dev \
+	libva-dev \
+	libvpx-dev \
+	libwayland-dev \
+	libwebp-dev \
+	libx11-dev \
+	libx11-xcb-dev \
+	libxcb1-dev \
+	libxcb-composite0-dev \
+	libxcb-xfixes0-dev \
+	libxcb-xkb-dev \
+	libxcursor-dev \
+	libxkbcommon-dev \
+	libxml2-dev \
+	mesa-common-dev \
+	ninja-build \
+	pkg-config \
+	python3-pip \
+	python3-setuptools \
+	qemu-system \
+	sysvinit-core \
+	xwayland \
+	$MESA_RUNTIME_PKGS
+
+
+pip3 install --user git+https://github.com/mesonbuild/[email protected]
+export PATH=$HOME/.local/bin:$PATH
+# for documentation
+pip3 install sphinx==2.1.0 --user
+pip3 install breathe==4.13.0.post0 --user
+pip3 install sphinx_rtd_theme==0.4.3 --user
+
+apt-get -y --no-install-recommends install $LINUX_DEV_PKGS
+git clone --depth=1 --branch=drm-next-2020-06-11-1 https://anongit.freedesktop.org/git/drm/drm.git linux
+cd linux
+make x86_64_defconfig
+make kvmconfig
+./scripts/config --enable CONFIG_DRM_VKMS
+make oldconfig
+make -j8
+cd ..
+mkdir /weston-virtme
+mv linux/arch/x86/boot/bzImage /weston-virtme/bzImage
+mv linux/.config /weston-virtme/.config
+rm -rf linux
+
+# Link to upstream virtme: https://github.com/amluto/virtme
+#
+# The reason why we are using a fork here is that it adds a patch to have the
+# --script-dir command line option. With that we can run scripts that are in a
+# certain folder when virtme starts, which is necessary in our use case.
+#
+# The upstream also has some commands that could help us to reach the same
+# results: --script-sh and --script-exec. Unfornutately they are not completely
+# implemented yet, so we had some trouble to use them and it was becoming
+# hackery.
+#
+git clone https://github.com/ezequielgarcia/virtme
+cd virtme
+git checkout -b snapshot 69e3cb83b3405edc99fcf9611f50012a4f210f78
+./setup.py install
+cd ..
+
+git clone --branch 1.17.0 --depth=1 https://gitlab.freedesktop.org/wayland/wayland
+export MAKEFLAGS="-j4"
+cd wayland
+git show -s HEAD
+mkdir build
+cd build
+../autogen.sh --disable-documentation
+make install
+cd ../../
+
+apt-get -y --no-install-recommends install $MESA_DEV_PKGS
+git clone --single-branch --branch master --shallow-since='2020-02-15' https://gitlab.freedesktop.org/mesa/mesa.git mesa
+cd mesa
+git checkout -b snapshot c7617d8908a970124321ce731b43d5996c3c5775
+meson build -Dauto_features=disabled \
+	-Dgallium-drivers=swrast -Dvulkan-drivers= -Ddri-drivers=
+ninja -C build install
+cd ..
+rm -rf mesa
+
+apt-get -y --autoremove purge $LINUX_DEV_PKGS
+apt-get -y --autoremove purge $MESA_DEV_PKGS