From 06347989a0e9490955bfe59c5e0011d59387c088 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 12 Nov 2019 14:29:44 +0000 Subject: [PATCH] gitlab-ci: build libdrm using meson instead of autotools MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Michel Dänzer --- .gitlab-ci.yml | 2 +- .gitlab-ci/debian-install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f3421a8358d..871975474dc 100644 --- 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 80a36508c8c..981295e8ac4 100644 --- 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