From 6c0744a5fc742c13a76807119e95d8c24989b42a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 2 Dec 2017 16:01:25 +0000 Subject: [PATCH] Remove GstAggregator from -bad, moved to core https://bugzilla.gnome.org/show_bug.cgi?id=739010 --- gst/audiomixer/Makefile.am | 1 - gst/audiomixer/meson.build | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/gst/audiomixer/Makefile.am b/gst/audiomixer/Makefile.am index 72dc081cd0..f1a4d73953 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 e635ee62d7..ccfe1b9d37 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, )