From 30b9c929a6783e35acac5dbfa6416e867c67be53 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 19 Jun 2018 13:27:42 +1000 Subject: doc: point to the gitlab ci file for a list of required packages Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 15 +++++++++++++-- doc/building.dox | 15 ++++++++++++--- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9374a77..c95c8d36 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,11 +30,22 @@ stages: - build # for actually building things variables: + ############################################################################### + # This is the list of packages required to build libinput with the default # + # configuration. # + # # + # Run dnf install/apt-get install/.. with the list of packages for your # + # distribution # + # # + # See the documentation here: # + # https://wayland.freedesktop.org/libinput/doc/latest/building_libinput.html # + ############################################################################### + FEDORA_RPMS: 'git gcc gcc-c++ meson check-devel libudev-devel libevdev-devel doxygen graphviz valgrind binutils libwacom-devel cairo-devel gtk3-devel glib2-devel mtdev-devel' + UBUNTU_DEBS: 'git gcc g++ meson check libudev-dev libevdev-dev doxygen graphviz valgrind binutils libwacom-dev libcairo2-dev libgtk-3-dev libglib2.0-dev libmtdev-dev' + ############################ end of package lists ############################# MESON_BUILDDIR: builddir NINJA_ARGS: '' MESON_PARAMS: '' - FEDORA_RPMS: 'git gcc gcc-c++ meson check-devel libudev-devel libevdev-devel doxygen graphviz valgrind binutils libwacom-devel cairo-devel gtk3-devel glib2-devel mtdev-devel' - UBUNTU_DEBS: 'git gcc g++ meson check libudev-dev libevdev-dev doxygen graphviz valgrind binutils libwacom-dev libcairo2-dev libgtk-3-dev libglib2.0-dev libmtdev-dev' FEDORA_DOCKER_IMAGE: $CI_REGISTRY/libinput/$CI_PROJECT_NAME/fedora/$FEDORA_VERSION:latest UBUNTU_DOCKER_IMAGE: $CI_REGISTRY/libinput/$CI_PROJECT_NAME/ubuntu/$UBUNTU_VERSION:latest # When using docker-in-docker (dind), it's wise to use the overlayfs driver diff --git a/doc/building.dox b/doc/building.dox index 17c1db70..7a82646c 100644 --- a/doc/building.dox +++ b/doc/building.dox @@ -117,9 +117,18 @@ This issue is tracked in https://github.com/mesonbuild/meson/issues/1967. @subsection building_dependencies Build dependencies libinput has a few build-time dependencies that must be installed prior to -running configure. In most cases, it is sufficient to install the -dependencies that your distribution uses to build the libinput package. -These can be installed with one of the following commands: +running configure. + +@note The build dependencies for some distributions can be found in the + +GitLab Continuous Integration file. Search for FEDORA_RPMS in the +variables: definition and check the list for an entry for your +distribution. + + +In most cases, it is sufficient to install the dependencies that your +distribution uses to build the libinput package. These can be installed +with one of the following commands: