From be3b71d6c99a4c8e96b7d07b30cc963fc1e6b82c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 1 Oct 2021 15:31:18 +0100 Subject: [PATCH] gst-plugins-bad: define G_LOG_DOMAIN for all libraries Fixes #634 Part-of: --- .../gst-plugins-bad/gst-libs/gst/adaptivedemux/meson.build | 2 +- subprojects/gst-plugins-bad/gst-libs/gst/audio/meson.build | 2 +- .../gst-plugins-bad/gst-libs/gst/basecamerabinsrc/meson.build | 2 +- .../gst-plugins-bad/gst-libs/gst/codecparsers/meson.build | 1 + subprojects/gst-plugins-bad/gst-libs/gst/codecs/meson.build | 1 + subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build | 3 ++- .../gst-plugins-bad/gst-libs/gst/insertbin/meson.build | 2 +- .../gst-plugins-bad/gst-libs/gst/interfaces/meson.build | 2 +- subprojects/gst-plugins-bad/gst-libs/gst/isoff/meson.build | 2 +- subprojects/gst-plugins-bad/gst-libs/gst/mpegts/meson.build | 2 +- subprojects/gst-plugins-bad/gst-libs/gst/opencv/meson.build | 2 +- subprojects/gst-plugins-bad/gst-libs/gst/play/meson.build | 2 +- subprojects/gst-plugins-bad/gst-libs/gst/player/meson.build | 2 +- subprojects/gst-plugins-bad/gst-libs/gst/sctp/meson.build | 2 +- .../gst-plugins-bad/gst-libs/gst/transcoder/meson.build | 2 +- .../gst-plugins-bad/gst-libs/gst/uridownloader/meson.build | 2 +- subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build | 2 +- subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build | 4 ++-- subprojects/gst-plugins-bad/gst-libs/gst/wayland/meson.build | 2 +- subprojects/gst-plugins-bad/gst-libs/gst/webrtc/meson.build | 2 +- subprojects/gst-plugins-bad/gst-libs/gst/winrt/meson.build | 3 ++- 21 files changed, 24 insertions(+), 20 deletions(-) diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/adaptivedemux/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/adaptivedemux/meson.build index f1c91b7be2..6178f96872 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/adaptivedemux/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/adaptivedemux/meson.build @@ -4,7 +4,7 @@ adaptivedemux_headers = files('gstadaptivedemux.h') pkg_name = 'gstreamer-adaptivedemux-1.0' gstadaptivedemux = library('gstadaptivedemux-' + api_version, adaptivedemux_sources, - c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_ADAPTIVE_DEMUX'], + c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_ADAPTIVE_DEMUX', '-DG_LOG_DOMAIN="GStreamer-AdaptiveDemux"'], include_directories : [configinc, libsinc], version : libversion, soversion : soversion, diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/audio/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/audio/meson.build index faaa3d7d2f..58e1a41020 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/audio/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/audio/meson.build @@ -5,7 +5,7 @@ install_headers(badaudio_headers, subdir : 'gstreamer-1.0/gst/audio') gstbadaudio = library('gstbadaudio-' + api_version, badaudio_sources, - c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_AUDIO_BAD'], + c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_AUDIO_BAD', '-DG_LOG_DOMAIN="GStreamer-AudioBad"'], include_directories : [configinc, libsinc], version : libversion, soversion : soversion, diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/basecamerabinsrc/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/basecamerabinsrc/meson.build index de77f23ba5..77b81941ee 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/basecamerabinsrc/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/basecamerabinsrc/meson.build @@ -13,7 +13,7 @@ install_headers(camerabin_headers, subdir : 'gstreamer-1.0/gst/basecamerabinsrc' gstbasecamerabin = library('gstbasecamerabinsrc-' + api_version, camerabin_sources, - c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_BASE_CAMERA_BIN_SRC'], + c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_BASE_CAMERA_BIN_SRC', '-DG_LOG_DOMAIN="GStreamer-BaseCameraBinSrc"'], include_directories : [configinc, libsinc], version : libversion, soversion : soversion, diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/meson.build index 3327480400..475ace2af3 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/meson.build @@ -37,6 +37,7 @@ install_headers(codecparser_headers, subdir : 'gstreamer-1.0/gst/codecparsers') cp_args = [ '-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_CODEC_PARSERS', + '-DG_LOG_DOMAIN="GStreamer-CodecParsers"', '-Dvp8_norm=gst_codecparsers_vp8_norm', '-Dvp8dx_start_decode=gst_codecparsers_vp8dx_start_decode', '-Dvp8dx_bool_decoder_fill=gst_codecparsers_vp8dx_bool_decoder_fill', diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/codecs/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/codecs/meson.build index d498adab51..0de5c70136 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/codecs/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/codecs/meson.build @@ -33,6 +33,7 @@ codecs_headers = files( cp_args = [ '-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_CODECS', + '-DG_LOG_DOMAIN="GStreamer-Codecs"' ] gstcodecs = library('gstcodecs-' + api_version, diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build index 2bdbe14da5..79a2b55ac5 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build @@ -36,7 +36,8 @@ extra_c_args = [ ] extra_comm_args = [ '-DGST_USE_UNSTABLE_API', - '-DBUILDING_GST_D3D11' + '-DBUILDING_GST_D3D11', + '-DG_LOG_DOMAIN="GStreamer-D3D11"', ] have_dxgi_header = false diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/insertbin/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/insertbin/meson.build index f030a37268..53f4ea277f 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/insertbin/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/insertbin/meson.build @@ -4,7 +4,7 @@ install_headers(insert_headers, subdir : 'gstreamer-1.0/gst/insertbin') gstinsertbin = library('gstinsertbin-' + api_version, insert_sources, - c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_INSERT_BIN'], + c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_INSERT_BIN', '-DG_LOG_DOMAIN="GStreamer-InsertBin"'], include_directories : [configinc, libsinc], version : libversion, soversion : soversion, diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/interfaces/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/interfaces/meson.build index e12f7c95bd..3dccd70ca5 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/interfaces/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/interfaces/meson.build @@ -16,7 +16,7 @@ photoenum_h = photo_enums[1] pkg_name = 'gstreamer-photography-1.0' gstphotography = library('gstphotography-' + api_version, photography_sources, photoenum_h, photoenum_c, - c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_PHOTOGRAPHY'], + c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_PHOTOGRAPHY', '-DG_LOG_DOMAIN="GStreamer-Photography"'], include_directories : [configinc, libsinc], version : libversion, soversion : soversion, diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/isoff/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/isoff/meson.build index 4cb75426cd..3502fb4454 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/isoff/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/isoff/meson.build @@ -8,7 +8,7 @@ install_headers(isoff_headers, subdir : 'gstreamer-1.0/gst/isoff') gstisoff = library('gstisoff-' + api_version, isoff_sources, - c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_ISOFF'], + c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_ISOFF', '-DG_LOG_DOMAIN="GStreamer-ISOFF"'], include_directories : [configinc, libsinc], version : libversion, soversion : soversion, diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/mpegts/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/mpegts/meson.build index 332d236836..e677edd5f4 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/mpegts/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/mpegts/meson.build @@ -37,7 +37,7 @@ gen_sources = [mpegtsenumtypes_h] gstmpegts = library('gstmpegts-' + api_version, mpegts_sources, mpegts_enums, - c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_MPEGTS'], + c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_MPEGTS', '-DG_LOG_DOMAIN="GStreamer-MpegTS"'], include_directories : [configinc, libsinc], version : libversion, soversion : soversion, diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/opencv/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/opencv/meson.build index fa3d354dda..ba8419d68c 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/opencv/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/opencv/meson.build @@ -29,7 +29,7 @@ if opencv_dep.found() gstopencv = library('gstopencv-' + api_version, opencv_sources, c_args : gst_plugins_bad_args + ['-DBUILDING_GST_OPENCV'], - cpp_args : gst_plugins_bad_args + gstopencv_cargs + ['-DBUILDING_GST_OPENCV'], + cpp_args : gst_plugins_bad_args + gstopencv_cargs + ['-DBUILDING_GST_OPENCV', '-DG_LOG_DOMAIN="GStreamer-OpenCV"'], override_options : ['cpp_std=c++11'], include_directories : [configinc, libsinc], version : libversion, diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/play/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/play/meson.build index 71e50366eb..bca6beb87d 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/play/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/play/meson.build @@ -23,7 +23,7 @@ install_headers(gstplay_headers, subdir : 'gstreamer-' + api_version + '/gst/pla gstplay = library('gstplay-' + api_version, gstplay_sources, - c_args : gst_plugins_bad_args + ['-DBUILDING_GST_PLAY'], + c_args : gst_plugins_bad_args + ['-DBUILDING_GST_PLAY', '-DG_LOG_DOMAIN="GStreamer-Play"'], include_directories : [configinc, libsinc], version : libversion, soversion : soversion, diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/player/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/player/meson.build index 0aee34cb3e..55de18d84d 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/player/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/player/meson.build @@ -26,7 +26,7 @@ install_headers(gstplayer_headers, subdir : 'gstreamer-' + api_version + '/gst/p gstplayer = library('gstplayer-' + api_version, gstplayer_sources, - c_args : gst_plugins_bad_args + ['-DBUILDING_GST_PLAYER'], + c_args : gst_plugins_bad_args + ['-DBUILDING_GST_PLAYER', '-DG_LOG_DOMAIN="GStreamer-Player"'], include_directories : [configinc, libsinc], version : libversion, soversion : soversion, diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/sctp/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/sctp/meson.build index 2db3266884..c4fcc38dde 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/sctp/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/sctp/meson.build @@ -13,7 +13,7 @@ install_headers(sctp_headers, subdir : 'gstreamer-1.0/gst/sctp') libgstsctp = library('gstsctp-' + api_version, sctp_sources, - c_args : gst_plugins_bad_args + ['-DBUILDING_GST_SCTP'], + c_args : gst_plugins_bad_args + ['-DBUILDING_GST_SCTP', '-DG_LOG_DOMAIN="GStreamer-SCTP"'], include_directories : [configinc, libsinc], version : libversion, soversion : soversion, diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/transcoder/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/transcoder/meson.build index 06995d6d16..0f3254d2a8 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/transcoder/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/transcoder/meson.build @@ -21,7 +21,7 @@ gst_transcoder = library('gsttranscoder-' + api_version, install: true, include_directories : [configinc, libsinc], dependencies: [gst_dep, gstpbutils_dep], - c_args: gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_TRANSCODER'], + c_args: gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_TRANSCODER', '-DG_LOG_DOMAIN="GStreamer-Transcoder"'], soversion : soversion, ) diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/uridownloader/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/uridownloader/meson.build index 52ae516f02..a519ed6eae 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/uridownloader/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/uridownloader/meson.build @@ -13,7 +13,7 @@ install_headers(urid_headers, subdir : 'gstreamer-1.0/gst/uridownloader') pkg_name = 'gstreamer-downloader-1.0' gsturidownloader = library('gsturidownloader-' + api_version, urid_sources, - c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_URI_DOWNLOADER'], + c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_URI_DOWNLOADER', '-DG_LOG_DOMAIN="GStreamer-UriDownloader"'], include_directories : [configinc, libsinc], version : libversion, soversion : soversion, diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build index 2509a941a6..df8edb0eb1 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build @@ -37,7 +37,7 @@ cdata.set10('HAVE_LIBDRM', libdrm_dep.found()) gstva = library('gstva-' + api_version, va_sources, - c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_VA'], + c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_VA', '-DG_LOG_DOMAIN="GStreamer-VA"'], include_directories : [configinc, libsinc], version : libversion, soversion : soversion, diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build index f8d9a34756..090a7c7161 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build @@ -311,8 +311,8 @@ gen_sources += [vulkan_enumtypes_h] gstvulkan = library('gstvulkan-' + api_version, vulkan_sources, vulkan_priv_sources, vulkan_wayland_sources, vulkan_xcb_sources, vulkan_enumtypes_c, vulkan_enumtypes_h, - c_args : gst_plugins_bad_args + vulkan_defines + ['-DBUILDING_GST_VULKAN'], - objc_args : gst_plugins_bad_args + vulkan_defines + vulkan_objc_args + ['-DBUILDING_GST_VULKAN'], + c_args : gst_plugins_bad_args + vulkan_defines + ['-DBUILDING_GST_VULKAN', '-DG_LOG_DOMAIN="GStreamer-Vulkan"'], + objc_args : gst_plugins_bad_args + vulkan_defines + vulkan_objc_args + ['-DBUILDING_GST_VULKAN', '-DG_LOG_DOMAIN="GStreamer-Vulkan"'], include_directories : [configinc, libsinc], version : libversion, soversion : soversion, diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/wayland/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/wayland/meson.build index 22a9793b5f..6a05edb70a 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/wayland/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/wayland/meson.build @@ -9,7 +9,7 @@ use_wayland = wl_protocol_dep.found() and wl_client_dep.found() and wl_scanner.f if use_wayland gstwayland = library('gstwayland-' + api_version, 'wayland.c', - c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_WAYLAND'], + c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_WAYLAND', '-DG_LOG_DOMAIN="GStreamer-Wayland"'], include_directories : [configinc, libsinc], version : libversion, soversion : soversion, diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/webrtc/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/webrtc/meson.build index f81d8c7dba..473102d6f1 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/webrtc/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/webrtc/meson.build @@ -46,7 +46,7 @@ gstwebrtc_dependencies = [gstbase_dep, gstsdp_dep] gstwebrtc = library('gstwebrtc-' + api_version, webrtc_sources, gstwebrtc_c, gstwebrtc_h, - c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_WEBRTC'], + c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_WEBRTC', '-DG_LOG_DOMAIN="GStreamer-WebRTC"'], include_directories : [configinc, libsinc], version : libversion, soversion : soversion, diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/winrt/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/winrt/meson.build index 4a28595ec2..d373709b7c 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/winrt/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/winrt/meson.build @@ -9,7 +9,8 @@ extra_c_args = [ ] extra_comm_args = [ '-DGST_USE_UNSTABLE_API', - '-DBUILDING_GST_WINRT' + '-DBUILDING_GST_WINRT', + '-DG_LOG_DOMAIN="GStreamer-WinRT"' ] if host_system != 'windows'