Make the hls plugin depend on gnutls and move to ext/hls/

gnutls is used to implement AES decryption
This commit is contained in:
Alessandro Decina 2013-03-19 10:47:25 +01:00
parent 5c77ef61ed
commit d2d6798087
18 changed files with 18 additions and 5 deletions

View file

@ -83,6 +83,7 @@ CRUFT_DIRS = \
$(top_srcdir)/gst/aacparse \
$(top_srcdir)/gst/amrparse \
$(top_srcdir)/gst/flacparse \
$(top_srcdir)/gst/hls \
$(top_srcdir)/gst/imagefreeze \
$(top_srcdir)/gst/invtelecine \
$(top_srcdir)/gst/mpeg4videoparse \

View file

@ -357,7 +357,6 @@ AG_GST_CHECK_PLUGIN(gaudieffects)
AG_GST_CHECK_PLUGIN(geometrictransform)
AG_GST_CHECK_PLUGIN(gdp)
AG_GST_CHECK_PLUGIN(hdvparse)
AG_GST_CHECK_PLUGIN(hls)
AG_GST_CHECK_PLUGIN(id3tag)
AG_GST_CHECK_PLUGIN(inter)
AG_GST_CHECK_PLUGIN(interlace)
@ -2124,6 +2123,12 @@ AG_GST_CHECK_FEATURE(SNDIO, [sndio audio], sndio, [
fi
])
dnl *** hls ***
translit(dnm, m, l) AM_CONDITIONAL(USE_HLS, true)
AG_GST_CHECK_FEATURE(HLS, [http live streaming plugin], hls, [
AG_GST_PKG_CHECK_MODULES(GNUTLS, gnutls)
])
else
dnl not building plugins with external dependencies,
@ -2303,7 +2308,6 @@ gst/gaudieffects/Makefile
gst/geometrictransform/Makefile
gst/gdp/Makefile
gst/hdvparse/Makefile
gst/hls/Makefile
gst/id3tag/Makefile
gst/inter/Makefile
gst/interlace/Makefile
@ -2413,6 +2417,7 @@ ext/faac/Makefile
ext/faad/Makefile
ext/flite/Makefile
ext/gsm/Makefile
ext/hls/Makefile
ext/kate/Makefile
ext/ladspa/Makefile
ext/lv2/Makefile

View file

@ -360,6 +360,12 @@ else
RTMP_DIR =
endif
if USE_HLS
HLS_DIR = hls
else
HLS_DIR =
endif
SUBDIRS=\
$(VOAACENC_DIR) \
@ -420,7 +426,8 @@ SUBDIRS=\
$(TIMIDITY_DIR) \
$(XVID_DIR) \
$(ZBAR_DIR) \
$(RTMP_DIR)
$(RTMP_DIR) \
$(HLS_DIR)
DIST_SUBDIRS = \
assrender \

View file

@ -10,10 +10,10 @@ libgstfragmented_la_SOURCES = \
gsthlssink.c \
gstm3u8playlist.c
libgstfragmented_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS)
libgstfragmented_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS) $(GNUTLS_CFLAGS)
libgstfragmented_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \
$(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS) $(LIBM)
$(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS) $(LIBM) $(GNUTLS_LIBS)
libgstfragmented_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -no-undefined
libgstfragmented_la_LIBTOOLFLAGS = --tag=disable-static