From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date: Sat, 21 Jul 2018 13:13:27 +0000 (-0400)
Subject: meson: gl/gtk tests: Add video_dep to the helper
X-Git-Tag: 1.19.3~511^2~1567
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bea4d13a992fd39d08e8a8989259f32bba08b5eb;p=platform%2Fupstream%2Fgstreamer.git

meson: gl/gtk tests: Add video_dep to the helper

The gtk helper library includes videooverlay.h hence must have a
dependency on video_dep, this allow removing the dep from the dependant
executables.
---

diff --git a/tests/examples/gl/gtk/3dvideo/meson.build b/tests/examples/gl/gtk/3dvideo/meson.build
index 4034f94..4c99dfd 100644
--- a/tests/examples/gl/gtk/3dvideo/meson.build
+++ b/tests/examples/gl/gtk/3dvideo/meson.build
@@ -1,5 +1,5 @@
 executable('3dvideo', ['main.cpp', 'mviewwidget.c'],
   cpp_args : [gst_plugins_base_args],
   include_directories: [configinc, libsinc],
-  dependencies : [gstgtkhelper_dep, gstgl_dep, video_dep, x11_dep],
+  dependencies : [gstgtkhelper_dep, gstgl_dep, x11_dep],
   install: false)
diff --git a/tests/examples/gl/gtk/filtervideooverlay/meson.build b/tests/examples/gl/gtk/filtervideooverlay/meson.build
index 9ca33a0..8964299 100644
--- a/tests/examples/gl/gtk/filtervideooverlay/meson.build
+++ b/tests/examples/gl/gtk/filtervideooverlay/meson.build
@@ -1,6 +1,6 @@
 executable('filtervideooverlay', 'main.cpp',
   cpp_args : [gst_plugins_base_args],
   include_directories: [configinc, libsinc],
-  dependencies : [gstgtkhelper_dep, video_dep, x11_dep],
+  dependencies : [gstgtkhelper_dep, x11_dep],
   install: false)
 
diff --git a/tests/examples/gl/gtk/fxtest/meson.build b/tests/examples/gl/gtk/fxtest/meson.build
index 23cc7a6..0b5ceec 100644
--- a/tests/examples/gl/gtk/fxtest/meson.build
+++ b/tests/examples/gl/gtk/fxtest/meson.build
@@ -1,11 +1,11 @@
 executable('fxtest', 'fxtest.c',
   c_args : [gst_plugins_base_args],
   include_directories: [configinc, libsinc],
-  dependencies : [gstgtkhelper_dep, video_dep, x11_dep],
+  dependencies : [gstgtkhelper_dep, x11_dep],
   install: false)
 
 executable('pixbufdrop', 'pixbufdrop.c',
   c_args : [gst_plugins_base_args],
   include_directories: [configinc, libsinc],
-  dependencies : [gstgtkhelper_dep, video_dep, x11_dep],
+  dependencies : [gstgtkhelper_dep, x11_dep],
   install: false)
diff --git a/tests/examples/gl/gtk/meson.build b/tests/examples/gl/gtk/meson.build
index 9d9a7d4..d019136 100644
--- a/tests/examples/gl/gtk/meson.build
+++ b/tests/examples/gl/gtk/meson.build
@@ -7,13 +7,13 @@ gstgtkhelper = static_library ('gstgtkhelper',
   ['gstgtk.c'],
   c_args : gst_plugins_base_args,
   include_directories : [configinc, libsinc],
-  dependencies : [gst_base_dep, gtk_dep],
+  dependencies : [gst_base_dep, video_dep, gtk_dep],
   install : false)
 
 gstgtkhelper_dep = declare_dependency(link_with: gstgtkhelper,
   compile_args : extra_args,
   include_directories : include_directories('.'),
-  dependencies : [gst_base_dep, gtk_dep])
+  dependencies : [gst_base_dep, video_dep, gtk_dep])
 
 subdir('filternovideooverlay')
 subdir('filtervideooverlay')
diff --git a/tests/examples/gl/gtk/switchvideooverlay/meson.build b/tests/examples/gl/gtk/switchvideooverlay/meson.build
index b804d08..b924e12 100644
--- a/tests/examples/gl/gtk/switchvideooverlay/meson.build
+++ b/tests/examples/gl/gtk/switchvideooverlay/meson.build
@@ -1,5 +1,5 @@
 executable('switchvideooverlay', 'main.cpp',
   cpp_args : [gst_plugins_base_args],
   include_directories: [configinc, libsinc],
-  dependencies : [gstgtkhelper_dep, gstgl_dep, video_dep, x11_dep],
+  dependencies : [gstgtkhelper_dep, gstgl_dep, x11_dep],
   install: false)