libnice: bump version, switch to meson

test results: 33/38

net-libs/libnice/libnice-0.1.18.recipe

@@ -14,7 +14,7 @@ LICENSE="MPL v1.1
 	GNU LGPL v2.1"
 REVISION="1"
 SOURCE_URI="http://nice.freedesktop.org/releases/libnice-$portVersion.tar.gz"
-CHECKSUM_SHA256="06b678066f94dde595a4291588ed27acd085ee73775b8c4e8399e28c01eeefdf"
+CHECKSUM_SHA256="5eabd25ba2b54e817699832826269241abaa1cf78f9b240d1435f936569273f4"
 PATCHES="libnice-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -22,12 +22,9 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	libnice$secondaryArchSuffix = $portVersion
-	cmd:sdp_example$secondaryArchSuffix = $portVersion
-	cmd:simple_example$secondaryArchSuffix = $portVersion
 	cmd:stunbdc$secondaryArchSuffix = $portVersion
 	cmd:stund$secondaryArchSuffix = $portVersion
-	cmd:threaded_example$secondaryArchSuffix = $portVersion
-	lib:libnice$secondaryArchSuffix = 10.9.0 compat >= 10
+	lib:libnice$secondaryArchSuffix = 10.11.0 compat >= 10
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -35,13 +32,11 @@ REQUIRES="
 	lib:libglib_2.0$secondaryArchSuffix
 	lib:libgnutls$secondaryArchSuffix
 	lib:libgobject_2.0$secondaryArchSuffix
-	lib:libgthread_2.0$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	libnice${secondaryArchSuffix}_devel = $portVersion
-	devel:libnice$secondaryArchSuffix = 10.9.0 compat >= 10
+	devel:libnice$secondaryArchSuffix = 10.11.0 compat >= 10
 	"
 REQUIRES_devel="
 	libnice$secondaryArchSuffix == $portVersion
@@ -56,32 +51,34 @@ BUILD_REQUIRES="
 	devel:libgthread_2.0$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 #	cmd:gtkdocize
 	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize
-	cmd:make
+	cmd:meson
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:python3
 	"
 
 BUILD()
 {
-	CFLAGS="-D_BSD_SOURCE" runConfigure ./configure \
-		--disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf
-	make $jobArgs
+	export CFLAGS="-D_BSD_SOURCE"
+	meson build \
+		--prefix="$prefix" --libdir="$libDir" --includedir="$includeDir" \
+		--bindir="$binDir" \
+		-Dgstreamer=disabled
+	meson compile -C build
 }
 
 INSTALL()
 {
-	make install
-
-	rm $libDir/libnice.la
+	meson install -C build
 
 	prepareInstalledDevelLibs libnice
 	fixPkgconfig
 
 	packageEntries devel $developDir
 }
+
+TEST()
+{
+	meson test -C build
+}

net-libs/libnice/patches/libnice-0.1.16.patchset

