tools: Define G_LOG_DOMAIN for various tools as well

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1009>

diff --git a/subprojects/gst-devtools/validate/tools/meson.build b/subprojects/gst-devtools/validate/tools/meson.build
index b647793..84e649e 100644 (file)
--- a/subprojects/gst-devtools/validate/tools/meson.build
+++ b/subprojects/gst-devtools/validate/tools/meson.build
@@ -3,7 +3,7 @@ executable('gst-validate-' + apiversion,
             install: true,
             include_directories : inc_dirs,
             dependencies : validate_dep,
-            c_args : [gst_c_args],
+            c_args : [gst_c_args] + ['-DG_LOG_DOMAIN="gst-validate-@0@"'.format(apiversion)],
           )
 
 gst_transcoder_dep = dependency('gstreamer-transcoder-' + apiversion, version : gst_req,
@@ -15,7 +15,7 @@ if gst_transcoder_dep.found()
              install: true,
              include_directories : inc_dirs,
              dependencies : [validate_dep, gst_transcoder_dep],
-             c_args : [gst_c_args],
+             c_args : [gst_c_args] + ['-DG_LOG_DOMAIN="gst-validate-transcoding-@0@"'.format(apiversion)],
             )
 else
   warning('Can not build gst-validate-transcoding-' + apiversion)
@@ -26,7 +26,7 @@ executable('gst-validate-media-check-' + apiversion,
             install: true,
             include_directories : inc_dirs,
             dependencies : validate_dep,
-            c_args : [gst_c_args],
+            c_args : [gst_c_args] + ['-DG_LOG_DOMAIN="gst-validate-media-check-@0@"'.format(apiversion)],
         )
 
 rtsp_server_dep = dependency('gstreamer-rtsp-server-' + apiversion,
@@ -40,7 +40,7 @@ if rtsp_server_dep.found()
                install: true,
                include_directories: inc_dirs,
                dependencies : [rtsp_server_dep, validate_dep],
-               c_args: [gst_c_args],
+               c_args: [gst_c_args] + ['-DG_LOG_DOMAIN="gst-validate-rtsp-server-@0@"'.format(apiversion)],
     )
 endif
 
@@ -50,7 +50,7 @@ if validate_video_dep.found()
                 install: true,
                 include_directories : inc_dirs,
                 dependencies : [validate_dep, validate_video_dep],
-                c_args : [gst_c_args]
+                c_args : [gst_c_args] + ['-DG_LOG_DOMAIN="gst-validate-images-check-@0@"'.format(apiversion)]
             )
 endif
 

diff --git a/subprojects/gst-editing-services/tools/meson.build b/subprojects/gst-editing-services/tools/meson.build
index f0726ab..8b3760d 100644 (file)
--- a/subprojects/gst-editing-services/tools/meson.build
+++ b/subprojects/gst-editing-services/tools/meson.build
@@ -1,6 +1,6 @@
 deps = [ges_dep, gstpbutils_dep, gio_dep, gstvideo_dep, gstaudio_dep]
 
-ges_tool_args = [ges_c_args]
+ges_tool_args = [ges_c_args, '-UG_LOG_DOMAIN']
 if gstvalidate_dep.found()
   deps = deps + [gstvalidate_dep]
   ges_tool_args += ['-DGST_USE_UNSTABLE_API']
@@ -8,7 +8,7 @@ endif
 
 ges_launch = executable('ges-launch-@0@'.format(apiversion),
     'ges-validate.c', 'ges-launch.c', 'ges-launcher.c', 'utils.c', 'ges-launcher-kb.c',
-    c_args : [ges_tool_args],
+    c_args : [ges_tool_args] + ['-DG_LOG_DOMAIN="ges-launch-@0@"'.format(apiversion)],
     dependencies : deps,
     install: true
 )

diff --git a/subprojects/gst-plugins-bad/tools/meson.build b/subprojects/gst-plugins-bad/tools/meson.build
index 3fda1f6..dfba0f4 100644 (file)
--- a/subprojects/gst-plugins-bad/tools/meson.build
+++ b/subprojects/gst-plugins-bad/tools/meson.build
@@ -2,4 +2,5 @@ executable('gst-transcoder-' + api_version,
   'gst-transcoder.c', 'utils.c',
   install : true,
   dependencies : [gst_dep, gstpbutils_dep, gst_transcoder_dep],
+  c_args: ['-DG_LOG_DOMAIN="gst-transcoder-@0@"'.format(api_version)],
 )

diff --git a/subprojects/gst-plugins-base/tools/meson.build b/subprojects/gst-plugins-base/tools/meson.build
index bcbe11c..612d6b0 100644 (file)
--- a/subprojects/gst-plugins-base/tools/meson.build
+++ b/subprojects/gst-plugins-base/tools/meson.build
@@ -3,7 +3,7 @@ tool_deps = glib_deps + [pbutils_dep, audio_dep, video_dep, tag_dep, gst_dep, gs
 executable('gst-device-monitor-@0@'.format(api_version),
   'gst-device-monitor.c',
   install: true,
-  c_args : gst_plugins_base_args,
+  c_args : gst_plugins_base_args + ['-DG_LOG_DOMAIN="gst-device-monitor-@0@"'.format(api_version)],
   include_directories: [configinc],
   dependencies : tool_deps,
 )
@@ -12,7 +12,7 @@ install_man('gst-device-monitor-@0@.1'.format(api_version))
 executable('gst-discoverer-@0@'.format(api_version),
   'gst-discoverer.c',
   install: true,
-  c_args : gst_plugins_base_args,
+  c_args : gst_plugins_base_args + ['-DG_LOG_DOMAIN="gst-discoverer-@0@"'.format(api_version)],
   include_directories: [configinc],
   dependencies : tool_deps,
 )
@@ -21,7 +21,7 @@ install_man('gst-discoverer-@0@.1'.format(api_version))
 executable('gst-play-@0@'.format(api_version),
   'gst-play.c', 'gst-play-kb.c',
   install: true,
-  c_args : gst_plugins_base_args,
+  c_args : gst_plugins_base_args + ['-DG_LOG_DOMAIN="gst-play-@0@"'.format(api_version)],
   include_directories: [configinc],
   dependencies : tool_deps + [libm],
 )

diff --git a/subprojects/gstreamer/tools/meson.build b/subprojects/gstreamer/tools/meson.build
index c5bf4f9..39b4287 100644 (file)
--- a/subprojects/gstreamer/tools/meson.build
+++ b/subprojects/gstreamer/tools/meson.build
@@ -31,7 +31,7 @@ foreach tool : tools
     install: true,
     include_directories : [configinc],
     dependencies : [glib_dep, gobject_dep, gmodule_dep, mathlib, gst_dep] + extra_deps,
-    c_args: gst_c_args + extra_c_args,
+    c_args: gst_c_args + extra_c_args + ['-DG_LOG_DOMAIN="@0@"'.format(exe_name)],
   )
 
   man_page = '@0@-1.0.1'.format(tool)