mirror of
https://gitlab.freedesktop.org/wayland/weston.git
synced 2025-12-30 16:40:15 +01:00
gitlab-ci: Build mesa without GLX
And implicitly remove the need to build autoconf and libx11. Removed wget and xutils-dev as those are not needed anymore. Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
This commit is contained in:
parent
8da9b0baec
commit
87d2d3e442
3 changed files with 2 additions and 27 deletions
|
|
@ -43,7 +43,7 @@
|
||||||
variables:
|
variables:
|
||||||
FDO_UPSTREAM_REPO: wayland/weston
|
FDO_UPSTREAM_REPO: wayland/weston
|
||||||
FDO_REPO_SUFFIX: "$BUILD_OS-$FDO_DISTRIBUTION_VERSION/$BUILD_ARCH"
|
FDO_REPO_SUFFIX: "$BUILD_OS-$FDO_DISTRIBUTION_VERSION/$BUILD_ARCH"
|
||||||
FDO_DISTRIBUTION_TAG: '2025-11-17-mesa-25.3.0'
|
FDO_DISTRIBUTION_TAG: '2025-11-17-remove-autoconf'
|
||||||
|
|
||||||
|
|
||||||
include:
|
include:
|
||||||
|
|
|
||||||
|
|
@ -159,27 +159,6 @@ fdo_log_section_end install_vulkan_headers
|
||||||
# please be prepared for some of the tests to change output, which will need to
|
# please be prepared for some of the tests to change output, which will need to
|
||||||
# be manually inspected for correctness.
|
# be manually inspected for correctness.
|
||||||
fdo_log_section_start_collapsed install_mesa "install_mesa"
|
fdo_log_section_start_collapsed install_mesa "install_mesa"
|
||||||
wget https://ftp.gnu.org/gnu/autoconf/autoconf-2.72.tar.xz
|
|
||||||
tar -xJf autoconf-2.72.tar.xz
|
|
||||||
cd autoconf-2.72
|
|
||||||
./configure
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
cd ..
|
|
||||||
rm -rf autoconf-2.72*
|
|
||||||
|
|
||||||
# Mesa >= 25.2 depends on libX11 >= 1.8, which is not available in the Debian
|
|
||||||
# LTS images.
|
|
||||||
git clone --branch libX11-1.8.12 --depth=1 https://gitlab.freedesktop.org/xorg/lib/libx11.git
|
|
||||||
cd libx11
|
|
||||||
autoreconf -ivf
|
|
||||||
mkdir _builddir
|
|
||||||
cd _builddir
|
|
||||||
../configure --disable-silent-rules --enable-specs
|
|
||||||
make ${MAKEFLAGS}
|
|
||||||
make install
|
|
||||||
cd ../..
|
|
||||||
rm -rf libx11
|
|
||||||
|
|
||||||
# Needed for Mesa >= 25.3
|
# Needed for Mesa >= 25.3
|
||||||
git clone --branch 12.2.0 --depth=1 https://github.com/KhronosGroup/glslang
|
git clone --branch 12.2.0 --depth=1 https://github.com/KhronosGroup/glslang
|
||||||
|
|
@ -195,7 +174,7 @@ cd mesa
|
||||||
meson setup build --wrap-mode=nofallback -Dauto_features=disabled \
|
meson setup build --wrap-mode=nofallback -Dauto_features=disabled \
|
||||||
-Dgallium-drivers=llvmpipe -Dvulkan-drivers=swrast -Dvideo-codecs= \
|
-Dgallium-drivers=llvmpipe -Dvulkan-drivers=swrast -Dvideo-codecs= \
|
||||||
-Degl=enabled -Dgbm=enabled -Dgles2=enabled -Dllvm=enabled \
|
-Degl=enabled -Dgbm=enabled -Dgles2=enabled -Dllvm=enabled \
|
||||||
-Dshared-glapi=enabled
|
-Dshared-glapi=enabled -Dglx=disabled
|
||||||
ninja ${NINJAFLAGS} -C build install
|
ninja ${NINJAFLAGS} -C build install
|
||||||
cd ..
|
cd ..
|
||||||
rm -rf mesa
|
rm -rf mesa
|
||||||
|
|
|
||||||
|
|
@ -29,12 +29,8 @@ MESA_DEV_PKGS="
|
||||||
# These get temporarily installed for other build dependencies and then
|
# These get temporarily installed for other build dependencies and then
|
||||||
# force-removed.
|
# force-removed.
|
||||||
# cmake is used by Vulkan-Headers
|
# cmake is used by Vulkan-Headers
|
||||||
# wget is used by autoconf
|
|
||||||
# xutils-dev is used by libX11
|
|
||||||
BUILD_DEV_PKGS="
|
BUILD_DEV_PKGS="
|
||||||
cmake
|
cmake
|
||||||
wget
|
|
||||||
xutils-dev
|
|
||||||
"
|
"
|
||||||
|
|
||||||
# Needed for running the custom-built mesa
|
# Needed for running the custom-built mesa
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue