diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2018-12-26 17:54:21 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2018-12-26 19:06:33 +0100 |
| commit | b9e15fddb14b2cde6470255794ef130523885e9f (patch) | |
| tree | c79f23533eb65f4e905cfa58f1af993eaf3f81a1 /ext | |
| parent | ae194e99d99b6cb1bb3997b31e62b572a946bf3b (diff) | |
| download | gstreamer-plugins-bad-b9e15fddb14b2cde6470255794ef130523885e9f.tar.gz | |
Remove GstVideoAggregator, moved into libgstvideo in -base
https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/137
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/gl/Makefile.am | 1 | ||||
| -rw-r--r-- | ext/gl/meson.build | 5 | ||||
| -rw-r--r-- | ext/iqa/Makefile.am | 3 | ||||
| -rw-r--r-- | ext/iqa/meson.build | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/ext/gl/Makefile.am b/ext/gl/Makefile.am index 63a74f037..bfd73ee8a 100644 --- a/ext/gl/Makefile.am +++ b/ext/gl/Makefile.am @@ -42,7 +42,6 @@ libgstopenglmixers_la_CFLAGS = \ -Dgst_gl_set_affine_transformation_meta_from_ndc_ext=Dgst_gl_bad_set_affine_transformation_meta_from_ndc_ext libgstopenglmixers_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/video/libgstbadvideo-@GST_API_VERSION@.la \ $(GST_GL_LIBS) \ $(GST_PLUGINS_BASE_LIBS) \ $(GST_BASE_LIBS) \ diff --git a/ext/gl/meson.build b/ext/gl/meson.build index 3fb9239ae..769531d34 100644 --- a/ext/gl/meson.build +++ b/ext/gl/meson.build @@ -10,7 +10,6 @@ opengl_sources = [ if gstgl_dep.found() optional_deps = [] - opengl_defines = ['-DGST_USE_UNSTABLE_API'] # for videoaggregator if gst_gl_have_api_opengl # have desktop GL opengl_sources += [ @@ -25,10 +24,10 @@ if gstgl_dep.found() gstopenglmixers = library('gstopenglmixers', opengl_sources, - c_args : gst_plugins_bad_args + opengl_defines, + c_args : gst_plugins_bad_args, link_args : noseh_link_args, include_directories : [configinc], - dependencies : [gstbadvideo_dep, gstgl_dep, gstvideo_dep, + dependencies : [gstgl_dep, gstvideo_dep, gstbase_dep, gstcontroller_dep, libm] + optional_deps, install : true, install_dir : plugins_install_dir, diff --git a/ext/iqa/Makefile.am b/ext/iqa/Makefile.am index 9cc4cc9cf..d70d31ac3 100644 --- a/ext/iqa/Makefile.am +++ b/ext/iqa/Makefile.am @@ -12,8 +12,7 @@ libgstiqa_la_CFLAGS = \ libgstiqa_la_CFLAGS += $(DSSIM_CFLAGS) libgstiqa_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/video/libgstbadvideo-$(GST_API_VERSION).la \ - $(GST_PLUGINS_BASE_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) libgstiqa_la_LIBADD += $(DSSIM_LIBS) diff --git a/ext/iqa/meson.build b/ext/iqa/meson.build index c5d1c1c8a..17d12b6e7 100644 --- a/ext/iqa/meson.build +++ b/ext/iqa/meson.build @@ -6,7 +6,7 @@ if dssim_dep.found() 'iqa.c', c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DHAVE_DSSIM'], include_directories : [configinc], - dependencies : [gst_dep, gstbadvideo_dep, gstbase_dep, dssim_dep], + dependencies : [gstvideo_dep, gstbase_dep, gst_dep, dssim_dep], install : true, install_dir : plugins_install_dir, ) |