Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-10-14 11:10:19 +0300
committerCampbell Barton <campbell@blender.org>2022-10-14 11:12:11 +0300
commit5d53e6b3c1cf9a7967bad502cd7eb1561ae565a4 (patch)
tree1185cac1507808283b8c40955d2e7da77a09fd4b /build_files
parent06081d48e364d642c0af2734d0107c20282227b6 (diff)
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.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/build_environment/linux/linux-centos7-setup.sh13
1 files changed, 7 insertions, 6 deletions
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