gst-libs: Temporarily remove dependency of gstaudio on gstpbutils

Also re-order the SUBDIRS in the higher-level Makefile so it cleanly
installs.

https://bugzilla.gnome.org/show_bug.cgi?id=657675

diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
index 6f261b3..a762528 100644 (file)
--- a/gst-libs/gst/Makefile.am
+++ b/gst-libs/gst/Makefile.am
@@ -13,15 +13,15 @@ SUBDIRS = \
        sdp \
        rtsp \
        video \
-       pbutils \
        audio \
+       pbutils \
        riff \
        app
 
 noinst_HEADERS = gettext.h gst-i18n-plugin.h
 
 # dependencies:
-audio: interfaces pbutils
+audio: interfaces
 
 cdda: tag
 
@@ -29,8 +29,10 @@ riff: tag audio
 
 rtsp: sdp
 
+pbutils: video audio
+
 INDEPENDENT_SUBDIRS = \
-       interfaces tag fft floatcast netbuffer pbutils rtp sdp video app
+       interfaces tag audio fft floatcast netbuffer rtp sdp video app
 
 .PHONY: independent-subdirs $(INDEPENDENT_SUBDIRS)
 

diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index deb70b2..8732064 100644 (file)
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -54,7 +54,6 @@ nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS = \
 
 libgstaudio_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstaudio_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) \
-  $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \
   $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la
 libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 

diff --git a/gst-libs/gst/audio/gstaudiodecoder.c b/gst-libs/gst/audio/gstaudiodecoder.c
index caed8c5..0ed2186 100644 (file)
--- a/gst-libs/gst/audio/gstaudiodecoder.c
+++ b/gst-libs/gst/audio/gstaudiodecoder.c
@@ -495,11 +495,13 @@ gst_audio_decoder_sink_setcaps (GstAudioDecoder * dec, GstCaps * caps)
 
   /* NOTE pbutils only needed here */
   /* TODO maybe (only) upstream demuxer/parser etc should handle this ? */
+#if 0
   if (dec->priv->taglist)
     gst_tag_list_free (dec->priv->taglist);
   dec->priv->taglist = gst_tag_list_new ();
   gst_pb_utils_add_codec_description_to_tag_list (dec->priv->taglist,
       GST_TAG_AUDIO_CODEC, caps);
+#endif
 
   if (klass->set_format)
     res = klass->set_format (dec, caps);