mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-16 13:00:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: fix gstreamer-full static mode on win32

Browse source 
Win32 was expecting the symbol gst_init_static_plugins in gstreamer-full
dynamic mode.
Add mode in gstreamer gstreamer-full options to tell if its a
gstreamer-full static or shared mode.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5098>
This commit is contained in:
Stéphane Cerveau 2023-07-25 14:16:09 +01:00 committed by GStreamer Marge Bot
parent 461c4bc32c
commit 12b2dfe41b
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
meson.build
View file

@ -85,10 +85,14 @@ if not meson.is_subproject() and cc.get_id() == 'msvc'
endif endif
building_full = get_option('default_library') == 'static' building_full = get_option('default_library') == 'static'
building_full_static = get_option('gst-full-target-type') == 'static_library' building_full_static = false
building_full_options = [] building_full_options = []
if building_full if building_full
building_full_options = ['gstreamer-full=enabled'] building_full_options = ['gstreamer-static-full=false']
building_full_static = get_option('gst-full-target-type') == 'static_library'
if building_full_static
building_full_options = ['gstreamer-static-full=true']
endif
endif endif
libnice_options = [] libnice_options = []
@ -471,10 +475,7 @@ if building_full
link_depends : link_deps, link_depends : link_deps,
install : true, install : true,
) )
gst_full_c_flags = [] gst_full_c_flags = ['-DGST_STATIC_COMPILATION']
if building_full_static or get_option('default_library') == 'static'
gst_full_c_flags += ['-DGST_STATIC_COMPILATION']
endif
gst_full_libs = [gstfull] gst_full_libs = [gstfull]

4
subprojects/gstreamer/gst/gst.c
View file

@ -119,7 +119,7 @@
#endif #endif
#endif #endif
#ifdef GST_FULL_COMPILATION #ifdef GST_FULL_STATIC_COMPILATION
void gst_init_static_plugins (); void gst_init_static_plugins ();
#endif #endif
@ -622,7 +622,7 @@ gst_register_core_elements (GstPlugin * plugin)
static void static void
init_static_plugins (void) init_static_plugins (void)
{ {
#ifdef GST_FULL_COMPILATION #ifdef GST_FULL_STATIC_COMPILATION
gst_init_static_plugins (); gst_init_static_plugins ();
#else #else
GModule *module; GModule *module;

4
subprojects/gstreamer/gst/meson.build
View file

@ -252,8 +252,8 @@ if not tracer_hooks
libgst_c_args += ['-DGST_DISABLE_GST_TRACER_HOOKS'] libgst_c_args += ['-DGST_DISABLE_GST_TRACER_HOOKS']
endif endif
if get_option('gstreamer-full').enabled() if get_option('gstreamer-static-full')
libgst_c_args += ['-DGST_FULL_COMPILATION'] libgst_c_args += ['-DGST_FULL_STATIC_COMPILATION']
endif endif
# Make sure that subproject building gir files work # Make sure that subproject building gir files work

2
subprojects/gstreamer/meson_options.txt
View file

@ -24,7 +24,7 @@ option('libdw', type : 'feature', value : 'auto', description : 'Use libdw to ge
option('dbghelp', type : 'feature', value : 'auto', description : 'Use dbghelp to generate backtraces') option('dbghelp', type : 'feature', value : 'auto', description : 'Use dbghelp to generate backtraces')
option('bash-completion', type : 'feature', value : 'auto', description : 'Install bash completion files') option('bash-completion', type : 'feature', value : 'auto', description : 'Install bash completion files')
option('coretracers', type : 'feature', value : 'auto', description : 'Build coretracers plugin') option('coretracers', type : 'feature', value : 'auto', description : 'Build coretracers plugin')
option('gstreamer-full', type : 'feature', value : 'disabled', description : 'Build with gstreamer-full') option('gstreamer-static-full', type : 'boolean', value : 'false', description : 'Enable static support of gstreamer-full.')
# Common feature options # Common feature options
option('examples', type : 'feature', value : 'auto', yield : true) option('examples', type : 'feature', value : 'auto', yield : true)