Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Tim-Philipp Müller
cerbero
Commits
b43e400a
Commit
b43e400a
authored
Jan 14, 2019
by
Tim-Philipp Müller
🐠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libnice: update to 0.1.15 release
parent
a5c4dbaf
Pipeline
#14959
passed with stages
in 35 minutes and 30 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
103 deletions
+10
-103
recipes/libnice.recipe
recipes/libnice.recipe
+2
-5
recipes/libnice/0001-Fix-build-with-android-NDK-r16.patch
recipes/libnice/0001-Fix-build-with-android-NDK-r16.patch
+0
-29
recipes/libnice/0001-agent-Redefine-socket-error-messages-for-windows.patch
...01-agent-Redefine-socket-error-messages-for-windows.patch
+0
-32
recipes/libnice/0001-nicesrc-spin-the-agent-mainloop-in-a-separate-thread.patch
...icesrc-spin-the-agent-mainloop-in-a-separate-thread.patch
+8
-8
recipes/libnice/0001-stun-Also-rename-windows-specific-function.patch
...ice/0001-stun-Also-rename-windows-specific-function.patch
+0
-29
No files found.
recipes/libnice.recipe
View file @
b43e400a
...
...
@@ -2,10 +2,10 @@
class
Recipe
(
recipe
.
Recipe
):
name
=
'libnice'
version
=
'0.1.1
4
'
version
=
'0.1.1
5
'
stype
=
SourceType
.
TARBALL
url
=
'https://nice.freedesktop.org/releases/%(name)s-%(version)s.tar.gz'
tarball_checksum
=
'
be120ba95d4490436f0da077ffa8f767bf727b82decf2bf499e39becc027809c
'
tarball_checksum
=
'
f7280f3f58f594409c719a03009aa819c599078b410796f408251277807587da
'
licenses
=
[
License
.
LGPLv2_1Plus
,
License
.
MPLv1_1
]
configure_options
=
'--enable-static --enable-static-plugins --enable-shared
\
--with-gstreamer --without-gstreamer-0.10
\
...
...
@@ -13,10 +13,7 @@ class Recipe(recipe.Recipe):
deps
=
[
'glib'
,
'gstreamer-1.0'
]
autoreconf
=
True
patches
=
[
"libnice/0001-Fix-build-with-android-NDK-r16.patch"
,
"libnice/0001-nicesrc-spin-the-agent-mainloop-in-a-separate-thread.patch"
,
"libnice/0001-agent-Redefine-socket-error-messages-for-windows.patch"
,
"libnice/0001-stun-Also-rename-windows-specific-function.patch"
]
files_bins
=
[
'stunbdc'
,
'stund'
]
...
...
recipes/libnice/0001-Fix-build-with-android-NDK-r16.patch
deleted
100644 → 0
View file @
a5c4dbaf
From 0a0d6fdd0c6626fa6d7bf16b53f67c94bf298a88 Mon Sep 17 00:00:00 2001
From: Matthew Waters <matthew@centricular.com>
Date: Wed, 14 Feb 2018 23:22:16 +1100
Subject: [PATCH] Fix build with android NDK r16
getifaddrs() may only be available if the target API is >= 24
---
configure.ac | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 5fabdb4..081b00e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,8 +88,9 @@
AH_VERBATIM([_FORTIFY_SOURCE],
AC_DEFINE([NICEAPI_EXPORT], [ ], [Public library function implementation])
AC_CHECK_HEADERS([arpa/inet.h net/in.h netdb.h])
AC_CHECK_HEADERS([ifaddrs.h], \
- [AC_DEFINE(HAVE_GETIFADDRS, [1], \
- [Whether getifaddrs() is available on the system])])
+ [AC_CHECK_FUNCS([getifaddrs], \
+ [AC_DEFINE(HAVE_GETIFADDRS, [1], \
+ [Whether getifaddrs() is available on the system])])])
AC_CHECK_TYPES([size_t, ssize_t])
# Also put matching version in LIBNICE_CFLAGS
--
2.16.1
recipes/libnice/0001-agent-Redefine-socket-error-messages-for-windows.patch
deleted
100644 → 0
View file @
a5c4dbaf
From 0ac43410bc3c7f48df576dd50e9a2d9294b84aed Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward@centricular.com>
Date: Wed, 21 Feb 2018 09:05:45 +0100
Subject: [PATCH] agent: Redefine socket error messages for windows
In the same way we do it for the other error messages
---
agent/pseudotcp.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/agent/pseudotcp.h b/agent/pseudotcp.h
index e7c8eaa..687c459 100644
--- a/agent/pseudotcp.h
+++ b/agent/pseudotcp.h
@@ -78,6 +78,14 @@
#ifndef ECONNRESET
# define ECONNRESET WSAECONNRESET
#endif
+
+#ifndef EMSGSIZE
+# define EMSGSIZE WSAEMSGSIZE
+#endif
+
+#ifndef ETIMEDOUT
+# define ETIMEDOUT WSAETIMEDOUT
+#endif
#endif
#endif
--
2.14.3
recipes/libnice/0001-nicesrc-spin-the-agent-mainloop-in-a-separate-thread.patch
View file @
b43e400a
From
3196a96a408a90f707dff3f31fa3d05d64aeb68
a Mon Sep 17 00:00:00 2001
From
e0583a05ddb65a3c9326266a769678aff82a009
a Mon Sep 17 00:00:00 2001
From: Alessandro Decina <alessandro.d@gmail.com>
Date: Tue, 13 Oct 2015 12:49:19 +1100
Subject: [PATCH] nicesrc: spin the agent mainloop in a separate thread
...
...
@@ -7,12 +7,12 @@ Don't run the mainloop from the srcpad task, since that can get blocked in the
pipeline and cause unnecessary STUN retrasmissions (at best) and completely
block the agent (at worst).
---
gst/gstnicesrc.c | 158 +++++++++++++++++++++++++++
+++++---
--------------------
gst/gstnicesrc.c | 158 +++++++++++++++++++++++++++--------------------
gst/gstnicesrc.h | 4 +-
2 files changed, 93 insertions(+), 69 deletions(-)
diff --git a/gst/gstnicesrc.c b/gst/gstnicesrc.c
index d3
69e09..eb59fe9
100644
index
0
d3
9c34..954323c
100644
--- a/gst/gstnicesrc.c
+++ b/gst/gstnicesrc.c
@@ -48,6 +48,14 @@
GST_DEBUG_CATEGORY_STATIC (nicesrc_debug);
...
...
@@ -147,7 +147,7 @@ index d369e09..eb59fe9 100644
GST_OBJECT_UNLOCK (nicesrc);
}
static gboolean
-
static gboolean
-gst_nice_src_unlock_idler (gpointer data)
-{
- GstNiceSrc *nicesrc = GST_NICE_SRC (data);
...
...
@@ -166,7 +166,7 @@ index d369e09..eb59fe9 100644
- return FALSE;
-}
-
-
static gboolean
static gboolean
gst_nice_src_unlock (GstBaseSrc *src)
{
GstNiceSrc *nicesrc = GST_NICE_SRC (src);
...
...
@@ -225,8 +225,8 @@ index d369e09..eb59fe9 100644
*buffer = g_queue_pop_head (nicesrc->outbufs);
GST_OBJECT_UNLOCK (basesrc);
@@ -33
1
,6 +35
4
,7 @@
gst_nice_src_dispose (GObject *object)
g_queue_free (src->outbufs);
@@ -33
0
,6 +35
3
,7 @@
gst_nice_src_dispose (GObject *object)
g_queue_free
_full
(src->outbufs
, (GDestroyNotify) gst_buffer_unref
);
}
src->outbufs = NULL;
+ g_cond_clear (&src->outcond);
...
...
@@ -249,5 +249,5 @@ index 5d3f554..2d9f674 100644
typedef struct _GstNiceSrcClass GstNiceSrcClass;
--
2.
3.4
2.
20.1
recipes/libnice/0001-stun-Also-rename-windows-specific-function.patch
deleted
100644 → 0
View file @
a5c4dbaf
From 9d24257a5ca00e6de0675d0c2dbd3d824f23ebf9 Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward@centricular.com>
Date: Wed, 21 Feb 2018 08:49:15 +0100
Subject: [PATCH] stun: Also rename windows-specific function
Like all other instances of nice_RAND_bytes that were renamed
to nice_RAND_nonce.
Fixes the windows build
---
stun/rand.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/stun/rand.c b/stun/rand.c
index 3ac6741..25dc402 100644
--- a/stun/rand.c
+++ b/stun/rand.c
@@ -45,7 +45,7 @@
#include <windows.h>
#include <wincrypt.h>
-void nice_RAND_bytes (uint8_t *dst, int len)
+void nice_RAND_nonce (uint8_t *dst, int len)
{
HCRYPTPROV hCryptProv;
LPCSTR container = "Libnice key container";
--
2.14.3
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment