gitlab CI: sync the meson-build.sh script with libinput

Pulls in the three libinput commits up to 31ecda70087

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

.gitlab-ci/meson-build.sh

 #!/usr/bin/env bash
+#
+# SPDX-License-Identifier: MIT
 
 set -x
 if [[ -f .meson_environment ]]; then
@@ -42,15 +44,16 @@ fi
 # 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='libevdev-job-local'
+	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
-	NINJA_ARGS="-j$FDO_CI_CONCURRENT $NINJA_ARGS"
+	jobcount="-j$FDO_CI_CONCURRENT"
 	export MESON_TESTTHREADS="$FDO_CI_CONCURRENT"
 fi
 
@@ -59,6 +62,7 @@ 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
@@ -70,7 +74,10 @@ fi
 meson configure "$MESON_BUILDDIR"
 
 if [[ -z "$MESON_SKIP_BUILD" ]]; then
-	ninja -C "$MESON_BUILDDIR" $NINJA_ARGS
+	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