From 6461ad057c54a6038a79d896aa026136672b513a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 19 Jul 2017 23:05:18 +0100 Subject: [PATCH] fft: don't generate g-i files for bindings The g-i stuff for this helper lib was never usable from bindings anyway and there are problems with the latest gobject-introspection, so we might just as well remove the g-i integration entirely for this lib. --- gst-libs/gst/fft/Makefile.am | 48 ------------------------------------ gst-libs/gst/fft/meson.build | 20 +-------------- 2 files changed, 1 insertion(+), 67 deletions(-) diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am index c2b3afa886..e250e5b84a 100644 --- a/gst-libs/gst/fft/Makefile.am +++ b/gst-libs/gst/fft/Makefile.am @@ -44,51 +44,3 @@ libgstfft_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS libgstfft_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) EXTRA_DIST = kiss_version - -if HAVE_INTROSPECTION -BUILT_GIRSOURCES = GstFft-@GST_API_VERSION@.gir - -gir_headers=$(patsubst %,$(srcdir)/%, $(libgstfft_@GST_API_VERSION@_include_HEADERS)) -gir_sources=$(patsubst %,$(srcdir)/%, $(libgstfft_@GST_API_VERSION@_la_SOURCES)) - -GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSION@.la - $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\ - GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_DISABLE=yes \ - CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \ - $(INTROSPECTION_SCANNER) -v --namespace GstFft \ - --nsversion=@GST_API_VERSION@ \ - --identifier-prefix=Gst \ - --symbol-prefix=gst \ - --warn-all \ - --c-include "gst/fft/fft.h" \ - -I$(top_srcdir)/gst-libs \ - -I$(top_builddir)/gst-libs \ - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ - --library=libgstfft-@GST_API_VERSION@.la \ - --include=Gst-@GST_API_VERSION@ \ - --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-@GST_API_VERSION@ \ - --pkg-export gstreamer-fft-@GST_API_VERSION@ \ - --output $@ \ - $(gir_headers) \ - $(gir_sources) - -# INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to -# install anything - we need to install inside our prefix. -girdir = $(datadir)/gir-1.0 -gir_DATA = $(BUILT_GIRSOURCES) - -typelibsdir = $(libdir)/girepository-1.0/ - -typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) - -%.typelib: %.gir $(INTROSPECTION_COMPILER) - $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ - $(INTROSPECTION_COMPILER) \ - --includedir=$(srcdir) \ - --includedir=$(builddir) \ - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ - $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) - -CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -endif diff --git a/gst-libs/gst/fft/meson.build b/gst-libs/gst/fft/meson.build index 9812c8c6cc..e5ab36c005 100644 --- a/gst-libs/gst/fft/meson.build +++ b/gst-libs/gst/fft/meson.build @@ -35,24 +35,6 @@ gstfft = library('gstfft-@0@'.format(api_version), vs_module_defs: vs_module_defs_dir + 'libgstfft.def', ) -fft_gen_sources = [] -if build_gir - gst_gir_extra_args = gir_init_section + [ '--c-include=gst/fft/fft.h' ] - fft_gen_sources += [gnome.generate_gir(gstfft, - sources : fft_sources + fft_headers, - namespace : 'GstFft', - nsversion : api_version, - identifier_prefix : 'Gst', - symbol_prefix : 'gst', - export_packages : 'gstreamer-fft-1.0', - includes : ['Gst-1.0'], - install : true, - extra_args : gst_gir_extra_args, - dependencies : [gst_dep, libm] - )] -endif - fft_dep = declare_dependency(link_with: gstfft, include_directories : [libsinc], - dependencies : [gst_dep], - sources: fft_gen_sources) + dependencies : [gst_dep])