diff options
| author | L. E. Segovia <amy@centricular.com> | 2026-07-06 13:56:57 -0300 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer.org> | 2026-07-10 12:44:03 +0000 |
| commit | 075904f04a852a9abb4d05865548298eeead02ca (patch) | |
| tree | e5b0bc0b104ce5e6ab910c0e0119cf7c26b27e59 | |
| parent | 29b0da0fcd6ffe8f3fd288df89e60a9475a5c33a (diff) | |
package: fix recipes_dependencies not resolving dependencies of recipes
Fixes `fetch-package` not retrieving the complete dependency tree.
Also fix the `self.deps =` pattern used for the shared recipe shims, in
other places `append` is used.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/2292>
| -rw-r--r-- | cerbero/packages/package.py | 8 | ||||
| -rw-r--r-- | cerbero/packages/packagesstore.py | 2 | ||||
| -rw-r--r-- | recipes/lcevcdec.recipe | 2 | ||||
| -rw-r--r-- | recipes/svt-av1.recipe | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/cerbero/packages/package.py b/cerbero/packages/package.py index f9139c9b..8844c583 100644 --- a/cerbero/packages/package.py +++ b/cerbero/packages/package.py @@ -294,10 +294,12 @@ class Package(PackageBase): self._parse_files() def recipes_dependencies(self, use_devel=True): - deps = [x.split(':')[0] for x in self._files] + deps = [] + recipes = [x.split(':')[0] for x in self._files] if use_devel: - deps.extend([x.split(':')[0] for x in self._files_devel]) - + recipes.extend([x.split(':')[0] for x in self._files_devel]) + for recipe in recipes: + deps.extend([r.name for r in self.cookbook.list_recipe_deps(recipe)]) for name in self.deps: p = self.store.get_package(name) deps += p.recipes_dependencies(use_devel) diff --git a/cerbero/packages/packagesstore.py b/cerbero/packages/packagesstore.py index 563ce4c5..98531bc7 100644 --- a/cerbero/packages/packagesstore.py +++ b/cerbero/packages/packagesstore.py @@ -73,7 +73,7 @@ class PackagesStore(object): raise PackageNotFoundError(name) return self._packages[name] - def get_package_deps(self, pkg, recursive=False): + def get_package_deps(self, pkg, recursive=True): """ Gets the dependencies of a package diff --git a/recipes/lcevcdec.recipe b/recipes/lcevcdec.recipe index 6d43d25c..5f87943f 100644 --- a/recipes/lcevcdec.recipe +++ b/recipes/lcevcdec.recipe @@ -80,7 +80,7 @@ class LcevcdecRecipe(LcevcdecBase, recipe.Recipe): 'liblcevc_dec_sequencer', 'liblcevc_dec_pipeline', ] else: - self.deps = ['lcevcdec-static'] + self.deps += ['lcevcdec-static'] def post_install(self): # CMake does not generate la files diff --git a/recipes/svt-av1.recipe b/recipes/svt-av1.recipe index e3284fae..e6932285 100644 --- a/recipes/svt-av1.recipe +++ b/recipes/svt-av1.recipe @@ -70,7 +70,7 @@ class SvtAv1Recipe(SvtAv1Base, recipe.Recipe): if Platform.is_app_platform(self.config.target_platform): self.library_type = LibraryType.STATIC else: - self.deps = ['svt-av1-static'] + self.deps += ['svt-av1-static'] def post_install(self): if self.using_msvc(): |