Index: Makefile =================================================================== --- Makefile (revision 540721) +++ Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libnice -PORTVERSION= 0.1.13 +PORTVERSION= 0.1.17 CATEGORIES= net-im devel MASTER_SITES= http://nice.freedesktop.org/releases/ @@ -9,19 +9,22 @@ 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 #.include @@ -28,19 +31,14 @@ .if defined(LIBNICE_SLAVE) . if ${LIBNICE_SLAVE}==gstreamer010 USE_GSTREAMER= yes -CONFIGURE_ARGS+=--without-gstreamer --with-gstreamer-0.10 +MESON_ARGS+=-Dgstreamer=enabled -Dgst_version=0.10 -Dtests=disabled . endif . if ${LIBNICE_SLAVE}==gstreamer1 USE_GSTREAMER1= yes -CONFIGURE_ARGS+=--with-gstreamer --without-gstreamer-0.10 +MESON_ARGS+=-Dgstreamer=enabled -Dgst_version=1.0 . endif -.else -CONFIGURE_ARGS= --without-gstreamer --without-gstreamer-0.10 +. else +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: distinfo =================================================================== --- distinfo (revision 540721) +++ distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (libnice-0.1.13.tar.gz) = 61112d9f3be933a827c8365f20551563953af6718057928f51f487bfe88419e1 -SIZE (libnice-0.1.13.tar.gz) = 912374 +TIMESTAMP = 1591993491 +SHA256 (libnice-0.1.17.tar.gz) = 1952a0dec58b5c9ccc3f25193df4e2d1244cb382cac611b71e25afcd7b069526 +SIZE (libnice-0.1.17.tar.gz) = 1083398 Index: files/configure.ac =================================================================== --- files/configure.ac (revision 540721) +++ 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: 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: files/patch-Makefile.in =================================================================== --- files/patch-Makefile.in (revision 540721) +++ 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: 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: files/patch-configure =================================================================== --- files/patch-configure (revision 540721) +++ 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: 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: files/patch-docs_reference_libnice_meson.build =================================================================== --- files/patch-docs_reference_libnice_meson.build (nonexistent) +++ files/patch-docs_reference_libnice_meson.build (working copy) @@ -0,0 +1,11 @@ +--- docs/reference/libnice/meson.build.orig 2020-07-14 18:55:04 UTC ++++ docs/reference/libnice/meson.build +@@ -25,7 +25,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: 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: files/patch-gst_Makefile.in =================================================================== --- files/patch-gst_Makefile.in (revision 540721) +++ 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: 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: files/patch-gst_meson.build =================================================================== --- files/patch-gst_meson.build (nonexistent) +++ files/patch-gst_meson.build (working copy) @@ -0,0 +1,18 @@ +--- gst/meson.build.orig 2019-01-16 14:55:43 UTC ++++ gst/meson.build +@@ -6,9 +6,12 @@ gst_nice_sources = [ + + gst_nice_args = ['-DGST_USE_UNSTABLE_API'] + +-gst_plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0') +- +-libgstnice = library('gstnice', ++gst_plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-'+get_option('gst_version')) ++libname='gstnice' ++if get_option('gst_version').startswith('0') ++ libname=libname+'010' ++endif ++libgstnice = library(libname, + gst_nice_sources, + c_args : gst_nice_args, + include_directories: nice_incs, Property changes on: files/patch-gst_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: files/patch-meson.build =================================================================== --- files/patch-meson.build (nonexistent) +++ files/patch-meson.build (working copy) @@ -0,0 +1,38 @@ +--- meson.build.orig 2020-05-22 20:41:39 UTC ++++ meson.build +@@ -2,7 +2,7 @@ project('libnice', 'c', + version: '0.1.17', + meson_version : '>= 0.52', + default_options : ['warning_level=1', 'buildtype=debugoptimized']) +- ++gst_version = get_option('gst_version') + nice_version = meson.project_version() + version_arr = nice_version.split('.') + version_major = version_arr[0] +@@ -25,8 +25,9 @@ libversion = '10.10.0' + glib_req = '>= 2.54' + gnutls_req = '>= 2.12.0' + gupnp_igd_req = '>= 0.2.4' +-gst_req = '>= 1.0.0' ++gst_req = '>= ' + gst_version + ++ + nice_datadir = join_paths(get_option('prefix'), get_option('datadir')) + + cc = meson.get_compiler('c') +@@ -251,10 +252,14 @@ if not crypto_dep.found() + endif + + # GStreamer ++if get_option('gst_version').startswith('0') ++ gst_dep = dependency('gstreamer-base-0.10',version: gst_req, ++ required: get_option('gstreamer')) ++else + gst_dep = dependency('gstreamer-base-1.0', version: gst_req, + required: get_option('gstreamer'), + fallback : ['gstreamer', 'gst_base_dep']) +- ++endif + cdata.set('HAVE_GSTREAMER', gst_dep.found(), description: 'Build GStreamer plugin') + + # GUPnP IGD Property changes on: files/patch-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: files/patch-meson__options.txt =================================================================== --- files/patch-meson__options.txt (nonexistent) +++ files/patch-meson__options.txt (working copy) @@ -0,0 +1,7 @@ +--- meson_options.txt.orig 2020-06-25 17:30:06 UTC ++++ meson_options.txt +@@ -1,3 +1,4 @@ ++option('gst_version',type:'string',value:'1.0') + option('gupnp', type: 'feature', value: 'auto', + description: 'Enable or disable GUPnP IGD support') + option('gstreamer', type: 'feature', value: 'auto', Property changes on: files/patch-meson__options.txt ___________________________________________________________________ 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: pkg-plist =================================================================== --- pkg-plist (revision 540721) +++ pkg-plist (working copy) @@ -19,7 +19,7 @@ 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.10.0 libdata/pkgconfig/nice.pc share/gir-1.0/Nice-0.1.gir share/gtk-doc/html/libnice/NiceAgent.html @@ -34,7 +34,6 @@ 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 @@ -45,6 +44,10 @@ 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/left-insensitive.png share/gtk-doc/html/libnice/left.png share/gtk-doc/html/libnice/libnice-Bind.html @@ -65,6 +68,7 @@ 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