freedreno/a6xx: Program state for tessellation stages

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

diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 8a74b2877da5c391de4ad100be10fac2e8a0acb2..b04357903c49af6d9d1a80de98b3bba0335e632c 100644 (file)
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -5,7 +5,7 @@ set -o xtrace
 
 export DEBIAN_FRONTEND=noninteractive
 
-CROSS_ARCHITECTURES="armhf arm64 i386"
+CROSS_ARCHITECTURES="i386"
 for arch in $CROSS_ARCHITECTURES; do
     dpkg --add-architecture $arch
 done
@@ -58,11 +58,18 @@ apt-get install -y --no-remove \
       libx11-xcb-dev \
       libelf-dev \
       libunwind-dev \
-      libglvnd-dev \
+      autoconf \
+      automake \
+      autotools-dev \
+      libtool \
+      libxext-dev \
+      libx11-dev \
+      x11proto-gl-dev \
       libgtk-3-dev \
       libpng-dev \
       libgbm-dev \
       libgles2-mesa-dev \
+      libvulkan-dev \
       python-mako \
       python3-mako \
       bison \
@@ -115,7 +122,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.99
+export             LIBDRM_VERSION=libdrm-2.4.100
 export           XCBPROTO_VERSION=xcb-proto-1.13
 export         RANDRPROTO_VERSION=randrproto-1.5.0
 export          LIBXRANDR_VERSION=libXrandr-1.5.0
@@ -196,6 +203,17 @@ tar -xvf $WAYLAND_PROTOCOLS_VERSION.tar.xz && rm $WAYLAND_PROTOCOLS_VERSION.tar.
 cd $WAYLAND_PROTOCOLS_VERSION; ./configure; make install; cd ..
 rm -rf $WAYLAND_PROTOCOLS_VERSION
 
+
+# The version of libglvnd-dev in debian is too old
+# Check this page to see when this local compilation can be dropped in favour of the package:
+# https://packages.debian.org/libglvnd-dev
+GLVND_VERSION=1.2.0
+wget https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v$GLVND_VERSION/libglvnd-v$GLVND_VERSION.tar.gz
+tar -xvf libglvnd-v$GLVND_VERSION.tar.gz && rm libglvnd-v$GLVND_VERSION.tar.gz
+pushd libglvnd-v$GLVND_VERSION; ./autogen.sh; ./configure; make install; popd
+rm -rf libglvnd-v$GLVND_VERSION
+
+
 pushd /usr/local
 git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
 rm -rf shader-db/.git
@@ -216,9 +234,11 @@ for arch in $CROSS_ARCHITECTURES; do
   /usr/share/meson/debcrossgen --arch "$arch" -o "$cross_file"
   # Explicitly set ccache path for cross compilers
   sed -i "s|/usr/bin/\([^-]*\)-linux-gnu\([^-]*\)-g|/usr/lib/ccache/\\1-linux-gnu\\2-g|g" "$cross_file"
-  # Work around a bug in debcrossgen that should be fixed in the next release
   if [ "$arch" = "i386" ]; then
+    # Work around a bug in debcrossgen that should be fixed in the next release
     sed -i "s|cpu_family = 'i686'|cpu_family = 'x86'|g" "$cross_file"
+    # Don't need wrapper for i386 executables
+    sed -i -e '/\[properties\]/a\' -e "needs_exe_wrapper = False" "$cross_file"
   fi
 done
 
@@ -276,6 +296,11 @@ apt-get purge -y \
       unzip \
       cmake \
       git \
+      autoconf \
+      automake \
+      autotools-dev \
+      libtool \
+      x11proto-gl-dev \
       libgles2-mesa-dev \
       libgbm-dev