gitlab-ci: add gtk3 dev files for `-D tools=intel-ui`

We also need to update wayland-protocols and libXrandr (and randrproto),
as they are too old for gdk3 (which gtk3 depends on).

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dde82bf755f3e5d476d5672ceef4b2cfdf505a8e..f4826f579711439604abbce5981ee2c83da443ad 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: "2019-07-23"
+  DEBIAN_TAG: "2019-08-03"
   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 004dde8cabc8a7838b79b4d07ee2d9fd09307122..2acdaf438ee06312f12dab2eec459a6a63d21481 100644 (file)
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -69,6 +69,7 @@ apt-get install -y \
       libelf-dev \
       libunwind-dev \
       libglvnd-dev \
+      libgtk-3-dev \
       python-mako \
       python3-mako \
       meson \
@@ -120,14 +121,14 @@ export          DRI2PROTO_VERSION=dri2proto-2.8
 export       LIBPCIACCESS_VERSION=libpciaccess-0.13.4
 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
+export         RANDRPROTO_VERSION=randrproto-1.5.0
+export          LIBXRANDR_VERSION=libXrandr-1.5.0
 export             LIBXCB_VERSION=libxcb-1.13
 export       LIBXSHMFENCE_VERSION=libxshmfence-1.3
 export           LIBVDPAU_VERSION=libvdpau-1.1
 export              LIBVA_VERSION=libva-1.7.0
 export         LIBWAYLAND_VERSION=wayland-1.15.0
-export  WAYLAND_PROTOCOLS_VERSION=wayland-protocols-1.8
+export  WAYLAND_PROTOCOLS_VERSION=wayland-protocols-1.12
 
 wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
 tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2