mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-25 15:36:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst-libs: Temporarily remove dependency of gstaudio on gstpbutils

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

https://bugzilla.gnome.org/show_bug.cgi?id=657675
This commit is contained in:
Edward Hervey 2011-09-21 13:30:43 +02:00
parent 52ef87ab3b
commit 3f45eb1cfc
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst-libs/gst/Makefile.am
View file

@ -13,15 +13,15 @@ SUBDIRS = \
sdp \ sdp \
rtsp \ rtsp \
video \ video \
pbutils \
audio \ audio \
pbutils \
riff \ riff \
app app
noinst_HEADERS = gettext.h gst-i18n-plugin.h noinst_HEADERS = gettext.h gst-i18n-plugin.h
# dependencies: # dependencies:
audio: interfaces pbutils audio: interfaces
cdda: tag cdda: tag
@ -29,8 +29,10 @@ riff: tag audio
rtsp: sdp rtsp: sdp
pbutils: video audio
INDEPENDENT_SUBDIRS = \ 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) .PHONY: independent-subdirs $(INDEPENDENT_SUBDIRS)

1
gst-libs/gst/audio/Makefile.am
View file

@ -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_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstaudio_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) \ 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 $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la
libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)

2
gst-libs/gst/audio/gstaudiodecoder.c
View file

@ -495,11 +495,13 @@ gst_audio_decoder_sink_setcaps (GstAudioDecoder * dec, GstCaps * caps)
/* NOTE pbutils only needed here */ /* NOTE pbutils only needed here */
/* TODO maybe (only) upstream demuxer/parser etc should handle this ? */ /* TODO maybe (only) upstream demuxer/parser etc should handle this ? */
#if 0
if (dec->priv->taglist) if (dec->priv->taglist)
gst_tag_list_free (dec->priv->taglist); gst_tag_list_free (dec->priv->taglist);
dec->priv->taglist = gst_tag_list_new (); dec->priv->taglist = gst_tag_list_new ();
gst_pb_utils_add_codec_description_to_tag_list (dec->priv->taglist, gst_pb_utils_add_codec_description_to_tag_list (dec->priv->taglist,
GST_TAG_AUDIO_CODEC, caps); GST_TAG_AUDIO_CODEC, caps);
#endif
if (klass->set_format) if (klass->set_format)
res = klass->set_format (dec, caps); res = klass->set_format (dec, caps);