From a40634eebe2902464f8faa54024fc976c845eb2a Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 30 Mar 2022 11:06:02 -0400 Subject: [PATCH] Use gmodule-no-export-2.0 We don't need `-Wl,--export-dynamic`, that's used only for executables that needs to export an API to be used by plugins they load. Part-of: --- subprojects/gst-devtools/meson.build | 2 +- subprojects/gst-editing-services/meson.build | 2 +- subprojects/gst-omx/meson.build | 2 +- subprojects/gst-plugins-bad/meson.build | 2 +- subprojects/gst-plugins-base/meson.build | 2 +- subprojects/gst-plugins-good/meson.build | 2 +- subprojects/gst-plugins-ugly/meson.build | 2 +- subprojects/gst-python/meson.build | 2 +- subprojects/gstreamer-vaapi/meson.build | 2 +- subprojects/gstreamer/meson.build | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/subprojects/gst-devtools/meson.build b/subprojects/gst-devtools/meson.build index 3a0da27..d30ae9d 100644 --- a/subprojects/gst-devtools/meson.build +++ b/subprojects/gst-devtools/meson.build @@ -88,7 +88,7 @@ gst_check_dep = dependency('gstreamer-check-1.0', version : gst_req, fallback : ['gstreamer', 'gst_check_dep']) gio_dep = dependency('gio-2.0', version: glib_req) -gmodule_dep = dependency('gmodule-2.0') +gmodule_dep = dependency('gmodule-no-export-2.0') gtk_dep = dependency('gtk+-3.0', required: false) mathlib = cc.find_library('m', required : false) diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build index f9dfeb2..3947253 100644 --- a/subprojects/gst-editing-services/meson.build +++ b/subprojects/gst-editing-services/meson.build @@ -116,7 +116,7 @@ gstvalidate_dep = dependency('gst-validate-1.0', version : gst_req, required : g fallback : ['gst-devtools', 'validate_dep']) gio_dep = dependency('gio-2.0', version: glib_req) -gmodule_dep = dependency('gmodule-2.0') +gmodule_dep = dependency('gmodule-no-export-2.0') libxml_dep = dependency('libxml-2.0', required: get_option('xptv')) cdata.set('DISABLE_XPTV', not libxml_dep.found()) diff --git a/subprojects/gst-omx/meson.build b/subprojects/gst-omx/meson.build index f368913..8cd8cf6 100644 --- a/subprojects/gst-omx/meson.build +++ b/subprojects/gst-omx/meson.build @@ -163,7 +163,7 @@ gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req, fallback : ['gstreamer', 'gst_check_dep']) libm = cc.find_library('m', required : false) -gmodule_dep = dependency('gmodule-2.0', version: glib_req) +gmodule_dep = dependency('gmodule-no-export-2.0', version: glib_req) gst_omx_args = ['-DHAVE_CONFIG_H'] configinc = include_directories('.') diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build index 8c27381..5a235bc 100644 --- a/subprojects/gst-plugins-bad/meson.build +++ b/subprojects/gst-plugins-bad/meson.build @@ -382,7 +382,7 @@ endif libm = cc.find_library('m', required : false) gio_dep = dependency('gio-2.0', version: glib_req) -gmodule_dep = dependency('gmodule-2.0') +gmodule_dep = dependency('gmodule-no-export-2.0') # gio-unix-2.0 is used by sys/bluez # Optional dep of ext/gl and gst/librfb diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build index 186cc56..8027840 100644 --- a/subprojects/gst-plugins-base/meson.build +++ b/subprojects/gst-plugins-base/meson.build @@ -315,7 +315,7 @@ giounix_dep = dependency('', required: false) if host_system != 'windows' giounix_dep = dependency('gio-unix-2.0') endif -gmodule_dep = dependency('gmodule-2.0') +gmodule_dep = dependency('gmodule-no-export-2.0') # some of the examples can use gdk-pixbuf and GTK+3 gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', required : get_option('examples')) diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build index 6a0ef3d..ea9f931 100644 --- a/subprojects/gst-plugins-good/meson.build +++ b/subprojects/gst-plugins-good/meson.build @@ -370,7 +370,7 @@ endif cdata.set('HAVE_ZLIB', true) gio_dep = dependency('gio-2.0', version: glib_req) -gmodule_dep = dependency('gmodule-2.0') +gmodule_dep = dependency('gmodule-no-export-2.0') gst_plugins_good_args = ['-DHAVE_CONFIG_H'] configinc = include_directories('.') diff --git a/subprojects/gst-plugins-ugly/meson.build b/subprojects/gst-plugins-ugly/meson.build index 15ad4c4..b7adc06 100644 --- a/subprojects/gst-plugins-ugly/meson.build +++ b/subprojects/gst-plugins-ugly/meson.build @@ -187,7 +187,7 @@ else cdata.set('DISABLE_ORC', 1) endif -gmodule_dep = dependency('gmodule-2.0', version: glib_req) +gmodule_dep = dependency('gmodule-no-export-2.0', version: glib_req) if gmodule_dep.version().version_compare('< 2.67.4') cdata.set('g_memdup2(ptr,sz)', '(G_LIKELY(((guint64)(sz)) < G_MAXUINT)) ? g_memdup(ptr,sz) : (g_abort(),NULL)') diff --git a/subprojects/gst-python/meson.build b/subprojects/gst-python/meson.build index 9dfd79a..1462604 100644 --- a/subprojects/gst-python/meson.build +++ b/subprojects/gst-python/meson.build @@ -19,7 +19,7 @@ gst_dep = dependency('gstreamer-1.0', version : gst_req, fallback : ['gstreamer', 'gst_dep']) gstbase_dep = dependency('gstreamer-base-1.0', version : gst_req, fallback : ['gstreamer', 'gst_base_dep']) -gmodule_dep = dependency('gmodule-2.0') +gmodule_dep = dependency('gmodule-no-export-2.0') pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_dep'], version : '>= 3.8') pymod = import('python') diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build index 058933b..4440d7a 100644 --- a/subprojects/gstreamer-vaapi/meson.build +++ b/subprojects/gstreamer-vaapi/meson.build @@ -94,7 +94,7 @@ libudev_dep = dependency('libudev', required: get_option('drm')) x11_dep = dependency('x11', required: get_option('x11')) xrandr_dep = dependency('xrandr', required: get_option('x11')) -gmodule_dep = dependency('gmodule-2.0') +gmodule_dep = dependency('gmodule-no-export-2.0') egl_dep = dependency('egl', required: get_option('egl')) glesv2_dep = dependency('glesv2', required: false) diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build index e31a3b5..17c7e17 100644 --- a/subprojects/gstreamer/meson.build +++ b/subprojects/gstreamer/meson.build @@ -525,7 +525,7 @@ privinc = include_directories('gst') glib_dep = dependency('glib-2.0', version : '>=2.56.0', fallback: ['glib', 'libglib_dep']) gobject_dep = dependency('gobject-2.0') -gmodule_dep = dependency('gmodule-2.0') +gmodule_dep = dependency('gmodule-no-export-2.0') if host_system == 'windows' gio_dep = dependency('gio-2.0') else -- 2.7.4