gitlab-ci: build libdrm using meson instead of autotools

Autotools was deprecated for a while and has now been removed, so let's
start using meson here so that we won't have any issues next time we
update libdrm.

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3421a8358d19313944bfc5400724a2bb1a3b8f3..871975474dca304a1914ac0dcdef46590689a17c 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@
 # repository's registry will be used there as well.
 variables:
   UPSTREAM_REPO: mesa/mesa
-  DEBIAN_TAG: "amd64-2019-11-12"
+  DEBIAN_TAG: "amd64-2019-11-13"
   DEBIAN_TEST_TAG: "amd64-test-2019-11-12"
   DEBIAN_ARM64_TAG: "arm64v8-2019-11-06"
   DEBIAN_ARM64_TEST_TAG: "arm64v8-test-2019-11-12"

diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 80a36508c8ce372e27cf1977c4086988b7999290..981295e8ac4c5b97b6de8141b1aa21ea288b4f33 100644 (file)
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -159,7 +159,7 @@ rm -rf $LIBPCIACCESS_VERSION
 
 wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2
 tar -xvf $LIBDRM_VERSION.tar.bz2 && rm $LIBDRM_VERSION.tar.bz2
-cd $LIBDRM_VERSION; ./configure --enable-vc4 --enable-freedreno --enable-etnaviv-experimental-api; make install; cd ..
+cd $LIBDRM_VERSION; meson build -D vc4=true -D freedreno=true -D etnaviv=true; ninja -j4 -C build install; cd ..
 rm -rf $LIBDRM_VERSION
 
 wget $XORG_RELEASES/proto/$RANDRPROTO_VERSION.tar.bz2