haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

libnice: bump version.

Browse Source
This commit is contained in:
Jerome Duval
2019-11-10 12:22:10 +01:00
parent fcbb94f0e8
commit 60ff3cf0fb
2 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net-libs/libnice/libnice-0.1.14.recipe → net-libs/libnice/libnice-0.1.16.recipe
View File

@@ -12,9 +12,9 @@ COPYRIGHT="2006-2011 Collabora Ltd.
2006-2011 Nokia Corporation"
LICENSE="MPL v1.1
GNU LGPL v2.1"
REVISION="2"
REVISION="1"
SOURCE_URI="http://nice.freedesktop.org/releases/libnice-$portVersion.tar.gz"
CHECKSUM_SHA256="be120ba95d4490436f0da077ffa8f767bf727b82decf2bf499e39becc027809c"
CHECKSUM_SHA256="06b678066f94dde595a4291588ed27acd085ee73775b8c4e8399e28c01eeefdf"
PATCHES="libnice-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -27,7 +27,7 @@ PROVIDES="
cmd:stunbdc$secondaryArchSuffix = $portVersion
cmd:stund$secondaryArchSuffix = $portVersion
cmd:threaded_example$secondaryArchSuffix = $portVersion
lib:libnice$secondaryArchSuffix = 10.7.0 compat >= 10
lib:libnice$secondaryArchSuffix = 10.9.0 compat >= 10
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -41,7 +41,7 @@ REQUIRES="
PROVIDES_devel="
libnice${secondaryArchSuffix}_devel = $portVersion
devel:libnice$secondaryArchSuffix = 10.7.0 compat >= 10
devel:libnice$secondaryArchSuffix = 10.9.0 compat >= 10
"
REQUIRES_devel="
libnice$secondaryArchSuffix == $portVersion
@@ -64,6 +64,7 @@ BUILD_PREREQUIRES="
cmd:libtoolize
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:python3
"
BUILD()

31
net-libs/libnice/patches/libnice-0.1.14.patchset → net-libs/libnice/patches/libnice-0.1.16.patchset
View File

@@ -1,14 +1,14 @@
From eb06445b68534c827944fe5a7e741dd15f441cc7 Mon Sep 17 00:00:00 2001
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 223b883..3c279e7 100644
index 2a11c5c..87e6d38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,10 +164,10 @@ AS_IF([test "x$enable_compile_warnings" = "xerror"],[
@@ -165,10 +165,10 @@ AS_IF([test "x$enable_compile_warnings" = "xerror"],[
])
#
@@ -22,17 +22,17 @@ index 223b883..3c279e7 100644
*-*-solaris* )
AC_DEFINE(_XOPEN_SOURCE, 600, Needed to get declarations for msg_control and msg_controllen on Solaris)
--
2.2.2
2.21.0
From 1d53cba7655e887f810ef5c5faa5730321f10653 Mon Sep 17 00:00:00 2001
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 0fa2fd7..0fe034f 100644
index f3f6d7f..a7add3f 100644
--- a/agent/interfaces.c
+++ b/agent/interfaces.c
@@ -46,7 +46,7 @@
@@ -40,7 +40,7 @@ index 0fa2fd7..0fe034f 100644
#include "agent-priv.h"
-#ifdef G_OS_UNIX
+#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+#if defined(G_OS_UNIX)
#include <stdio.h>
#include <stdlib.h>
@@ -49,30 +49,19 @@ index 0fa2fd7..0fe034f 100644
#include <netdb.h>
-#ifdef __sun
+#if defined(__sun) || defined(G_OS_HAIKU)
+#if defined(__sun) || defined(__HAIKU__)
#include <sys/sockio.h>
#endif
@@ -73,8 +73,8 @@
#endif /* G_OS_UNIX */
-#if (defined(G_OS_UNIX) && defined(HAVE_GETIFADDRS)) || defined(G_OS_WIN32)
-/* Works on both UNIX and Windows. Magic! */
+#if ((defined(G_OS_UNIX) || defined(G_OS_HAIKU)) && defined(HAVE_GETIFADDRS)) || defined(G_OS_WIN32)
+/* Works on both UNIX/Haiku and Windows. Magic! */
static gchar *
sockaddr_to_string (const struct sockaddr *addr)
{
@@ -97,7 +97,7 @@ sockaddr_to_string (const struct sockaddr *addr)
}
#endif
-#ifdef G_OS_UNIX
+#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+#if defined(G_OS_UNIX)
#ifdef HAVE_GETIFADDRS
--
2.2.2
2.21.0