@@ -1,67 +0,0 @@
-From 3bb8a783a23286cf148a40e00a55a6ffc81f2ae3 Mon Sep 17 00:00:00 2001
-From: Steven Kou <kouyongkang@gmail.com>
-Date: Mon, 28 Dec 2015 00:20:46 +0000
-Subject: Patched configure.ac to search for socket under network.
-
-
-diff --git a/configure.ac b/configure.ac
-index 2a11c5c..87e6d38 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -165,10 +165,10 @@ AS_IF([test "x$enable_compile_warnings" = "xerror"],[
- ])
- 
- #
--# Fixes for Solaris
-+# Fixes for Solaris and Haiku
- #
- AC_SEARCH_LIBS([inet_pton],[nsl])
--AC_SEARCH_LIBS([socket],[socket inet])
-+AC_SEARCH_LIBS([socket],[socket inet network])
- case $host in
- 	*-*-solaris* )
- 	AC_DEFINE(_XOPEN_SOURCE,          600, Needed to get declarations for msg_control and msg_controllen on Solaris)
--- 
-2.21.0
-
-
-From 7bac3b3916d86552d712ce91f0e96669f28e1f5a Mon Sep 17 00:00:00 2001
-From: Steven Kou <kouyongkang@gmail.com>
-Date: Mon, 28 Dec 2015 00:24:06 +0000
-Subject: Patched agent/interfaces.c to compile under Haiku.
-
-
-diff --git a/agent/interfaces.c b/agent/interfaces.c
-index f3f6d7f..a7add3f 100644
---- a/agent/interfaces.c
-+++ b/agent/interfaces.c
-@@ -46,7 +46,7 @@
- #include "interfaces.h"
- #include "agent-priv.h"
- 
--#ifdef G_OS_UNIX
-+#if defined(G_OS_UNIX)
- 
- #include <stdio.h>
- #include <stdlib.h>
-@@ -60,7 +60,7 @@
- #include <netinet/in.h>
- #include <netdb.h>
- 
--#ifdef __sun
-+#if defined(__sun) || defined(__HAIKU__)
- #include <sys/sockio.h>
- #endif
- 
-@@ -97,7 +97,7 @@ sockaddr_to_string (const struct sockaddr *addr)
- }
- #endif
- 
--#ifdef G_OS_UNIX
-+#if defined(G_OS_UNIX)
- 
- #ifdef HAVE_GETIFADDRS
- 
--- 
-2.21.0
-

net-libs/libnice/patches/libnice-0.1.18.patchset

@@ -0,0 +1,75 @@
+From 2216f605e396f366f09dad8b3f236d893710553a Mon Sep 17 00:00:00 2001
+From: Steven Kou <kouyongkang@gmail.com>
+Date: Mon, 28 Dec 2015 00:24:06 +0000
+Subject: Patched agent/interfaces.c to compile under Haiku.
+
+
+diff --git a/agent/interfaces.c b/agent/interfaces.c
+index f75f7cf..c1f81a0 100644
+--- a/agent/interfaces.c
++++ b/agent/interfaces.c
+@@ -46,7 +46,7 @@
+ #include "interfaces.h"
+ #include "agent-priv.h"
+ 
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX)
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -60,7 +60,7 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ 
+-#ifdef __sun
++#if defined(__sun) || defined(__HAIKU__)
+ #include <sys/sockio.h>
+ #endif
+ 
+@@ -119,7 +119,7 @@ sockaddr_to_string (const struct sockaddr *addr)
+ }
+ #endif
+ 
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX)
+ 
+ static GList *
+ get_local_interfaces_ioctl (void)
+-- 
+2.30.0
+
+
+From 43b20f05a16b090cf3f46dc1a30d2fa93c391abb Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 7 Jun 2021 19:19:51 +0200
+Subject: Haiku patch
+
+
+diff --git a/agent/interfaces.c b/agent/interfaces.c
+index c1f81a0..3aa002d 100644
+--- a/agent/interfaces.c
++++ b/agent/interfaces.c
+@@ -308,6 +308,7 @@ get_local_ips_ioctl (gboolean include_loopback)
+     if ((ifr->ifr_flags & IFF_UP) == 0)
+       continue;
+ 
++#define IFF_RUNNING IFF_LINK
+     /* no ip address from interface that isn't running */
+     if ((ifr->ifr_flags & IFF_RUNNING) == 0)
+       continue;
+diff --git a/meson.build b/meson.build
+index 8cbc178..6b9de66 100644
+--- a/meson.build
++++ b/meson.build
+@@ -64,6 +64,8 @@ elif host_machine.system() == 'sunos'
+       error('Could not find right library for socket() on Solaris')
+     endif
+   endif
++elif host_machine.system() == 'haiku'
++   syslibs += [cc.find_library('network')]
+ endif
+ 
+ if not cc.has_function('clock_gettime')
+-- 
+2.30.0
+