[vlc-devel] [PATCH] contribs: srt: avoid auto-selection on darwin OS

Alexandre Janniaux ajanni at videolabs.io
Mon Apr 20 16:48:28 CEST 2020


Hi,

> Why disable on desktop macOS though?

That's a good question but I thought I made it clear in
my patch content.

GnuTLS contribs rules have:

    ifdef BUILD_NETWORK
    ifndef HAVE_DARWIN_OS
    PKGS += gnutls
    endif
    endif

Thus enabling srt contrib even on macosx is like removing
this ifndef condition. Adding the condition on srt makes sure
the behaviour is respected everywhere. I would have wanted to
write something like «if gnutls is to be used, then enable
srt» but I don't know whether it's writable or not, and if it
makes sense since you can enable srt yourself if you enable
gnutls yourself.

As I'm not a maintainer of macosx and ios stuff I don't know
whether GnuTLS should be enabled or not on MacOSX, but it is
far more likely that the srt contrib has been added without
care for this ifndef condition than GnuTLS been wrongly
disabled on macosx, especially since macosx has it's own
module for TLS stuff in VLC.

I mainly expect review from iOS/MacOSX people before merging
this patch though.

Regards,
--
Alexandre Janniaux
Videolabs

On Mon, Apr 20, 2020 at 05:17:27PM +0300, Rémi Denis-Courmont wrote:
> Le maanantaina 20. huhtikuuta 2020, 17.02.35 EEST Alexandre Janniaux a écrit :
> > ---
> >  contrib/src/srt/rules.mak | 4 ++++
> >  1 file changed, 4 insertions(+)
> >
> > diff --git a/contrib/src/srt/rules.mak b/contrib/src/srt/rules.mak
> > index c9dbb59db8..a5b5bafee1 100644
> > --- a/contrib/src/srt/rules.mak
> > +++ b/contrib/src/srt/rules.mak
> > @@ -4,8 +4,12 @@ SRT_VERSION := 1.3.1
> >  SRT_URL := $(GITHUB)/Haivision/srt/archive/v$(SRT_VERSION).tar.gz
> >
> >  ifdef BUILD_NETWORK
> > +# GnuTLS is not built on iOS (nettle has incompatible license) and MacOSX
> > +# so avoid requiring it.
> > +ifndef HAVE_DARWIN_OS
> >  PKGS += srt
> >  endif
> > +endif
>
> Why disable on desktop macOS though?
>
> >
> >  ifeq ($(call need_pkg,"srt >= 1.3.1"),)
> >  PKGS_FOUND += srt
>
>
> --
> Реми Дёни-Курмон
> http://www.remlab.net/
> Rémi Denis-Courmont
>
>
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel


More information about the vlc-devel mailing list