summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Waters <matthew@centricular.com>2021-05-17 15:08:08 +1000
committerMatthew Waters <matthew@centricular.com>2021-05-17 15:08:08 +1000
commit71e7c59330c353c01ad0a9705a8d75ec82fb2ddb (patch)
tree7c73fb3e195cd92acd6f2a99bb8c4d64740459de
parent8445166561d5e9f849314adf80913a058b20abe0 (diff)
recipes/devtools/ges: fix universal packaging
Directory lists only work when they are the only package wanting to contain files there. If multiple recipes specify a directory in the file list, the second is ignored which means that files are not copied from the arch-speific directory to the final universal prefix. Fixes package with macos universal Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/701>
-rw-r--r--recipes/gst-devtools-1.0.recipe3
-rw-r--r--recipes/gst-editing-services-1.0.recipe3
2 files changed, 5 insertions, 1 deletions
diff --git a/recipes/gst-devtools-1.0.recipe b/recipes/gst-devtools-1.0.recipe
index 0aaa762d..a7ee992d 100644
--- a/recipes/gst-devtools-1.0.recipe
+++ b/recipes/gst-devtools-1.0.recipe
@@ -16,7 +16,8 @@ class Recipe(custom.GStreamer):
files_devel = ["include/gstreamer-1.0/gst/validate/*.h",
"lib/pkgconfig/gst-validate-1.0.pc"]
- files_validate = ["lib/gst-validate-launcher/",
+ files_validate = ["lib/gst-validate-launcher/python/launcher/",
+ "lib/gst-validate-launcher/",
'bin/gst-validate-launcher',
"share/gstreamer-1.0/validate/scenarios/*.scenario"
]
diff --git a/recipes/gst-editing-services-1.0.recipe b/recipes/gst-editing-services-1.0.recipe
index 61f0559d..a20a898b 100644
--- a/recipes/gst-editing-services-1.0.recipe
+++ b/recipes/gst-editing-services-1.0.recipe
@@ -17,4 +17,7 @@ class Recipe(custom.GStreamer):
files_plugins_ges_devel = ['lib/gstreamer-1.0/libgstnle.a', 'lib/gstreamer-1.0/libgstnle.la',
'lib/gstreamer-1.0/libgstges.a', 'lib/gstreamer-1.0/libgstges.la']
+ files_validate = ['lib/gst-validate-launcher/python/launcher/apps/geslaunch.py',
+ 'share/gstreamer-1.0/validate/scenarios/ges-edit-clip-while-paused.scenario']
+
# files_python = ['site-packages/ges%(pext)s']