contrib: Add srt 1.2.2
authorJustin Kim <justin.kim@collabora.com>
Tue, 21 Nov 2017 10:39:37 +0000 (19:39 +0900)
committerJean-Baptiste Kempf <jb@videolan.org>
Mon, 27 Nov 2017 22:29:00 +0000 (23:29 +0100)
Secure Reliable Transport library supports nettle backend
since 1.2.1, and the current released version is 1.2.2 which
has a fix of wrong version string.
With the option, `--with-gnutls`, in SRT, VLC can be sure
that non-GPL compatible library won't be linked.

Signed-off-by: Justin Kim <justin.kim@collabora.com>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
configure.ac
contrib/src/srt/SHA512SUMS [new file with mode: 0644]
contrib/src/srt/rules.mak [new file with mode: 0644]

index 47d53cc..c46819f 100644 (file)
@@ -3929,7 +3929,7 @@ AM_CONDITIONAL([HAVE_LIRC], [test "${have_lirc}" = "yes"])
 dnl
 dnl  SRT plugin
 dnl
 dnl
 dnl  SRT plugin
 dnl
-PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.0], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT])
+PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT])
 
 EXTEND_HELP_STRING([Visualisations and Video filter plugins:])
 dnl
 
 EXTEND_HELP_STRING([Visualisations and Video filter plugins:])
 dnl
diff --git a/contrib/src/srt/SHA512SUMS b/contrib/src/srt/SHA512SUMS
new file mode 100644 (file)
index 0000000..e8646df
--- /dev/null
@@ -0,0 +1 @@
+cb897c97d5fd93b333c8de0805c78c940650a2daf8d821e09e3fb01c7e4b56bd7513cf28545f7ac422fba9fa8420b745f397359a4b9e81cff496c776820ea90a v1.2.2.tar.gz
diff --git a/contrib/src/srt/rules.mak b/contrib/src/srt/rules.mak
new file mode 100644 (file)
index 0000000..e809be0
--- /dev/null
@@ -0,0 +1,30 @@
+# srt
+
+SRT_VERSION := 1.2.2
+SRT_TARBALL := v$(SRT_VERSION).tar.gz
+SRT_URL := $(GITHUB)/Haivision/srt/archive/$(SRT_TARBALL)
+
+ifndef HAVE_WIN32
+ifdef BUILD_NETWORK
+PKGS += srt
+endif
+endif
+ifeq ($(call need_pkg,"srt >= 1.2.2"),)
+PKGS_FOUND += srt
+endif
+
+$(TARBALLS)/$(SRT_TARBALL):
+       $(call download_pkg,$(SRT_URL),srt)
+
+.sum-srt: $(SRT_TARBALL)
+
+srt: $(SRT_TARBALL) .sum-srt
+       $(UNPACK)
+       mv srt-$(SRT_VERSION) $@ && touch $@
+
+DEPS_srt = $(DEPS_gnutls)
+
+.srt: srt
+       cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-gnutls
+       cd $< && $(MAKE) install
+       touch $@