From 2a46d0ad97d3ca310325c31ba9aef633c25eb3cb Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Fri, 29 Apr 2016 09:36:43 +0200 Subject: gst-validate1: fix dependencies Signed-off-by: Michael Olbrich --- rules/gst-validate1.in | 6 ++++++ rules/gst-validate1.make | 17 +++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/rules/gst-validate1.in b/rules/gst-validate1.in index fd8ae885b..7c6296cbc 100644 --- a/rules/gst-validate1.in +++ b/rules/gst-validate1.in @@ -4,6 +4,8 @@ menuconfig GST_VALIDATE1 tristate select GSTREAMER1 select GST_PLUGINS_BASE1 + select CAIRO if GST_VALIDATE1_VIDEO + select CAIRO_PNG if GST_VALIDATE1_VIDEO select PYTHON if RUNTIME prompt "gst-validate " help @@ -14,6 +16,10 @@ menuconfig GST_VALIDATE1 if GST_VALIDATE1 +config GST_VALIDATE1_VIDEO + bool + prompt "install video plugins and tools" + config GST_VALIDATE1_LAUNCHER bool prompt "install gst-validate-launcher" diff --git a/rules/gst-validate1.make b/rules/gst-validate1.make index 6cb6f8892..619f48e2d 100644 --- a/rules/gst-validate1.make +++ b/rules/gst-validate1.make @@ -70,8 +70,6 @@ $(STATEDIR)/gst-validate1.targetinstall: @$(call install_lib, gst-validate1, 0, 0, 0644, libgstvalidate-1.0) @$(call install_lib, gst-validate1, 0, 0, 0644, \ libgstvalidate-default-overrides-1.0) - @$(call install_lib, gst-validate1, 0, 0, 0644, \ - libgstvalidatevideo-1.0) @$(call install_lib, gst-validate1, 0, 0, 0644, \ gstreamer-1.0/libgstvalidateplugin-1.0) @@ -80,13 +78,9 @@ $(STATEDIR)/gst-validate1.targetinstall: gstreamer-1.0/validate/libgstvalidatefaultinjection) @$(call install_lib, gst-validate1, 0, 0, 0644, \ gstreamer-1.0/validate/libgstvalidategapplication) - @$(call install_lib, gst-validate1, 0, 0, 0644, \ - gstreamer-1.0/validate/libgstvalidatessim) @$(call install_copy, gst-validate1, 0, 0, 0755, -, \ /usr/bin/gst-validate-1.0) - @$(call install_copy, gst-validate1, 0, 0, 0755, -, \ - /usr/bin/gst-validate-images-check-1.0) @$(call install_copy, gst-validate1, 0, 0, 0755, -, \ /usr/bin/gst-validate-media-check-1.0) @$(call install_copy, gst-validate1, 0, 0, 0755, -, \ @@ -95,6 +89,17 @@ $(STATEDIR)/gst-validate1.targetinstall: @$(call install_tree, gst-validate1, 0, 0, -, \ /usr/share/gstreamer-1.0/validate/scenarios) +ifdef PTXCONF_GST_VALIDATE1_VIDEO + @$(call install_lib, gst-validate1, 0, 0, 0644, \ + libgstvalidatevideo-1.0) + + @$(call install_lib, gst-validate1, 0, 0, 0644, \ + gstreamer-1.0/validate/libgstvalidatessim) + + @$(call install_copy, gst-validate1, 0, 0, 0755, -, \ + /usr/bin/gst-validate-images-check-1.0) +endif + ifdef PTXCONF_GST_VALIDATE1_LAUNCHER @$(call install_copy, gst-validate1, 0, 0, 0755, -, \ /usr/bin/gst-validate-launcher) -- cgit v1.2.3