4 files changed, 20 insertions, 13 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index 29de17cc6f62..a004d121395a 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -127,6 +127,7 @@
     SUBDIR += gstreamer1-plugins-dvdread
     SUBDIR += gstreamer1-plugins-gnonlin
     SUBDIR += gstreamer1-plugins-good
+    SUBDIR += gstreamer1-plugins-hls
     SUBDIR += gstreamer1-plugins-kate
     SUBDIR += gstreamer1-plugins-mpeg2dec
     SUBDIR += gstreamer1-plugins-mpeg2enc
diff --git a/multimedia/gstreamer1-plugins-hls/Makefile b/multimedia/gstreamer1-plugins-hls/Makefile
new file mode 100644
index 000000000000..1ed8b9db66eb
--- /dev/null
+++ b/multimedia/gstreamer1-plugins-hls/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTREVISION=	0
+CATEGORIES=	multimedia
+
+COMMENT=	Gstreamer HLS plugin
+
+GST_PLUGIN=	hls
+DIST=		bad
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer1-plugins/Makefile b/multimedia/gstreamer1-plugins/Makefile
index a73b927070a7..22f4dfb29a77 100644
--- a/multimedia/gstreamer1-plugins/Makefile
+++ b/multimedia/gstreamer1-plugins/Makefile
@@ -147,20 +147,8 @@ post-patch:
 	s|$$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la|-lgstbasevideo-${VERSION}|; \
 	s|$$(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la|-lgstvideo-${VERSION}|; \
 	s|$$(top_builddir)/gst-libs/gst/base/libgstbadbase-@GST_API_VERSION@.la|-lgstbadbase-${VERSION}|; \
+	s|$$(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader-@GST_API_VERSION@.la|-lgsturidownloader-${VERSION}|; \
 	s|$$(top_builddir)/gst-libs/gst/video/libgstbadvideo-@GST_API_VERSION@.la|-lgstbadvideo-${VERSION}|'
-
-	 @${FIND} ${WRKSRC}/ext ${WRKSRC}/sys -name Makefile.in | \
-	 ${XARGS} -n 10 ${REINPLACE_CMD} -e \
-	'/la_DEPENDENCIES/,/am__DEPENDENCIES/s,$$(top_builddir)/gst-libs/.*.la,,' -e \
-	 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-$$(GST_API_VERSION).la|-lgsttag-${VERSION}|; \
-	  s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-$$(GST_API_VERSION).la|-lgstaudio-${VERSION}|; \
-	  s|$$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-$$(GST_API_VERSION).la|-lgstpbutils-${VERSION}|; \
-	  s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-$$(GST_API_VERSION).la|-lgstriff-${VERSION}|; \
-	  s|$$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-$$(GST_API_VERSION).la|-lgstsignalprocessor-${VERSION}|; \
-	  s|$$(top_builddir)/gst-libs/gst/video/libgstbasevideo-$$(GST_API_VERSION).la|-lgstbasevideo-${VERSION}|; \
-	  s|$$(top_builddir)/gst-libs/gst/video/libgstvideo-$$(GST_API_VERSION).la|-lgstvideo-${VERSION}|; \
-	  s|$$(top_builddir)/gst-libs/gst/base/libgstbadbase-$$(GST_API_VERSION).la|-lgstbadbase-${VERSION}|; \
-	  s|$$(top_builddir)/gst-libs/gst/video/libgstbadvideo-$$(GST_API_VERSION).la|-lgstbadvideo-${VERSION}|'
 .endif
 
 # workaround a crash in clang 3.3 crash llvm bug # 15840
diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common
index 6ac0d280847c..f73ca0abba78 100644
--- a/multimedia/gstreamer1-plugins/Makefile.common
+++ b/multimedia/gstreamer1-plugins/Makefile.common
@@ -22,6 +22,7 @@ BAD_GST_ALL_PLUGINS+= \
 		flite \
 		gme \
 		gsm \
+		hls \
 		kate \
 		libmms \
 		librfb \
@@ -267,6 +268,10 @@ gst_gme_LIB_DEPENDS=	libgme.so:${PORTSDIR}/audio/libgme
 # gsm
 gst_gsm_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
 
+# hls
+gst_hls_LIB_DEPENDS=	libnettle.so:${PORTSDIR}/security/nettle
+gst_hls_PLIST_FILES=	${GST_LIB_DIR}/libgstfragmented.so
+
 # jack
 gst_jack_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack