diff options
| author | L. E. Segovia <amy@centricular.com> | 2026-06-25 23:07:46 -0300 |
|---|---|---|
| committer | L. E. Segovia <amy@centricular.com> | 2026-06-27 14:52:02 +0000 |
| commit | 13dae5ff17fc66d4a29cfe095d66b840151a8e26 (patch) | |
| tree | 07e87386d99c4a5d78555a77ba6cd2a538d5cc51 | |
| parent | d11becd7c994b65b9282e4b1fe747195e7888807 (diff) | |
gst-plugins-rs: fix incorrect location for the rsworkspace library
The change in !2227 is tripping the Android LA generation, because
the presence of a library in /gstreamer-1.0/ triggers a lookup of
its .pc file in the corresponding folder.
So move the file out of /gstreamer-1.0/ and adjust accordingly.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/2254>
| -rw-r--r-- | recipes/gst-plugins-rs.recipe | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes/gst-plugins-rs.recipe b/recipes/gst-plugins-rs.recipe index 07581415..9f164f20 100644 --- a/recipes/gst-plugins-rs.recipe +++ b/recipes/gst-plugins-rs.recipe @@ -264,7 +264,7 @@ class Recipe(recipe.Recipe): self.set_env('LIBRARY_PATH') if self.requires_melding(): - self.workspace_lib = Path(self.config.libdir) / 'gstreamer-1.0' / 'libgstrsworkspace.a' + self.workspace_lib = Path(self.config.libdir) / 'libgstrsworkspace.a' # gstrsworkspace describes the dragonfire-melded workspace # meta-library, not a GStreamer plugin (no gst_plugin_*_register # entrypoint). Install its .pc under lib/pkgconfig/ rather than @@ -277,9 +277,9 @@ class Recipe(recipe.Recipe): # lib/pkgconfig/ and lib/gstreamer-1.0/pkgconfig/ by default. self.workspace_pc = Path(self.config.libdir) / 'pkgconfig' / 'gstrsworkspace.pc' # Append the melded library - self.files_plugins_core_devel.append('%(libdir)s/gstreamer-1.0/libgstrsworkspace.a') - self.files_plugins_core_devel.append('%(libdir)s/pkgconfig/gstrsworkspace.pc') - self.skip_pdb_files = ['%(libdir)s/gstreamer-1.0/libgstrsworkspace.a'] + self.files_devel.append('%(libdir)s/libgstrsworkspace.a') + self.files_devel.append('%(libdir)s/pkgconfig/gstrsworkspace.pc') + self.skip_pdb_files = ['%(libdir)s/libgstrsworkspace.a'] if self.config.target_platform == Platform.WINDOWS: if self.config.platform == Platform.WINDOWS: |