mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-01 22:21:13 +00:00
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: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5249>
This commit is contained in:
parent
d50c842d87
commit
de07c44183
1 changed files with 1 additions and 6 deletions
|
@ -6,8 +6,6 @@ codec2json_sources = files([
|
||||||
|
|
||||||
cp_args = [
|
cp_args = [
|
||||||
'-DGST_USE_UNSTABLE_API',
|
'-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'))
|
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,
|
codec2json_sources,
|
||||||
c_args : gst_plugins_bad_args + cp_args,
|
c_args : gst_plugins_bad_args + cp_args,
|
||||||
include_directories : [configinc],
|
include_directories : [configinc],
|
||||||
version : libversion,
|
|
||||||
soversion : soversion,
|
|
||||||
darwin_versions : osxversion,
|
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : plugins_install_dir,
|
install_dir : plugins_install_dir,
|
||||||
dependencies : [gstvideo_dep, gstcodecs_dep, json_dep],
|
dependencies : [gstvideo_dep, gstcodecparsers_dep, json_dep],
|
||||||
)
|
)
|
||||||
plugins += [gstcodec2json]
|
plugins += [gstcodec2json]
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue