Remove GstVideoAggregator, moved into libgstvideo in -base

https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/137

4 files changed, 2 insertions, 38 deletions

diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 44079a77c..8e74a8e4b 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -8,8 +8,7 @@ pcverfiles =  \
 	gstreamer-player-@GST_API_VERSION@.pc \
 	gstreamer-sctp-@GST_API_VERSION@.pc \
 	gstreamer-webrtc-@GST_API_VERSION@.pc \
-	gstreamer-bad-audio-@GST_API_VERSION@.pc \
-	gstreamer-bad-video-@GST_API_VERSION@.pc
+	gstreamer-bad-audio-@GST_API_VERSION@.pc
 
 pcverfiles_uninstalled = \
 	gstreamer-plugins-bad-@GST_API_VERSION@-uninstalled.pc \
@@ -19,8 +18,7 @@ pcverfiles_uninstalled = \
 	gstreamer-player-@GST_API_VERSION@-uninstalled.pc \
 	gstreamer-sctp-@GST_API_VERSION@-uninstalled.pc \
 	gstreamer-webrtc-@GST_API_VERSION@-uninstalled.pc \
-	gstreamer-bad-audio-@GST_API_VERSION@-uninstalled.pc \
-	gstreamer-bad-video-@GST_API_VERSION@-uninstalled.pc
+	gstreamer-bad-audio-@GST_API_VERSION@-uninstalled.pc
 
 all-local: $(pcverfiles) $(pcverfiles_uninstalled)
 
@@ -36,7 +34,6 @@ cp_verbose_0 = @echo "  CP     $@";
 ### rather than hardcoding it in the file directly.
 	$(AM_V_GEN) sed \
 		-e "s|[@]audiolibdir[@]|$(abs_top_builddir)/gst-libs/gst/audio/.libs|" \
-		-e "s|[@]videolibdir[@]|$(abs_top_builddir)/gst-libs/gst/video/.libs|" \
 		-e "s|[@]codecparserslibdir[@]|$(abs_top_builddir)/gst-libs/gst/codecparsers/.libs|" \
 		-e "s|[@]insertbinlibdir[@]|$(abs_top_builddir)/gst-libs/gst/insertbin/.libs|" \
 		-e "s|[@]mpegtslibdir[@]|$(abs_top_builddir)/gst-libs/gst/mpegts/.libs|" \
@@ -59,7 +56,6 @@ pcinfiles = \
            gstreamer-player.pc.in gstreamer-player-uninstalled.pc.in \
            gstreamer-webrtc.pc.in gstreamer-webrtc-uninstalled.pc.in \
            gstreamer-bad-audio.pc.in gstreamer-bad-audio-uninstalled.pc.in \
-           gstreamer-bad-video.pc.in gstreamer-bad-video-uninstalled.pc.in \
            gstreamer-sctp.pc.in gstreamer-sctp-uninstalled.pc.in
 
 DISTCLEANFILES = $(pcinfiles:.in=)
diff --git a/pkgconfig/gstreamer-bad-video-uninstalled.pc.in b/pkgconfig/gstreamer-bad-video-uninstalled.pc.in
deleted file mode 100644
index d5fbe7b82..000000000
--- a/pkgconfig/gstreamer-bad-video-uninstalled.pc.in
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=
-exec_prefix=
-libdir=@videolibdir@
-includedir=@abs_top_builddir@/gst-libs
-girdir=@abs_top_builddir@/gst-libs/gst/video
-typelibdir=@abs_top_builddir@/gst-libs/gst/video
-
-Name: GStreamer bad video library, uninstalled
-Description: Bad video library for GStreamer elements, Not Installed
-Version: @VERSION@
-Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@
-
-Libs: -L${libdir} -lgstbadvideo-@GST_API_VERSION@
-Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
diff --git a/pkgconfig/gstreamer-bad-video.pc.in b/pkgconfig/gstreamer-bad-video.pc.in
deleted file mode 100644
index c75271d45..000000000
--- a/pkgconfig/gstreamer-bad-video.pc.in
+++ /dev/null
@@ -1,16 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_API_VERSION@
-datarootdir=${prefix}/share
-datadir=${datarootdir}
-girdir=${datadir}/gir-1.0
-typelibdir=${libdir}/girepository-1.0
-
-Name: GStreamer bad video library
-Description: Bad video library for GStreamer elements
-Version: @VERSION@
-Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@
-
-Libs: -L${libdir} -lgstbadvideo-@GST_API_VERSION@
-Cflags: -I${includedir}
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
index a3d426092..7ddfafbbf 100644
--- a/pkgconfig/meson.build
+++ b/pkgconfig/meson.build
@@ -11,7 +11,6 @@ pkgconf.set('VERSION', gst_version)
 pkgconf.set('abs_top_builddir', join_paths(meson.current_build_dir(), '..'))
 pkgconf.set('abs_top_srcdir', join_paths(meson.current_source_dir(), '..'))
 pkgconf.set('audiolibdir', join_paths(meson.build_root(), gstbadaudio.outdir()))
-pkgconf.set('videolibdir', join_paths(meson.build_root(), gstbadvideo.outdir()))
 pkgconf.set('codecparserslibdir', join_paths(meson.build_root(), gstcodecparsers.outdir()))
 pkgconf.set('insertbinlibdir', join_paths(meson.build_root(), gstinsertbin.outdir()))
 pkgconf.set('mpegtslibdir', join_paths(meson.build_root(), gstmpegts.outdir()))
@@ -24,7 +23,6 @@ pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir'))
 
 pkg_libs = [
   'bad-audio',
-  'bad-video',
   'codecparsers',
   'insertbin',
   'mpegts',