[vlc-devel] [vlc-commits] contrib/gnutls: add libidn CFLAGS as appropriate

[Sean McGovern]

Hi Hugo,



On Thu, Dec 13, 2018, 07:54 Hugo Beauzée-Luyssen <hugo at beauzee.fr wrote:

> On Thu, Jun 30, 2016, at 8:18 AM, Sean McGovern wrote:
> > vlc | branch: master | Sean McGovern <gseanmcg at gmail.com> | Wed Jun 29
> > 15:31:03 2016 -0400| [fda25b9eca68e65a5de4966be8e9d29f00f232a0] |
> > committer: Jean-Baptiste Kempf
> >
> > contrib/gnutls: add libidn CFLAGS as appropriate
> >
> > The configury for gnutls already probes for this, but does not use
> > the values it finds.
> >
> > Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> >
> > >
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fda25b9eca68e65a5de4966be8e9d29f00f232a0
> > ---
> >
> >  contrib/src/gnutls/gnutls-libidn.patch |   36
> ++++++++++++++++++++++++++++++++
> >  contrib/src/gnutls/rules.mak           |    1 +
> >  2 files changed, 37 insertions(+)
> >
> > diff --git a/contrib/src/gnutls/gnutls-libidn.patch b/contrib/src/
> > gnutls/gnutls-libidn.patch
> > new file mode 100644
> > index 0000000..5f00fa6
> > --- /dev/null
> > +++ b/contrib/src/gnutls/gnutls-libidn.patch
> > @@ -0,0 +1,36 @@
> > +--- gnutls/lib/x509/Makefile.am.ORIG Tue Jul 21 05:42:08 2015
> > ++++ gnutls/lib/x509/Makefile.am      Wed Jun 29 15:05:35 2016
> > +@@ -23,7 +23,8 @@
> > +     -I$(srcdir)/../includes         \
> > +     -I$(builddir)/../includes       \
> > +     -I$(srcdir)/..                  \
> > +-    $(LIBOPENCDK_CFLAGS)
> > ++    $(LIBOPENCDK_CFLAGS)            \
> > ++    $(LIBIDN_CFLAGS)
> > +
> > + if ENABLE_MINITASN1
> > + AM_CPPFLAGS += -I$(srcdir)/../minitasn1
> > +--- gnutls/lib/ext/Makefile.am.ORIG  Wed Feb  4 23:35:05 2015
> > ++++ gnutls/lib/ext/Makefile.am       Wed Jun 29 15:19:34 2016
> > +@@ -26,7 +26,8 @@
> > +     -I$(builddir)/../includes       \
> > +     -I$(builddir)/../../gl          \
> > +     -I$(srcdir)/..                  \
> > +-    -I$(srcdir)/../opencdk
> > ++    -I$(srcdir)/../opencdk          \
> > ++    $(LIBIDN_CFLAGS)
> > +
> > + if ENABLE_MINITASN1
> > + AM_CPPFLAGS += -I$(srcdir)/../minitasn1
> > +--- gnutls/src/Makefile.am.ORIG      Fri Jan  8 04:10:34 2016
> > ++++ gnutls/src/Makefile.am   Wed Jun 29 15:20:12 2016
> > +@@ -41,7 +41,8 @@
> > +     -I$(srcdir)/../lib/includes             \
> > +     -I$(srcdir)/../libdane/includes         \
> > +     -I$(srcdir)/../extra/includes   \
> > +-    $(LIBOPTS_CFLAGS)
> > ++    $(LIBOPTS_CFLAGS)               \
> > ++    $(LIBIDN_CFLAGS)
> > +
> > + if NEED_LIBOPTS
> > + LIBOPTS = libopts/libopts.la
> > diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
> > index 85d3a49..912f508 100644
> > --- a/contrib/src/gnutls/rules.mak
> > +++ b/contrib/src/gnutls/rules.mak
> > @@ -35,6 +35,7 @@ endif
> >  ifdef HAVE_MACOSX
> >       $(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-osx.patch
> >  endif
> > +     $(APPLY) $(SRC)/gnutls/gnutls-libidn.patch
> >       $(call pkg_static,"lib/gnutls.pc.in")
> >       $(UPDATE_AUTOCONFIG)
> >       $(MOVE)
> >
>
> Hi,
>
> Is this patch still required? I can build gnutls fine for windows/windows
> store/android without it.
>
> Regards,
>
> --
>   Hugo Beauzée-Luyssen
>   hugo at beauzee.fr
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel


When I originally wrote that patch I was still supporting the now defunct
Solaris build, but I seem to remember it may have helped for MacOS as well.
I won't have time to confirm soon -- maybe someone else can help here?
David? Felix?

If it is still important we could submit it upstream.

Thanks,

Sean McG.

>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20181213/44275f6c/attachment.html>