ci: bump libdrm from 2.4.110 to 2.4.114 present in Debian 12
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21977>
This commit is contained in:
@@ -3,13 +3,13 @@
|
|||||||
|
|
||||||
set -ex
|
set -ex
|
||||||
|
|
||||||
export LIBDRM_VERSION=libdrm-2.4.110
|
export LIBDRM_VERSION=libdrm-2.4.114
|
||||||
|
|
||||||
curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
|
curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
|
||||||
https://dri.freedesktop.org/libdrm/"$LIBDRM_VERSION".tar.xz
|
https://dri.freedesktop.org/libdrm/"$LIBDRM_VERSION".tar.xz
|
||||||
tar -xvf "$LIBDRM_VERSION".tar.xz && rm "$LIBDRM_VERSION".tar.xz
|
tar -xvf "$LIBDRM_VERSION".tar.xz && rm "$LIBDRM_VERSION".tar.xz
|
||||||
cd "$LIBDRM_VERSION"
|
cd "$LIBDRM_VERSION"
|
||||||
meson setup build -D vc4=false -D freedreno=false -D etnaviv=false $EXTRA_MESON_ARGS
|
meson setup build -D vc4=disabled -D freedreno=disabled -D etnaviv=disabled $EXTRA_MESON_ARGS
|
||||||
meson install -C build
|
meson install -C build
|
||||||
cd ..
|
cd ..
|
||||||
rm -rf "$LIBDRM_VERSION"
|
rm -rf "$LIBDRM_VERSION"
|
||||||
|
@@ -32,7 +32,7 @@ sh .gitlab-ci/container/create-android-cross-file.sh /$ndk arm-linux-androideabi
|
|||||||
|
|
||||||
# Not using build-libdrm.sh because we don't want its cleanup after building
|
# Not using build-libdrm.sh because we don't want its cleanup after building
|
||||||
# each arch. Fetch and extract now.
|
# each arch. Fetch and extract now.
|
||||||
export LIBDRM_VERSION=libdrm-2.4.110
|
export LIBDRM_VERSION=libdrm-2.4.114
|
||||||
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
|
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
|
||||||
-O https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz
|
-O https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz
|
||||||
tar -xf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz
|
tar -xf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz
|
||||||
@@ -48,14 +48,13 @@ for arch in \
|
|||||||
meson setup build-$arch \
|
meson setup build-$arch \
|
||||||
--cross-file=/cross_file-$arch.txt \
|
--cross-file=/cross_file-$arch.txt \
|
||||||
--libdir=lib/$arch \
|
--libdir=lib/$arch \
|
||||||
-Dlibkms=false \
|
-Dnouveau=disabled \
|
||||||
-Dnouveau=false \
|
-Dvc4=disabled \
|
||||||
-Dvc4=false \
|
-Detnaviv=disabled \
|
||||||
-Detnaviv=false \
|
-Dfreedreno=disabled \
|
||||||
-Dfreedreno=false \
|
-Dintel=disabled \
|
||||||
-Dintel=false \
|
-Dcairo-tests=disabled \
|
||||||
-Dcairo-tests=false \
|
-Dvalgrind=disabled
|
||||||
-Dvalgrind=false
|
|
||||||
meson install -C build-$arch
|
meson install -C build-$arch
|
||||||
cd ..
|
cd ..
|
||||||
done
|
done
|
||||||
|
Reference in New Issue
Block a user