[Bf-blender-cvs] [5d53e6b3c1c] master: Deps: include libxkbcommon-devel for Linux build script, remove wayland
Campbell Barton
noreply at git.blender.org
Fri Oct 14 10:13:18 CEST 2022
Commit: 5d53e6b3c1cf9a7967bad502cd7eb1561ae565a4
Author: Campbell Barton
Date: Fri Oct 14 19:10:19 2022 +1100
Branches: master
https://developer.blender.org/rB5d53e6b3c1cf9a7967bad502cd7eb1561ae565a4
Deps: include libxkbcommon-devel for Linux build script, remove wayland
- Include libxkbcommon headers: needed for building Blender with Wayland.
- Remove Wayland libraries (now wayland is built locally).
- Split up packages into two lists, one for building libs,
another for building Blender - since it's useful to be able to build
Blender, testing the libs work as expected.
===================================================================
M build_files/build_environment/linux/linux-centos7-setup.sh
===================================================================
diff --git a/build_files/build_environment/linux/linux-centos7-setup.sh b/build_files/build_environment/linux/linux-centos7-setup.sh
index f07db91cc38..e664f530edb 100644
--- a/build_files/build_environment/linux/linux-centos7-setup.sh
+++ b/build_files/build_environment/linux/linux-centos7-setup.sh
@@ -26,8 +26,7 @@ yum -y install centos-release-scl
yum -y install devtoolset-9
# Install packages needed for Blender's dependencies.
-
-PACKAGES=(
+PACKAGES_FOR_LIBS=(
# Used to checkout Blender's code.
git
# Used to checkout Blender's `../lib/` directory.
@@ -91,13 +90,15 @@ PACKAGES=(
flex
# TODO: dependencies build without this, consider removal.
ncurses-devel
+)
- wayland-devel
- libwayland-client
- libwayland-server
+# Additional packages needed for building Blender.
+PACKAGES_FOR_BLENDER=(
+ # Required by Blender build option: `WITH_GHOST_WAYLAND`.
+ libxkbcommon-devel
)
-yum -y install -y ${PACKAGES[@]}
+yum -y install -y ${PACKAGES_FOR_LIBS[@]} ${PACKAGES_FOR_BLENDER[@]}
# Dependencies for Mesa
yum -y install expat-devel
More information about the Bf-blender-cvs
mailing list