Attachment #218843 for bug #247547




# $FreeBSD$

PORTNAME=	libnice
PORTVERSION=	0.1.17
CATEGORIES=	net-im devel
MASTER_SITES=	http://nice.freedesktop.org/releases/


MAINTAINER=	gnome@FreeBSD.org
COMMENT=	Library and transmitter that implements ICE-19

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 <bsd.port.options.mk>


.if defined(LIBNICE_SLAVE)
. if ${LIBNICE_SLAVE}==gstreamer010
USE_GSTREAMER=	yes
MESON_ARGS+=-Dgstreamer=enabled -Dgst_version=0.10 -Dtests=disabled
. endif
. if ${LIBNICE_SLAVE}==gstreamer1
USE_GSTREAMER1=	yes
MESON_ARGS+=-Dgstreamer=enabled -Dgst_version=1.0
. endif
. 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 <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (libnice-0.1.13.tar.gz) = 61112d9f3be933a827c8365f20551563953af6718057928f51f487bfe88419e1	1	TIMESTAMP = 1591993491
2	SIZE (libnice-0.1.13.tar.gz) = 912374	2	SHA256 (libnice-0.1.17.tar.gz) = 1952a0dec58b5c9ccc3f25193df4e2d1244cb382cac611b71e25afcd7b069526
		3	SIZE (libnice-0.1.17.tar.gz) = 1083398




