From 2b933a28272848e6945ea297e9bdc74d2cde0f39 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/compositor/Makefile.am | 1 - gst/compositor/meson.build | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/gst/compositor/Makefile.am b/gst/compositor/Makefile.am index 5d8e184d47..6b98b78bbc 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 2e948fcb0c..52ca87385e 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, )