X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci%2Fcontainer%2Fx86_build.sh;h=75a45ea82318a440b4c87d5ab2610419a8c83565;hb=d3b652f13d89726757a0fd0d2d9c07084dd90a16;hp=562bde8a6b92f5c38df6e3bdd8458403a926ff1d;hpb=89caa485f15927ebc1f666b57732b55516288c1b;p=mesa.git

diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh
index 562bde8a6b9..75a45ea8231 100644
--- a/.gitlab-ci/container/x86_build.sh
+++ b/.gitlab-ci/container/x86_build.sh
@@ -12,7 +12,6 @@ STABLE_EPHEMERAL=" \
       autotools-dev \
       bzip2 \
       cmake \
-      git \
       gnupg \
       libgbm-dev \
       libtool \
@@ -27,6 +26,9 @@ apt-get update
 
 apt-get install -y --no-remove \
       $STABLE_EPHEMERAL \
+      libarchive-dev \
+      liblua5.3-dev \
+      libxml2-dev \
       wine-development \
       wine32-development
 
@@ -54,10 +56,9 @@ export               XCB_RELEASES=https://xcb.freedesktop.org/dist
 export           WAYLAND_RELEASES=https://wayland.freedesktop.org/releases
 
 export         XORGMACROS_VERSION=util-macros-1.19.0
-export             LIBDRM_VERSION=libdrm-2.4.100
 export           XCBPROTO_VERSION=xcb-proto-1.13
 export             LIBXCB_VERSION=libxcb-1.13
-export         LIBWAYLAND_VERSION=wayland-1.15.0
+export         LIBWAYLAND_VERSION=wayland-1.17.0
 export  WAYLAND_PROTOCOLS_VERSION=wayland-protocols-1.12
 
 wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
@@ -75,12 +76,7 @@ tar -xvf $LIBXCB_VERSION.tar.bz2 && rm $LIBXCB_VERSION.tar.bz2
 cd $LIBXCB_VERSION; ./configure; make install; cd ..
 rm -rf $LIBXCB_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
-meson build -D vc4=true -D freedreno=true -D etnaviv=true -D libdir=lib/x86_64-linux-gnu; ninja -C build install
-cd ..
-rm -rf $LIBDRM_VERSION
+. .gitlab-ci/build-libdrm.sh
 
 wget $WAYLAND_RELEASES/$LIBWAYLAND_VERSION.tar.xz
 tar -xvf $LIBWAYLAND_VERSION.tar.xz && rm $LIBWAYLAND_VERSION.tar.xz
@@ -96,7 +92,7 @@ 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
+GLVND_VERSION=1.3.2
 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