From 912ea0dceb32dcbc2d593fd9255dc4970826688b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 3 May 2020 11:09:47 +0000 Subject: [PATCH] rpicamsrc: meson: drop map file and fix plugin symbol export with newer gstreamer versions Use -fvisibility instead of a map file for symbol export, so that the right symbols get exported with newer gstreamer versions. Older GStreamer versions also still work of course. Fixes blacklisting/plugin-loading issues with GStreamer >= 1.14 Fixes https://github.com/thaytan/gst-rpicamsrc/issues/984, closes https://github.com/thaytan/gst-rpicamsrc/issues/94 and https://github.com/thaytan/gst-rpicamsrc/issues/67 --- sys/rpicamsrc/gstplugin.map | 3 --- sys/rpicamsrc/meson.build | 4 ---- 2 files changed, 7 deletions(-) delete mode 100644 sys/rpicamsrc/gstplugin.map diff --git a/sys/rpicamsrc/gstplugin.map b/sys/rpicamsrc/gstplugin.map deleted file mode 100644 index 08d854102a..0000000000 --- a/sys/rpicamsrc/gstplugin.map +++ /dev/null @@ -1,3 +0,0 @@ -{ global: -gst_plugin_desc; -local: *; }; diff --git a/sys/rpicamsrc/meson.build b/sys/rpicamsrc/meson.build index 62c21451cc..46e0becbbc 100644 --- a/sys/rpicamsrc/meson.build +++ b/sys/rpicamsrc/meson.build @@ -23,14 +23,10 @@ gstrpicam_enum_types_c = custom_target('gstrpicam-enum-types.c', command : [glib_mkenums, '--template', meson.current_source_dir() + '/gstrpicam-enums-template.c', '@INPUT@'], capture : true) -mapfile = 'gstplugin.map' - library('gstrpicamsrc', rpicamsrc_sources, gstrpicam_enum_types_h, gstrpicam_enum_types_c, c_args : gst_rpicamsrc_args, include_directories : config_inc, - link_args : '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile), - link_depends : mapfile, dependencies : [gst_dep, gstbase_dep, gstvideo_dep] + mmal_deps, install : true, install_dir : plugins_install_dir)