vlc | branch: master | Justin Kim <[email protected]> | Tue Nov 21 19:39:37 2017 +0900| [9dce7032797ed9ab54e46f944bb7f800bd69cee8] | committer: Jean-Baptiste Kempf
contrib: Add srt 1.2.2 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 <[email protected]> Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9dce7032797ed9ab54e46f944bb7f800bd69cee8 --- configure.ac | 2 +- contrib/src/srt/SHA512SUMS | 1 + contrib/src/srt/rules.mak | 30 ++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 47d53cc07d..c46819ff3d 100644 --- a/configure.ac +++ b/configure.ac @@ -3929,7 +3929,7 @@ AM_CONDITIONAL([HAVE_LIRC], [test "${have_lirc}" = "yes"]) 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 diff --git a/contrib/src/srt/SHA512SUMS b/contrib/src/srt/SHA512SUMS new file mode 100644 index 0000000000..e8646df487 --- /dev/null +++ b/contrib/src/srt/SHA512SUMS @@ -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 index 0000000000..e809be0d71 --- /dev/null +++ b/contrib/src/srt/rules.mak @@ -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 $@ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
