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 /pkgconfig | |
| parent | 737067e793ab0bda60b7ec28af9b6fa51ace4581 (diff) | |
Remove GstAggregator from -bad, moved to core
https://bugzilla.gnome.org/show_bug.cgi?id=739010
Diffstat (limited to 'pkgconfig')
| -rw-r--r-- | pkgconfig/Makefile.am | 4 | ||||
| -rw-r--r-- | pkgconfig/gstreamer-bad-base-uninstalled.pc.in | 14 | ||||
| -rw-r--r-- | pkgconfig/gstreamer-bad-base.pc.in | 16 | ||||
| -rw-r--r-- | pkgconfig/meson.build | 2 |
4 files changed, 0 insertions, 36 deletions
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am index 99e6332bd..8fecfa7b5 100644 --- a/pkgconfig/Makefile.am +++ b/pkgconfig/Makefile.am @@ -6,7 +6,6 @@ pcverfiles = \ gstreamer-insertbin-@GST_API_VERSION@.pc \ gstreamer-mpegts-@GST_API_VERSION@.pc \ gstreamer-player-@GST_API_VERSION@.pc \ - gstreamer-bad-base-@GST_API_VERSION@.pc \ gstreamer-bad-audio-@GST_API_VERSION@.pc \ gstreamer-bad-video-@GST_API_VERSION@.pc \ gstreamer-bad-allocators-@GST_API_VERSION@.pc @@ -17,7 +16,6 @@ pcverfiles_uninstalled = \ gstreamer-insertbin-@GST_API_VERSION@-uninstalled.pc \ gstreamer-mpegts-@GST_API_VERSION@-uninstalled.pc \ gstreamer-player-@GST_API_VERSION@-uninstalled.pc \ - gstreamer-bad-base-@GST_API_VERSION@-uninstalled.pc \ gstreamer-bad-audio-@GST_API_VERSION@-uninstalled.pc \ gstreamer-bad-video-@GST_API_VERSION@-uninstalled.pc \ gstreamer-bad-allocators-@GST_API_VERSION@-uninstalled.pc @@ -41,7 +39,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|[@]baselibdir[@]|$(abs_top_builddir)/gst-libs/gst/base/.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|[@]gllibdir[@]|$(abs_top_builddir)/gst-libs/gst/gl/.libs|" \ @@ -66,7 +63,6 @@ pcinfiles = \ gstreamer-player.pc.in gstreamer-player-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-bad-base.pc.in gstreamer-bad-base-uninstalled.pc.in \ gstreamer-bad-allocators.pc.in gstreamer-bad-allocators-uninstalled.pc.in DISTCLEANFILES = $(pcinfiles:.in=) diff --git a/pkgconfig/gstreamer-bad-base-uninstalled.pc.in b/pkgconfig/gstreamer-bad-base-uninstalled.pc.in deleted file mode 100644 index b227027b3..000000000 --- a/pkgconfig/gstreamer-bad-base-uninstalled.pc.in +++ /dev/null @@ -1,14 +0,0 @@ -prefix= -exec_prefix= -libdir=@baselibdir@ -includedir=@abs_top_builddir@/gst-libs -girdir=@abs_top_builddir@/gst-libs/gst/base -typelibdir=@abs_top_builddir@/gst-libs/gst/base - -Name: GStreamer bad base classes, uninstalled -Description: Bad base classes for GStreamer elements, Not Installed -Version: @VERSION@ -Requires: gstreamer-@GST_API_VERSION@ - -Libs: -L${libdir} -lgstbadbase-@GST_API_VERSION@ -Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-bad-base.pc.in b/pkgconfig/gstreamer-bad-base.pc.in deleted file mode 100644 index cf4674564..000000000 --- a/pkgconfig/gstreamer-bad-base.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 base classes -Description: Bad base classes for GStreamer elements -Version: @VERSION@ -Requires: gstreamer-@GST_API_VERSION@ - -Libs: -L${libdir} -lgstbadbase-@GST_API_VERSION@ -Cflags: -I${includedir} diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build index 2cf2c5309..5f90e0432 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('baselibdir', join_paths(meson.build_root(), gstbadbase.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())) @@ -24,7 +23,6 @@ pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir')) pkg_libs = [ 'bad-audio', - 'bad-base', 'bad-video', 'codecparsers', 'insertbin', |