meson:validate: Build validate plugins

diff --git a/meson.build b/meson.build
index 3c27ba92758054282817c7c266be379007679278..b0d7eb7bcdbc9b3f15e526f3a07e857a700d4d68 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -64,6 +64,7 @@ gio_dep = dependency('gio-2.0', version: glib_req)
 gmodule_dep = dependency('gmodule-2.0', version: glib_req)
 gtk_dep = dependency('gtk+-3.0', required: false)
 mathlib = cc.find_library('m', required : false)
+dl = cc.find_library('dl', required : false)
 json_dep = dependency('json-glib-1.0',
     fallback : ['json-glib', 'json_glib_dep'])
 

diff --git a/validate/gst-libs/gst/meson.build b/validate/gst-libs/gst/meson.build
new file mode 100644 (file)
index 0000000..e3b50ad
--- /dev/null
+++ b/validate/gst-libs/gst/meson.build
@@ -0,0 +1 @@
+subdir('video')

diff --git a/validate/gst-libs/gst/video/meson.build b/validate/gst-libs/gst/video/meson.build
new file mode 100644 (file)
index 0000000..8f95446
--- /dev/null
+++ b/validate/gst-libs/gst/video/meson.build
@@ -0,0 +1,8 @@
+cairo_dep = dependency('cairo', required: false)
+video = static_library(
+    'gstvalidatevideo',
+    'gstvalidatessim.c', 'gssim.c',
+    include_directories : inc_dirs,
+    dependencies : [gst_dep, gst_video_dep, glib_dep, cairo_dep, gio_dep,
+        mathlib],
+)

diff --git a/validate/gst-libs/meson.build b/validate/gst-libs/meson.build
new file mode 100644 (file)
index 0000000..22b4c2d
--- /dev/null
+++ b/validate/gst-libs/meson.build
@@ -0,0 +1,2 @@
+subdir('gst')
+

diff --git a/validate/meson.build b/validate/meson.build
index 9a21f14e989cb4752512e06eefbb1893a5576094..7dfd02a32b31c9230b072e40e1460f882267bba1 100644 (file)
--- a/validate/meson.build
+++ b/validate/meson.build
@@ -16,11 +16,14 @@ configure_file(output : 'config.h', configuration : cdata)
 
 vs_module_defs_dir = meson.current_source_dir() + '/win32/common/'
 
+validate_plugins_install_dir = '@0@/gstreamer-1.0/validate'.format(get_option('libdir'))
 subdir('data')
 subdir('gst')
+subdir('gst-libs')
 subdir('launcher')
 subdir('tools')
 subdir('docs')
 subdir('pkgconfig')
 subdir('tests')
+subdir('plugins')
 #subdir('po')

diff --git a/validate/plugins/fault_injection/meson.build b/validate/plugins/fault_injection/meson.build
index 87239d28e082ab16b582997b52507453d405fd1e..196665db81ffee5f04c3cb5029c345719a39d1b0 100644 (file)
--- a/validate/plugins/fault_injection/meson.build
+++ b/validate/plugins/fault_injection/meson.build
@@ -1,5 +1,11 @@
-shared_library('gstvalidatefaultinjection',
-                'socket_interposer.c',
-                include_directories : inc_dirs,
-                dependencies : [gst_dep, glib_dep]
-               )
+if dl.found()
+    shared_library('gstvalidatefaultinjection',
+                    'socket_interposer.c',
+                    include_directories : inc_dirs,
+                    link_with: [gstvalidate],
+                    dependencies : [gst_dep, glib_dep, dl],
+                    c_args: ['-DHAVE_CONFIG_H'],
+                    install : true,
+                    install_dir : validate_plugins_install_dir,
+                )
+endif

diff --git a/validate/plugins/gapplication/meson.build b/validate/plugins/gapplication/meson.build
index e6f888850eca271fbcb325c25dd4f6df7ecf04db..943d0a188a69b2afdb1f937f6029f9e4f52a138f 100644 (file)
--- a/validate/plugins/gapplication/meson.build
+++ b/validate/plugins/gapplication/meson.build
@@ -1,8 +1,9 @@
 shared_library('gstvalidategapplication',
                'gstvalidategapplication.c',
-                install: true,
-                install_dir: PLUGINDIR,
                 include_directories : inc_dirs,
-                dependencies : [gst_dep, glib_dep, gst_pbutils_dep],
+                c_args: ['-DHAVE_CONFIG_H'],
+                install: true,
+                install_dir: validate_plugins_install_dir,
+                dependencies : [gst_dep, glib_dep, gst_pbutils_dep, gio_dep],
                 link_with : [gstvalidate]
                )

diff --git a/validate/plugins/gtk/meson.build b/validate/plugins/gtk/meson.build
index 068aabc08292db300165d714947974139e32ff95..b1d7cbf60431ee765ab7659c3e031620692127d5 100644 (file)
--- a/validate/plugins/gtk/meson.build
+++ b/validate/plugins/gtk/meson.build
@@ -1,6 +1,8 @@
 shared_library('gstvalidategtk', 'gstvalidategtk.c',
         install: true,
-        install_dir: PLUGINDIR,
         include_directories : inc_dirs,
         dependencies : [gst_dep, glib_dep, gst_pbutils_dep, gtk_dep],
+        c_args: ['-DHAVE_CONFIG_H'],
+        install : true,
+        install_dir : validate_plugins_install_dir,
         link_with : [gstvalidate])

diff --git a/validate/plugins/meson.build b/validate/plugins/meson.build
index d335898213088bc172f5bd380571b07fb6dfb934..130faef95cbc1445260790529e3750d8ba083c1e 100644 (file)
--- a/validate/plugins/meson.build
+++ b/validate/plugins/meson.build
@@ -1,5 +1,6 @@
 subdir('fault_injection')
 subdir('gapplication')
+subdir('ssim')
 
 if gtk_dep.found()
     subdir('gtk')

diff --git a/validate/plugins/ssim/meson.build b/validate/plugins/ssim/meson.build
new file mode 100644 (file)
index 0000000..5bee302
--- /dev/null
+++ b/validate/plugins/ssim/meson.build
@@ -0,0 +1,11 @@
+if cairo_dep.found()
+    shared_library('gstvalidatessim',
+                'gstvalidatessim.c',
+                include_directories : inc_dirs,
+                link_with: [video, gstvalidate],
+                dependencies : [gst_dep, gst_video_dep, glib_dep, cairo_dep],
+                install : true,
+                install_dir : validate_plugins_install_dir,
+                c_args: ['-DHAVE_CONFIG_H'],
+                )
+endif