Index: head/net-im/libnice/Makefile =================================================================== --- head/net-im/libnice/Makefile (revision 556494) +++ head/net-im/libnice/Makefile (revision 556495) @@ -1,38 +1,38 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= libnice -PORTVERSION= 0.1.13 +PORTVERSION= 0.1.18 CATEGORIES= net-im devel MASTER_SITES= http://nice.freedesktop.org/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT= Library and transmitter that implements ICE-19 -USES= gettext gmake gnome libtool localbase:ldflags pathfix pkgconfig +LICENSE= LGPL21 MPL11 +LICENSE_COMB= dual + +LIB_DEPENDS= libgnutls.so:security/gnutls +BUILD_DEPENDS= gtk-doc>0:textproc/gtk-doc + +USES= gettext gmake gnome libtool localbase:ldflags pathfix pkgconfig meson python USE_LDCONFIG= yes USE_GNOME= glib20 introspection:build -GNU_CONFIGURE= yes CPPFLAGS+= -DHAVE_GETIFADDRS INSTALL_TARGET= install-strip -.if !defined(LIBNICE_SLAVE) OPTIONS_DEFINE= GUPNP +GUPNP_MESON_ENABLED= gupnp GUPNP_DESC= UPnP IGD port mapping support GUPNP_LIB_DEPENDS+= libgupnp-igd-1.0.so:net/gupnp-igd -GUPNP_CONFIGURE_ENABLE= gupnp -.endif +MESON_ARGS+=-Dtests=disabled + .if defined(LIBNICE_SLAVE) USE_GSTREAMER1= yes -CONFIGURE_ARGS+=--with-gstreamer --without-gstreamer-0.10 +MESON_ARGS+=-Dgstreamer=enabled -Dgst_version=1.0 .else -CONFIGURE_ARGS= --without-gstreamer --without-gstreamer-0.10 +MESON_ARGS+=-Dgstreamer=disabled -Dgtk_doc=enabled .endif - -post-patch: - @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ - 's|-Wno-missing-field-initializers|#|g' - @${REINPLACE_CMD} -e 's|-Werror||g' ${WRKSRC}/configure .include Index: head/net-im/libnice/distinfo =================================================================== --- head/net-im/libnice/distinfo (revision 556494) +++ head/net-im/libnice/distinfo (revision 556495) @@ -1,2 +1,3 @@ -SHA256 (libnice-0.1.13.tar.gz) = 61112d9f3be933a827c8365f20551563953af6718057928f51f487bfe88419e1 -SIZE (libnice-0.1.13.tar.gz) = 912374 +TIMESTAMP = 1605918969 +SHA256 (libnice-0.1.18.tar.gz) = 5eabd25ba2b54e817699832826269241abaa1cf78f9b240d1435f936569273f4 +SIZE (libnice-0.1.18.tar.gz) = 439791 Index: head/net-im/libnice/files/patch-configure =================================================================== --- head/net-im/libnice/files/patch-configure (revision 556494) +++ head/net-im/libnice/files/patch-configure (nonexistent) @@ -1,23 +0,0 @@ ---- configure.orig 2015-08-08 16:33:30.121861000 +0200 -+++ configure 2015-08-08 16:33:52.533583000 +0200 -@@ -15751,7 +15751,9 @@ - - fi - -- if test "$have_gst_check" = yes; then -+fi -+ -+ if test "$have_gst_check" = yes; then - HAVE_GST_CHECK_TRUE= - HAVE_GST_CHECK_FALSE='#' - else -@@ -15760,9 +15762,6 @@ - fi - - -- --fi -- - if test "$with_gstreamer010" != no; then : - - Property changes on: head/net-im/libnice/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-im/libnice/files/configure.ac =================================================================== --- head/net-im/libnice/files/configure.ac (revision 556494) +++ head/net-im/libnice/files/configure.ac (nonexistent) @@ -1,16 +0,0 @@ ---- configure.ac.orig 2015-08-08 16:29:47.571735000 +0200 -+++ configure.ac 2015-08-08 16:33:23.011860000 +0200 -@@ -231,11 +231,10 @@ - [ - have_gst_check=no - ]) -- -- AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes) -- - ]) - -+AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes) -+ - AS_IF([test "$with_gstreamer010" != no], [ - - PKG_CHECK_MODULES(GST010, [ Property changes on: head/net-im/libnice/files/configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-im/libnice/files/patch-Makefile.in =================================================================== --- head/net-im/libnice/files/patch-Makefile.in (revision 556494) +++ head/net-im/libnice/files/patch-Makefile.in (nonexistent) @@ -1,13 +0,0 @@ ---- Makefile.in.orig 2013-05-22 07:47:08.000000000 +0000 -+++ Makefile.in 2013-05-22 07:47:23.000000000 +0000 -@@ -311,9 +311,7 @@ - agent \ - nice \ - gst \ -- docs \ -- tests \ -- examples -+ docs - - DISTCHECK_CONFIGURE_FLAGS = --disable-assert -enable-gtk-doc - EXTRA_DIST = \ Property changes on: head/net-im/libnice/files/patch-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-im/libnice/files/patch-gst_Makefile.in =================================================================== --- head/net-im/libnice/files/patch-gst_Makefile.in (revision 556494) +++ head/net-im/libnice/files/patch-gst_Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- gst/Makefile.in.orig 2013-05-22 07:56:38.000000000 +0000 -+++ gst/Makefile.in 2013-05-22 07:58:56.000000000 +0000 -@@ -319,7 +319,7 @@ - -I $(top_srcdir)/stun - - COMMON_LIBADD = \ -- $(top_builddir)/nice/libnice.la -+ -lnice - - - # libgstnice Property changes on: head/net-im/libnice/files/patch-gst_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-im/libnice/files/patch-docs_reference_libnice_meson.build =================================================================== --- head/net-im/libnice/files/patch-docs_reference_libnice_meson.build (nonexistent) +++ head/net-im/libnice/files/patch-docs_reference_libnice_meson.build (revision 556495) @@ -0,0 +1,11 @@ +--- docs/reference/libnice/meson.build.orig 2020-11-25 16:39:27 UTC ++++ docs/reference/libnice/meson.build +@@ -26,7 +26,7 @@ ignore_headers = [ + ] + + if dependency('gtk-doc', version: '<1.30', required: false).found() +- prog_python = import('python').find_installation('python3') ++ prog_python = import('python').find_installation() + fake_makefile = custom_target ('libnice-docs-test-Makefile', + output: 'Makefile', + command: [ Property changes on: head/net-im/libnice/files/patch-docs_reference_libnice_meson.build ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/libnice/pkg-plist =================================================================== --- head/net-im/libnice/pkg-plist (revision 556494) +++ head/net-im/libnice/pkg-plist (revision 556495) @@ -1,70 +1,75 @@ bin/stunbdc bin/stund include/nice/address.h include/nice/agent.h include/nice/candidate.h include/nice/debug.h include/nice/interfaces.h include/nice/nice.h include/nice/pseudotcp.h include/stun/constants.h include/stun/debug.h include/stun/stunagent.h include/stun/stunmessage.h include/stun/usages/bind.h include/stun/usages/ice.h include/stun/usages/timer.h include/stun/usages/turn.h include/stun/win32_common.h lib/girepository-1.0/Nice-0.1.typelib lib/libnice.so lib/libnice.so.10 -lib/libnice.so.10.6.2 +lib/libnice.so.10.11.0 libdata/pkgconfig/nice.pc share/gir-1.0/Nice-0.1.gir share/gtk-doc/html/libnice/NiceAgent.html share/gtk-doc/html/libnice/NiceCandidate.html share/gtk-doc/html/libnice/annotation-glossary.html share/gtk-doc/html/libnice/api-index-deprecated.html share/gtk-doc/html/libnice/api-index-full.html share/gtk-doc/html/libnice/ch01.html share/gtk-doc/html/libnice/ch02.html share/gtk-doc/html/libnice/ch03.html share/gtk-doc/html/libnice/ch04.html share/gtk-doc/html/libnice/ch05.html share/gtk-doc/html/libnice/home.png share/gtk-doc/html/libnice/index.html -share/gtk-doc/html/libnice/index.sgml share/gtk-doc/html/libnice/ix03.html share/gtk-doc/html/libnice/ix04.html share/gtk-doc/html/libnice/ix05.html share/gtk-doc/html/libnice/ix06.html share/gtk-doc/html/libnice/ix07.html share/gtk-doc/html/libnice/ix08.html share/gtk-doc/html/libnice/ix09.html share/gtk-doc/html/libnice/ix10.html share/gtk-doc/html/libnice/ix11.html share/gtk-doc/html/libnice/ix12.html +share/gtk-doc/html/libnice/ix13.html +share/gtk-doc/html/libnice/ix14.html +share/gtk-doc/html/libnice/ix15.html +share/gtk-doc/html/libnice/ix16.html +share/gtk-doc/html/libnice/ix17.html share/gtk-doc/html/libnice/left-insensitive.png share/gtk-doc/html/libnice/left.png share/gtk-doc/html/libnice/libnice-Bind.html share/gtk-doc/html/libnice/libnice-Debug-messages.html share/gtk-doc/html/libnice/libnice-ICE.html share/gtk-doc/html/libnice/libnice-Network-interfaces-discovery.html share/gtk-doc/html/libnice/libnice-NiceAddress.html share/gtk-doc/html/libnice/libnice-Pseudo-TCP-Socket.html share/gtk-doc/html/libnice/libnice-STUN-Constants.html share/gtk-doc/html/libnice/libnice-StunAgent.html share/gtk-doc/html/libnice/libnice-StunMessage.html share/gtk-doc/html/libnice/libnice-TURN.html share/gtk-doc/html/libnice/libnice-Timer.html share/gtk-doc/html/libnice/libnice.devhelp2 share/gtk-doc/html/libnice/pt01.html share/gtk-doc/html/libnice/pt02.html share/gtk-doc/html/libnice/pt03.html share/gtk-doc/html/libnice/pt04.html share/gtk-doc/html/libnice/right-insensitive.png share/gtk-doc/html/libnice/right.png +share/gtk-doc/html/libnice/states.png share/gtk-doc/html/libnice/style.css share/gtk-doc/html/libnice/up-insensitive.png share/gtk-doc/html/libnice/up.png