From de07c44183bd9cd474ead59c1af17bd166f93427 Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Fri, 25 Aug 2023 22:27:10 +0900 Subject: [PATCH] codec2json: Fix plugin loading on Windows * Library versioning should not be used for plugins since it will add -{version}.dll suffix (and versioned libraries on Linux with symlink). Then the library file name and plugin init function name mismatch will result in blacklisted plugin. * Don't define BUILDING_GST_CODECS, makes no sense * Don't define G_LOG_DOMAIN, which should be used only for libraries, not plugins * Depends on gstcodecparsers libary, not gstcodecs. Part-of: --- subprojects/gst-plugins-bad/ext/codec2json/meson.build | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/subprojects/gst-plugins-bad/ext/codec2json/meson.build b/subprojects/gst-plugins-bad/ext/codec2json/meson.build index a35165091d..a8865c9f0b 100644 --- a/subprojects/gst-plugins-bad/ext/codec2json/meson.build +++ b/subprojects/gst-plugins-bad/ext/codec2json/meson.build @@ -6,8 +6,6 @@ codec2json_sources = files([ cp_args = [ '-DGST_USE_UNSTABLE_API', - '-DBUILDING_GST_CODECS', - '-DG_LOG_DOMAIN="GStreamer-Codec2json"' ] json_dep = dependency('json-glib-1.0', version : '>=1.6.6', fallback : ['json-glib', 'json_glib_dep'], required: get_option('codec2json')) @@ -17,12 +15,9 @@ if json_dep.found() codec2json_sources, c_args : gst_plugins_bad_args + cp_args, include_directories : [configinc], - version : libversion, - soversion : soversion, - darwin_versions : osxversion, install : true, install_dir : plugins_install_dir, - dependencies : [gstvideo_dep, gstcodecs_dep, json_dep], + dependencies : [gstvideo_dep, gstcodecparsers_dep, json_dep], ) plugins += [gstcodec2json] endif