[vlc-devel] [PATCH] contrib: Add srt 1.2.2

[Hugo Beauzée-Luyssen]

On Tue, Nov 21, 2017, at 12:23 PM, Jean-Baptiste Kempf wrote:
> Hello,
> 
> So far, this works for me on Linux, but I can't compile for WIndows
> (probably broken mingw on my side)
> 

It fails on windows for various reasons:
- The "configure" script is used instead of cmake, so the toolchain file
isn't passed, causing cross compilation to fail
- Missing pthreads dependency
- pthreadGC2 needs to be added to the list of pthread library candidates

With that done, cmake is happy, but then the code fails to compile. 
I guess this can be pushed, but only if disabled by default when
building for windows

> 
> On Tue, 21 Nov 2017, at 11:39, Justin Kim wrote:
> > 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 at collabora.com>
> > ---
> >  configure.ac               |  2 +-
> >  contrib/src/srt/SHA512SUMS |  1 +
> >  contrib/src/srt/rules.mak  | 28 ++++++++++++++++++++++++++++
> >  3 files changed, 30 insertions(+), 1 deletion(-)
> >  create mode 100644 contrib/src/srt/SHA512SUMS
> >  create mode 100644 contrib/src/srt/rules.mak
> > 
> > diff --git a/configure.ac b/configure.ac
> > index d9ce412e5e..1ef634fe40 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -3926,7 +3926,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..037adf2955
> > --- /dev/null
> > +++ b/contrib/src/srt/rules.mak
> > @@ -0,0 +1,28 @@
> > +# srt
> > +
> > +SRT_VERSION := 1.2.2
> > +SRT_TARBALL := v$(SRT_VERSION).tar.gz
> > +SRT_URL := $(GITHUB)/Haivision/srt/archive/$(SRT_TARBALL)
> > +
> > +ifdef BUILD_NETWORK
> > +PKGS += srt
> > +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 $@
> > -- 
> > 2.15.0
> > 
> > _______________________________________________
> > vlc-devel mailing list
> > To unsubscribe or modify your subscription options:
> > https://mailman.videolan.org/listinfo/vlc-devel
> 
> 
> -- 
> Jean-Baptiste Kempf -  President
> +33 672 704 734
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel


-- 
  Hugo Beauzée-Luyssen
  hugo at beauzee.fr