Thanks, applied as 87e307169fe18773c3d345d15c3733057658d56f. Michael
[sent from post-receive hook] On Mon, 28 Feb 2022 13:09:14 +0100, Philipp Zabel <[email protected]> wrote: > Switch to Meson build system. > > Signed-off-by: Philipp Zabel <[email protected]> > Message-Id: <[email protected]> > [mol: drop -Dignored-network-interface-prefix= option] > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/libnice.in b/rules/libnice.in > index 8aeb56f3c2f9..ab10b43a983b 100644 > --- a/rules/libnice.in > +++ b/rules/libnice.in > @@ -3,9 +3,7 @@ > config LIBNICE > tristate > prompt "libnice" > - # for autogen.sh > - select HOST_GTK_DOC > - > + select HOST_MESON > select GLIB > select GSTREAMER1 > select OPENSSL > diff --git a/rules/libnice.make b/rules/libnice.make > index f9efde424d9c..a3d944a455c9 100644 > --- a/rules/libnice.make > +++ b/rules/libnice.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBNICE) += libnice > # > # Paths and names > # > -LIBNICE_VERSION := 0.1.16 > -LIBNICE_MD5 := 5ad936c43d3c6d33117b2c64982f2fd9 > +LIBNICE_VERSION := 0.1.18 > +LIBNICE_MD5 := 408482fa4bab7c6b884b0fb9ad57a038 > LIBNICE := libnice-$(LIBNICE_VERSION) > LIBNICE_SUFFIX := tar.gz > LIBNICE_URL := > https://libnice.freedesktop.org/releases/$(LIBNICE).$(LIBNICE_SUFFIX) > @@ -28,23 +28,18 @@ LIBNICE_LICENSE := MPL-1.1 OR LGPL-2.1-only > # > ---------------------------------------------------------------------------- > > # > -# autoconf > +# meson > # > -LIBNICE_CONF_TOOL := autoconf > +LIBNICE_CONF_TOOL := meson > LIBNICE_CONF_OPT := \ > - $(CROSS_AUTOCONF_USR) \ > - --enable-assert \ > - --enable-compile-warnings=yes \ > - --disable-gupnp \ > - --disable-coverage \ > - --disable-static-plugins \ > - --disable-gtk-doc \ > - --disable-gtk-doc-html \ > - --disable-gtk-doc-pdf \ > - --disable-introspection \ > - --with-crypto-library=openssl \ > - --with-gstreamer \ > - --without-gstreamer-0.10 > + $(CROSS_MESON_USR) \ > + -Dcrypto-library=openssl \ > + -Dexamples=disabled \ > + -Dgstreamer=enabled \ > + -Dgtk_doc=disabled \ > + -Dgupnp=disabled \ > + -Dintrospection=disabled \ > + -Dtests=disabled > > # > ---------------------------------------------------------------------------- > # Target-Install _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