--- 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, [




--- 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 = \

Lines 1-23 Link Here

(-)files/patch-configure (-23 lines)
1	--- configure.orig 2015-08-08 16:33:30.121861000 +0200
2	+++ configure 2015-08-08 16:33:52.533583000 +0200
3	@@ -15751,7 +15751,9 @@
4
5	fi
6
7	- if test "$have_gst_check" = yes; then
8	+fi
9	+
10	+ if test "$have_gst_check" = yes; then
11	HAVE_GST_CHECK_TRUE=
12	HAVE_GST_CHECK_FALSE='#'
13	else
14	@@ -15760,9 +15762,6 @@
15	fi
16
17
18	-
19	-fi
20	-
21	if test "$with_gstreamer010" != no; then :
22
23

Line 0 Link Here

(-)files/patch-docs_reference_libnice_meson.build (+11 lines)
	1	--- docs/reference/libnice/meson.build.orig 2020-07-14 18:55:04 UTC
	2	+++ docs/reference/libnice/meson.build
	3	@@ -25,7 +25,7 @@ ignore_headers = [
	4	]
	5
	6	if dependency('gtk-doc', version: '<1.30', required: false).found()
	7	- prog_python = import('python').find_installation('python3')
	8	+ prog_python = import('python').find_installation()
	9	fake_makefile = custom_target ('libnice-docs-test-Makefile',
	10	output: 'Makefile',
	11	command: [

Lines 1-11 Link Here

(-)files/patch-gst_Makefile.in (-11 lines)
1	--- gst/Makefile.in.orig 2013-05-22 07:56:38.000000000 +0000
2	+++ gst/Makefile.in 2013-05-22 07:58:56.000000000 +0000
3	@@ -319,7 +319,7 @@
4	-I $(top_srcdir)/stun
5
6	COMMON_LIBADD = \
7	- $(top_builddir)/nice/libnice.la
8	+ -lnice
9
10
11	# libgstnice




--- 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,




--- 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

Line 0 Link Here

(-)files/patch-meson__options.txt (+7 lines)
	1	--- meson_options.txt.orig 2020-06-25 17:30:06 UTC
	2	+++ meson_options.txt
	3	@@ -1,3 +1,4 @@
	4	+option('gst_version',type:'string',value:'1.0')
	5	option('gupnp', type: 'feature', value: 'auto',
	6	description: 'Enable or disable GUPnP IGD support')
	7	option('gstreamer', type: 'feature', value: 'auto',




lib/girepository-1.0/Nice-0.1.typelib
lib/libnice.so
lib/libnice.so.10
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

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/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

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

Return to bug 247547

Lines 2-8 Link Here

(-)Makefile (-15 / +13 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libnice	4	PORTNAME= libnice
5	PORTVERSION= 0.1.13	5	PORTVERSION= 0.1.17
6	CATEGORIES= net-im devel	6	CATEGORIES= net-im devel
7	MASTER_SITES= http://nice.freedesktop.org/releases/	7	MASTER_SITES= http://nice.freedesktop.org/releases/
8		8
Lines 9-27 Link Here
9	MAINTAINER= gnome@FreeBSD.org	9	MAINTAINER= gnome@FreeBSD.org
10	COMMENT= Library and transmitter that implements ICE-19	10	COMMENT= Library and transmitter that implements ICE-19
11		11
12	USES= gettext gmake gnome libtool localbase:ldflags pathfix pkgconfig	12	LICENSE= LGPL21 MPL11
		13	LICENSE_COMB= dual
		14
		15	LIB_DEPENDS= libgnutls.so:security/gnutls
		16	BUILD_DEPENDS= gtk-doc>0:textproc/gtk-doc
		17
		18	USES= gettext gmake gnome libtool localbase:ldflags pathfix pkgconfig meson python
13	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
14	USE_GNOME= glib20 introspection:build	20	USE_GNOME= glib20 introspection:build
15	GNU_CONFIGURE= yes
16	CPPFLAGS+= -DHAVE_GETIFADDRS	21	CPPFLAGS+= -DHAVE_GETIFADDRS
17	INSTALL_TARGET= install-strip	22	INSTALL_TARGET= install-strip
18		23
19	.if !defined(LIBNICE_SLAVE)
20	OPTIONS_DEFINE= GUPNP	24	OPTIONS_DEFINE= GUPNP
		25	GUPNP_MESON_ENABLED= gupnp
21	GUPNP_DESC= UPnP IGD port mapping support	26	GUPNP_DESC= UPnP IGD port mapping support
22	GUPNP_LIB_DEPENDS+= libgupnp-igd-1.0.so:net/gupnp-igd	27	GUPNP_LIB_DEPENDS+= libgupnp-igd-1.0.so:net/gupnp-igd
23	GUPNP_CONFIGURE_ENABLE= gupnp
24	.endif
25		28
26	#.include <bsd.port.options.mk>	29	#.include <bsd.port.options.mk>
27		30
Lines 28-46 Link Here
28	.if defined(LIBNICE_SLAVE)	31	.if defined(LIBNICE_SLAVE)
29	. if ${LIBNICE_SLAVE}==gstreamer010	32	. if ${LIBNICE_SLAVE}==gstreamer010
30	USE_GSTREAMER= yes	33	USE_GSTREAMER= yes
31	CONFIGURE_ARGS+=--without-gstreamer --with-gstreamer-0.10	34	MESON_ARGS+=-Dgstreamer=enabled -Dgst_version=0.10 -Dtests=disabled
32	. endif	35	. endif
33	. if ${LIBNICE_SLAVE}==gstreamer1	36	. if ${LIBNICE_SLAVE}==gstreamer1
34	USE_GSTREAMER1= yes	37	USE_GSTREAMER1= yes
35	CONFIGURE_ARGS+=--with-gstreamer --without-gstreamer-0.10	38	MESON_ARGS+=-Dgstreamer=enabled -Dgst_version=1.0
36	. endif	39	. endif
37	.else	40	. else
38	CONFIGURE_ARGS= --without-gstreamer --without-gstreamer-0.10	41	MESON_ARGS+=-Dgstreamer=disabled -Dgtk_doc=enabled
39	.endif	42	.endif
40		43
41	post-patch:
42	@${FIND} ${WRKSRC} -name Makefile.in \| ${XARGS} ${REINPLACE_CMD} -e \
43	's\|-Wno-missing-field-initializers\|#\|g'
44	@${REINPLACE_CMD} -e 's\|-Werror\|\|g' ${WRKSRC}/configure
45
46	.include <bsd.port.mk>	44	.include <bsd.port.mk>

Lines 1-16 Link Here

(-)files/configure.ac (-16 lines)
1	--- configure.ac.orig 2015-08-08 16:29:47.571735000 +0200
2	+++ configure.ac 2015-08-08 16:33:23.011860000 +0200
3	@@ -231,11 +231,10 @@
4	[
5	have_gst_check=no
6	])
7	-
8	- AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes)
9	-
10	])
11
12	+AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes)
13	+
14	AS_IF([test "$with_gstreamer010" != no], [
15
16	PKG_CHECK_MODULES(GST010, [

Lines 1-13 Link Here

(-)files/patch-Makefile.in (-13 lines)
1	--- Makefile.in.orig 2013-05-22 07:47:08.000000000 +0000
2	+++ Makefile.in 2013-05-22 07:47:23.000000000 +0000
3	@@ -311,9 +311,7 @@
4	agent \
5	nice \
6	gst \
7	- docs \
8	- tests \
9	- examples
10	+ docs
11
12	DISTCHECK_CONFIGURE_FLAGS = --disable-assert -enable-gtk-doc
13	EXTRA_DIST = \

Line 0 Link Here

(-)files/patch-gst_meson.build (+18 lines)
	1	--- gst/meson.build.orig 2019-01-16 14:55:43 UTC
	2	+++ gst/meson.build
	3	@@ -6,9 +6,12 @@ gst_nice_sources = [
	4
	5	gst_nice_args = ['-DGST_USE_UNSTABLE_API']
	6
	7	-gst_plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0')
	8	-
	9	-libgstnice = library('gstnice',
	10	+gst_plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-'+get_option('gst_version'))
	11	+libname='gstnice'
	12	+if get_option('gst_version').startswith('0')
	13	+ libname=libname+'010'
	14	+endif
	15	+libgstnice = library(libname,
	16	gst_nice_sources,
	17	c_args : gst_nice_args,
	18	include_directories: nice_incs,

Line 0 Link Here

(-)files/patch-meson.build (+38 lines)
	1	--- meson.build.orig 2020-05-22 20:41:39 UTC
	2	+++ meson.build
	3	@@ -2,7 +2,7 @@ project('libnice', 'c',
	4	version: '0.1.17',
	5	meson_version : '>= 0.52',
	6	default_options : ['warning_level=1', 'buildtype=debugoptimized'])
	7	-
	8	+gst_version = get_option('gst_version')
	9	nice_version = meson.project_version()
	10	version_arr = nice_version.split('.')
	11	version_major = version_arr[0]
	12	@@ -25,8 +25,9 @@ libversion = '10.10.0'
	13	glib_req = '>= 2.54'
	14	gnutls_req = '>= 2.12.0'
	15	gupnp_igd_req = '>= 0.2.4'
	16	-gst_req = '>= 1.0.0'
	17	+gst_req = '>= ' + gst_version
	18
	19	+
	20	nice_datadir = join_paths(get_option('prefix'), get_option('datadir'))
	21
	22	cc = meson.get_compiler('c')
	23	@@ -251,10 +252,14 @@ if not crypto_dep.found()
	24	endif
	25
	26	# GStreamer
	27	+if get_option('gst_version').startswith('0')
	28	+ gst_dep = dependency('gstreamer-base-0.10',version: gst_req,
	29	+ required: get_option('gstreamer'))
	30	+else
	31	gst_dep = dependency('gstreamer-base-1.0', version: gst_req,
	32	required: get_option('gstreamer'),
	33	fallback : ['gstreamer', 'gst_base_dep'])
	34	-
	35	+endif
	36	cdata.set('HAVE_GSTREAMER', gst_dep.found(), description: 'Build GStreamer plugin')
	37
	38	# GUPnP IGD

Lines 19-25 Link Here

(-)pkg-plist (-2 / +6 lines)
19	lib/girepository-1.0/Nice-0.1.typelib	19	lib/girepository-1.0/Nice-0.1.typelib
20	lib/libnice.so	20	lib/libnice.so
21	lib/libnice.so.10	21	lib/libnice.so.10
22	lib/libnice.so.10.6.2	22	lib/libnice.so.10.10.0
23	libdata/pkgconfig/nice.pc	23	libdata/pkgconfig/nice.pc
24	share/gir-1.0/Nice-0.1.gir	24	share/gir-1.0/Nice-0.1.gir
25	share/gtk-doc/html/libnice/NiceAgent.html	25	share/gtk-doc/html/libnice/NiceAgent.html
Lines 34-40 Link Here
34	share/gtk-doc/html/libnice/ch05.html	34	share/gtk-doc/html/libnice/ch05.html
35	share/gtk-doc/html/libnice/home.png	35	share/gtk-doc/html/libnice/home.png
36	share/gtk-doc/html/libnice/index.html	36	share/gtk-doc/html/libnice/index.html
37	share/gtk-doc/html/libnice/index.sgml
38	share/gtk-doc/html/libnice/ix03.html	37	share/gtk-doc/html/libnice/ix03.html
39	share/gtk-doc/html/libnice/ix04.html	38	share/gtk-doc/html/libnice/ix04.html
40	share/gtk-doc/html/libnice/ix05.html	39	share/gtk-doc/html/libnice/ix05.html
Lines 45-50 Link Here
45	share/gtk-doc/html/libnice/ix10.html	44	share/gtk-doc/html/libnice/ix10.html
46	share/gtk-doc/html/libnice/ix11.html	45	share/gtk-doc/html/libnice/ix11.html
47	share/gtk-doc/html/libnice/ix12.html	46	share/gtk-doc/html/libnice/ix12.html
		47	share/gtk-doc/html/libnice/ix13.html
		48	share/gtk-doc/html/libnice/ix14.html
		49	share/gtk-doc/html/libnice/ix15.html
		50	share/gtk-doc/html/libnice/ix16.html
48	share/gtk-doc/html/libnice/left-insensitive.png	51	share/gtk-doc/html/libnice/left-insensitive.png
49	share/gtk-doc/html/libnice/left.png	52	share/gtk-doc/html/libnice/left.png
50	share/gtk-doc/html/libnice/libnice-Bind.html	53	share/gtk-doc/html/libnice/libnice-Bind.html
Lines 65-70 Link Here
65	share/gtk-doc/html/libnice/pt04.html	68	share/gtk-doc/html/libnice/pt04.html
66	share/gtk-doc/html/libnice/right-insensitive.png	69	share/gtk-doc/html/libnice/right-insensitive.png
67	share/gtk-doc/html/libnice/right.png	70	share/gtk-doc/html/libnice/right.png
		71	share/gtk-doc/html/libnice/states.png
68	share/gtk-doc/html/libnice/style.css	72	share/gtk-doc/html/libnice/style.css
69	share/gtk-doc/html/libnice/up-insensitive.png	73	share/gtk-doc/html/libnice/up-insensitive.png
70	share/gtk-doc/html/libnice/up.png	74	share/gtk-doc/html/libnice/up.png