diff --git a/build_files/build_environment/install_linux_packages.py b/build_files/build_environment/install_linux_packages.py index 364888fa81a..dd15666a410 100755 --- a/build_files/build_environment/install_linux_packages.py +++ b/build_files/build_environment/install_linux_packages.py @@ -540,7 +540,7 @@ def suse_pypackages_name_gen(name): PYTHON_SUBPACKAGES = ( Package(name="Cython", - version="3.0.10", version_short="3.0", version_min="3.0", version_mex="4.0", + version="3.0.11", version_short="3.0", version_min="3.0", version_mex="4.0", distro_package_names={DISTRO_ID_DEBIAN: "cython3", DISTRO_ID_FEDORA: "python3-Cython", DISTRO_ID_SUSE: suse_pypackages_name_gen("Cython"), @@ -614,102 +614,6 @@ PYTHON_SUBPACKAGES = ( ) -# List of boost individual libraries, some distro do not install everything anymore with the generic boost package. -BOOST_SUBPACKAGES = ( - Package(name="LibBoost FileSystem", is_mandatory=True, - distro_package_names={DISTRO_ID_DEBIAN: "libboost-filesystem-dev", - DISTRO_ID_FEDORA: ..., - DISTRO_ID_SUSE: "libboost_filesystem-devel", - DISTRO_ID_ARCH: ..., - }, - ), - Package(name="LibBoost Locale", is_mandatory=True, - distro_package_names={DISTRO_ID_DEBIAN: "libboost-locale-dev", - DISTRO_ID_FEDORA: ..., - DISTRO_ID_SUSE: "libboost_locale-devel", - DISTRO_ID_ARCH: ..., - }, - ), - Package(name="LibBoost Thread", is_mandatory=True, - distro_package_names={DISTRO_ID_DEBIAN: "libboost-thread-dev", - DISTRO_ID_FEDORA: ..., - DISTRO_ID_SUSE: "libboost_thread-devel", - DISTRO_ID_ARCH: ..., - }, - ), - Package(name="LibBoost Regex", is_mandatory=True, - distro_package_names={DISTRO_ID_DEBIAN: "libboost-regex-dev", - DISTRO_ID_FEDORA: ..., - DISTRO_ID_SUSE: "libboost_regex-devel", - DISTRO_ID_ARCH: ..., - }, - ), - Package(name="LibBoost System", is_mandatory=True, - distro_package_names={DISTRO_ID_DEBIAN: "libboost-system-dev", - DISTRO_ID_FEDORA: ..., - DISTRO_ID_SUSE: "libboost_system-devel", - DISTRO_ID_ARCH: ..., - }, - ), - Package(name="LibBoost Date/Time", is_mandatory=True, - distro_package_names={DISTRO_ID_DEBIAN: "libboost-date-time-dev", - DISTRO_ID_FEDORA: ..., - DISTRO_ID_SUSE: "libboost_date_time-devel", - DISTRO_ID_ARCH: ..., - }, - ), - Package(name="LibBoost Wave", is_mandatory=True, - distro_package_names={DISTRO_ID_DEBIAN: "libboost-wave-dev", - DISTRO_ID_FEDORA: ..., - DISTRO_ID_SUSE: "libboost_wave-devel", - DISTRO_ID_ARCH: ..., - }, - ), - Package(name="LibBoost Atomic", is_mandatory=True, - distro_package_names={DISTRO_ID_DEBIAN: "libboost-atomic-dev", - DISTRO_ID_FEDORA: ..., - DISTRO_ID_SUSE: "libboost_atomic-devel", - DISTRO_ID_ARCH: ..., - }, - ), - Package(name="LibBoost Serialization", is_mandatory=True, - distro_package_names={DISTRO_ID_DEBIAN: "libboost-serialization-dev", - DISTRO_ID_FEDORA: ..., - DISTRO_ID_SUSE: "libboost_serialization-devel", - DISTRO_ID_ARCH: ..., - }, - ), - Package(name="LibBoost ProgramOptions", is_mandatory=True, - distro_package_names={DISTRO_ID_DEBIAN: "libboost-program-options-dev", - DISTRO_ID_FEDORA: ..., - DISTRO_ID_SUSE: "libboost_program_options-devel", - DISTRO_ID_ARCH: ..., - }, - ), - Package(name="LibBoost IOStreams", is_mandatory=True, - distro_package_names={DISTRO_ID_DEBIAN: "libboost-iostreams-dev", - DISTRO_ID_FEDORA: ..., - DISTRO_ID_SUSE: "libboost_iostreams-devel", - DISTRO_ID_ARCH: ..., - }, - ), - Package(name="LibBoost Python", is_mandatory=True, - distro_package_names={DISTRO_ID_DEBIAN: "libboost-python-dev", - DISTRO_ID_FEDORA: ..., - DISTRO_ID_SUSE: "libboost_python3-devel", - DISTRO_ID_ARCH: ..., - }, - ), - Package(name="LibBoost Numpy", is_mandatory=True, - distro_package_names={DISTRO_ID_DEBIAN: "libboost-numpy-dev", - DISTRO_ID_FEDORA: ..., - DISTRO_ID_SUSE: "libboost_numpy3-devel", - DISTRO_ID_ARCH: ..., - }, - ), -) - - # Packages required to build Blender, which are not included in the precompiled libraries. PACKAGES_BASICS_BUILD = ( Package(name="Basics Mandatory Build", is_group=True, is_mandatory=True, sub_packages=BUILD_MANDATORY_SUBPACKAGES), @@ -744,15 +648,6 @@ PACKAGES_ALL = ( DISTRO_ID_ARCH: "python", }, ), - Package(name="Boost Libraries", is_mandatory=True, - version="1.85.0", version_short="1.85", version_min="1.49", version_mex="2.0", - sub_packages=BOOST_SUBPACKAGES, - distro_package_names={DISTRO_ID_DEBIAN: "libboost-dev", - DISTRO_ID_FEDORA: "boost-devel", - DISTRO_ID_SUSE: "boost-devel", - DISTRO_ID_ARCH: "boost", - }, - ), Package(name="TBB Library", is_mandatory=True, version="2021.13.0", version_short="2021", version_min="2021.0.0", version_mex="2023.0.0", sub_packages=(), @@ -790,7 +685,7 @@ PACKAGES_ALL = ( }, ), Package(name="OpenImageIO Library", is_mandatory=True, - version="2.5.11.0", version_short="2.5", version_min="2.5.0", version_mex="2.6.0", + version="3.0.3.1", version_short="3.0", version_min="2.5.0", version_mex="3.1.0", sub_packages=( Package(name="OpenImageIO Tools", is_mandatory=False, distro_package_names={DISTRO_ID_DEBIAN: "openimageio-tools", @@ -831,7 +726,7 @@ PACKAGES_ALL = ( }, ), Package(name="OpenShadingLanguage Library", is_mandatory=False, - version="1.13.2.0", version_short="1.13", version_min="1.11", version_mex="2.0", + version="1.14.3.0", version_short="1.14", version_min="1.11", version_mex="2.0", sub_packages=(), distro_package_names={DISTRO_ID_DEBIAN: None, # No package currently. DISTRO_ID_FEDORA: "openshadinglanguage-devel", @@ -887,7 +782,7 @@ PACKAGES_ALL = ( }, ), Package(name="MaterialX Library", is_mandatory=False, - version="1.38.10", version_short="1.38", version_min="1.38", version_mex="1.40", + version="1.39.10", version_short="1.39", version_min="1.38", version_mex="1.40", sub_packages=(), distro_package_names={DISTRO_ID_DEBIAN: None, DISTRO_ID_FEDORA: None, @@ -896,7 +791,7 @@ PACKAGES_ALL = ( }, ), Package(name="USD Library", is_mandatory=False, - version="24.11", version_short="24.11", version_min="24.05", version_mex="26.00", + version="25.02", version_short="25.02", version_min="24.05", version_mex="26.00", sub_packages=(), distro_package_names={DISTRO_ID_DEBIAN: None, DISTRO_ID_FEDORA: "usd-devel", @@ -1214,7 +1109,7 @@ class PackageInstaller: Generic heuristics to try and find 'best matching version' for a given package. For most packages it just ensures given package name version matches the exact version from the ``package``, or at least fits within the [version_min, version_mex[ range. - But some, like e.g. python, llvm or boost, can have packages available for several versions, + But some, like e.g. python or llvm, can have packages available for several versions, with complex naming (like 'python3.10', 'llvm-9-dev', etc.). This code attempts to find the best matching one possible, based on a set of 'possible names' generated by the distro-specific ``package_name_version_gen`` generator.