From e2be32625017417566f36f219b308597d95a1cce Mon Sep 17 00:00:00 2001 From: stilobique Date: Thu, 12 Nov 2026 11:10:03 +0100 Subject: [PATCH] Add more check to correctly get all dependency package on build --- blender/dependency.py | 16 ++++++++++------ blender/misc.py | 18 +++++++++++++++++- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/blender/dependency.py b/blender/dependency.py index 8e246f4..db552ee 100644 --- a/blender/dependency.py +++ b/blender/dependency.py @@ -4,6 +4,7 @@ import tempfile import importlib.util from blender.version import BlenderVersion +from blender.misc import get_linux_deps_file # "Wayland Protocols" has no "Library" in its name but is still a # build-critical dependency, so it's matched by name too. @@ -13,7 +14,7 @@ _EXTRA_PACKAGE_NAMES = {'wayland protocols'} class BlenderDependency: def __init__(self, blender: BlenderVersion): self._blender_version = blender - self._url = rf'https://projects.blender.org/api/v1/repos/blender/blender/raw/build_files/build_environment/install_linux_packages.py?ref=v{self._blender_version.tag_name()}' + self._url = get_linux_deps_file(self._blender_version.tag_name()) self.module = self._get_source_file() self.packages = list() @@ -54,11 +55,14 @@ class BlenderDependency: def _get_complete_list(self): """All packages required to build Blender (PACKAGES_BASICS_BUILD) as Debian/Ubuntu apt names.""" - if hasattr(self.module, 'PACKAGES_BASICS_BUILD'): - for package in self._flatten(self.module.PACKAGES_BASICS_BUILD): - name = package.distro_package_names.get(self.module.DISTRO_ID_DEBIAN) - if isinstance(name, str): - self.packages_complete.append(name) + packages = 'PACKAGES_BASICS_BUILD' + if hasattr(self.module, 'PACKAGES_BUILD'): + packages = 'PACKAGES_BUILD' + + for package in self._flatten(getattr(self.module, packages)): + name = package.distro_package_names.get(self.module.DISTRO_ID_DEBIAN) + if isinstance(name, str): + self.packages_complete.append(name) def _flatten(self, packages): """Yield every leaf Package, descending into is_group sub_packages.""" diff --git a/blender/misc.py b/blender/misc.py index ea358b6..0070ddf 100644 --- a/blender/misc.py +++ b/blender/misc.py @@ -91,7 +91,23 @@ def get_all_tags_from_docker(): for release in j: print(release) - + +def get_linux_deps_file(tag_name: str) -> str | None: + """Find the `install_linux_packages.py` about the blender version tested.""" + base = r'https://projects.blender.org/api/v1/repos/blender/blender/raw' + links = [ + rf'{base}/build_files/build_environment/install_linux_packages.py?ref=v{tag_name}', + rf'{base}/build_files/linux/install_linux_packages.py?ref=v{tag_name}' + ] + + for url in links: + r = requests.get(url) + if r.status_code == 200: + return url + + return None + + if __name__ == '__main__': print('Clean docker') clean_all_dockers()