From: Christian Gmeiner Date: Wed, 3 Jul 2019 21:12:33 +0000 (+0200) Subject: gitlab-ci: bump required libdrm version X-Git-Tag: upstream/19.3.0~4706 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e519d3c239c4c52b42f01dc96bffb004064d0843;p=platform%2Fupstream%2Fmesa.git gitlab-ci: bump required libdrm version Fixes following build problem: Message: libdrm 2.4.99 needed because amdgpu has the highest requirement Dependency libdrm_intel found: NO found '2.4.97' but need: '>=2.4.99' Dependency libdrm_intel found: NO meson.build:1178:4: ERROR: Invalid version of dependency, need 'libdrm_intel' ['>=2.4.99'] found '2.4.97'. Signed-off-by: Christian Gmeiner Reviewed-by: Eric Engestrom --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0e743a..a81833d 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: "2019-05-08" + DEBIAN_TAG: "2019-07-04" DEBIAN_VERSION: stretch-slim DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG" diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 7c242ba..1e4d328 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -94,7 +94,7 @@ export XORGMACROS_VERSION=util-macros-1.19.0 export GLPROTO_VERSION=glproto-1.4.17 export DRI2PROTO_VERSION=dri2proto-2.8 export LIBPCIACCESS_VERSION=libpciaccess-0.13.4 -export LIBDRM_VERSION=libdrm-2.4.97 +export LIBDRM_VERSION=libdrm-2.4.99 export XCBPROTO_VERSION=xcb-proto-1.13 export RANDRPROTO_VERSION=randrproto-1.3.0 export LIBXRANDR_VERSION=libXrandr-1.3.0