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

[mesa.git] / .gitlab-ci / debian-install.sh

diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 578074ddb87869fc69910698b6a36885b5cfc00b..2acdaf438ee06312f12dab2eec459a6a63d21481 100644 (file)
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -16,12 +16,11 @@ apt-get install -y \
       curl \
       wget \
       unzip \
-      gnupg \
-      software-properties-common
+      gnupg
 
 curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-add-apt-repository "deb https://apt.llvm.org/stretch/ llvm-toolchain-stretch-7 main"
-add-apt-repository "deb https://apt.llvm.org/stretch/ llvm-toolchain-stretch-8 main"
+echo "deb [trusted=yes] https://apt.llvm.org/stretch/ llvm-toolchain-stretch-7 main" >/etc/apt/sources.list.d/llvm7.list
+echo "deb [trusted=yes] https://apt.llvm.org/stretch/ llvm-toolchain-stretch-8 main" >/etc/apt/sources.list.d/llvm8.list
 
 sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
 echo 'deb https://deb.debian.org/debian stretch-backports main' >/etc/apt/sources.list.d/backports.list
@@ -46,8 +45,8 @@ apt-get install -y -t stretch-backports \
       clang-8
 
 # Install remaining packages from Debian buster to get newer versions
-add-apt-repository "deb https://deb.debian.org/debian/ buster main"
-add-apt-repository "deb https://deb.debian.org/debian/ buster-updates main"
+echo "deb https://deb.debian.org/debian/ buster main" >/etc/apt/sources.list.d/buster.list
+echo "deb https://deb.debian.org/debian/ buster-updates main" >/etc/apt/sources.list.d/buster-updates.list
 apt-get update
 apt-get install -y \
       bzip2 \
@@ -70,6 +69,7 @@ apt-get install -y \
       libelf-dev \
       libunwind-dev \
       libglvnd-dev \
+      libgtk-3-dev \
       python-mako \
       python3-mako \
       meson \
@@ -121,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
@@ -220,6 +220,5 @@ apt-get purge -y \
       libtool \
       curl \
       unzip \
-      gnupg \
-      software-properties-common
+      gnupg
 apt-get autoremove -y --purge