diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2017-12-02 16:01:25 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2017-12-02 16:14:36 +0000 |
| commit | d01297e115e475760764d9caa4eb37b5f7f9f31a (patch) | |
| tree | ac7a05eadf2f5acb747b6a7b052ec444bac59437 /gst | |
| parent | 737067e793ab0bda60b7ec28af9b6fa51ace4581 (diff) | |
| download | gstreamer-plugins-bad-d01297e115e475760764d9caa4eb37b5f7f9f31a.tar.gz | |
Remove GstAggregator from -bad, moved to core
https://bugzilla.gnome.org/show_bug.cgi?id=739010
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/audiomixer/Makefile.am | 1 | ||||
| -rw-r--r-- | gst/audiomixer/meson.build | 3 | ||||
| -rw-r--r-- | gst/compositor/Makefile.am | 1 | ||||
| -rw-r--r-- | gst/compositor/meson.build | 3 | ||||
| -rw-r--r-- | gst/mxf/Makefile.am | 1 | ||||
| -rw-r--r-- | gst/mxf/meson.build | 2 |
6 files changed, 3 insertions, 8 deletions
diff --git a/gst/audiomixer/Makefile.am b/gst/audiomixer/Makefile.am index 72dc081cd..f1a4d7395 100644 --- a/gst/audiomixer/Makefile.am +++ b/gst/audiomixer/Makefile.am @@ -13,7 +13,6 @@ libgstaudiomixer_la_CFLAGS = \ $(GST_CFLAGS) $(ORC_CFLAGS) libgstaudiomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstaudiomixer_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \ $(top_builddir)/gst-libs/gst/audio/libgstbadaudio-$(GST_API_VERSION).la \ $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) diff --git a/gst/audiomixer/meson.build b/gst/audiomixer/meson.build index e635ee62d..ccfe1b9d3 100644 --- a/gst/audiomixer/meson.build +++ b/gst/audiomixer/meson.build @@ -26,8 +26,7 @@ gstaudiomixer = library('gstaudiomixer', audiomixer_sources, orc_c, orc_h, c_args : gst_plugins_bad_args + [ '-DGST_USE_UNSTABLE_API' ], include_directories : [configinc], - dependencies : [gstbadaudio_dep, gstbadbase_dep, gstaudio_dep, gstbase_dep, - orc_dep], + dependencies : [gstbadaudio_dep, gstaudio_dep, gstbase_dep, orc_dep], install : true, install_dir : plugins_install_dir, ) diff --git a/gst/compositor/Makefile.am b/gst/compositor/Makefile.am index 5d8e184d4..6b98b78bb 100644 --- a/gst/compositor/Makefile.am +++ b/gst/compositor/Makefile.am @@ -16,7 +16,6 @@ libgstcompositor_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS) libgstcompositor_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \ $(top_builddir)/gst-libs/gst/video/libgstbadvideo-$(GST_API_VERSION).la \ $(GST_PLUGINS_BASE_LIBS) \ -lgstvideo-@GST_API_VERSION@ \ diff --git a/gst/compositor/meson.build b/gst/compositor/meson.build index 2e948fcb0..52ca87385 100644 --- a/gst/compositor/meson.build +++ b/gst/compositor/meson.build @@ -26,8 +26,7 @@ gstcompositor = library('gstcompositor', compositor_sources, orc_c, orc_h, c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'], include_directories : [configinc], - dependencies : [gstbadvideo_dep, gstbadbase_dep, gstvideo_dep, gstbase_dep, - orc_dep, libm], + dependencies : [gstbadvideo_dep, gstvideo_dep, gstbase_dep, orc_dep, libm], install : true, install_dir : plugins_install_dir, ) diff --git a/gst/mxf/Makefile.am b/gst/mxf/Makefile.am index 1831f29e3..03ab9b9d9 100644 --- a/gst/mxf/Makefile.am +++ b/gst/mxf/Makefile.am @@ -25,7 +25,6 @@ libgstmxf_la_CFLAGS = \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) libgstmxf_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \ $(GST_PLUGINS_BASE_LIBS) \ -lgstvideo-@GST_API_VERSION@ \ -lgstaudio-@GST_API_VERSION@ \ diff --git a/gst/mxf/meson.build b/gst/mxf/meson.build index b9a6a3f20..2701ccd2e 100644 --- a/gst/mxf/meson.build +++ b/gst/mxf/meson.build @@ -22,7 +22,7 @@ gstmxf = library('gstmxf', mxf_sources, c_args : gst_plugins_bad_args + [ '-DGST_USE_UNSTABLE_API' ], include_directories : [configinc], - dependencies : [gstbadbase_dep, gstbase_dep, gstaudio_dep, gstvideo_dep], + dependencies : [gstbase_dep, gstaudio_dep, gstvideo_dep], install : true, install_dir : plugins_install_dir, ) |