diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2015-01-29 13:38:42 +0530 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2015-01-29 09:27:05 +0100 |
commit | 193fa899920b7075ace5584d446bd9b64cbcc6a8 (patch) | |
tree | 5ae9172414e640116c3540d990dd5714cc317322 /recipes/libnice | |
parent | a0d48a044a778eb697461d9d051a2f3ca60c57cf (diff) |
libnice,-static.recipe: Update to 0.1.10
Diffstat (limited to 'recipes/libnice')
-rw-r--r-- | recipes/libnice/libnice-add-static-plugins-support.patch | 38 | ||||
-rw-r--r-- | recipes/libnice/libnice-fix-rand-bytes-redefinition.patch | 63 |
2 files changed, 0 insertions, 101 deletions
diff --git a/recipes/libnice/libnice-add-static-plugins-support.patch b/recipes/libnice/libnice-add-static-plugins-support.patch deleted file mode 100644 index 5d0f54fb..00000000 --- a/recipes/libnice/libnice-add-static-plugins-support.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e8ee43bd369ea451604f7b8be89918d489a0185b Mon Sep 17 00:00:00 2001 -From: Nicolas Dufresne <nicolas.dufresne@collabora.com> -Date: Thu, 30 Oct 2014 21:09:41 +0000 -Subject: Add ability to build static GST plugins - -Note that this only works for 1.0 plugin. ---- -diff --git a/configure.ac b/configure.ac -index 5021a1f..744d407 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -286,6 +286,24 @@ AS_IF([test "${enable_coverage}" != "no"], [ - ]) - AC_SUBST(CCACHE_DISABLE) - -+dnl build static plugins or not -+AC_MSG_CHECKING([whether to build static plugins or not]) -+AC_ARG_ENABLE( -+ static-plugins, -+ AC_HELP_STRING( -+ [--enable-static-plugins], -+ [build static plugins @<:@default=no@:>@]), -+ [AS_CASE( -+ [$enableval], [no], [], [yes], [], -+ [AC_MSG_ERROR([bad value "$enableval" for --enable-static-plugins])])], -+ [enable_static_plugins=no]) -+AC_MSG_RESULT([$enable_static_plugins]) -+if test "x$enable_static_plugins" = xyes; then -+ AC_DEFINE(GST_PLUGIN_BUILD_STATIC, 1, -+ [Define if static plugins should be built]) -+fi -+AM_CONDITIONAL(GST_PLUGIN_BUILD_STATIC, test "x$enable_static_plugins" = "xyes") -+ - case $host_os in - solaris*) - LDFLAGS="$LDFLAGS -lsocket -lnls" --- -cgit v0.9.0.3 diff --git a/recipes/libnice/libnice-fix-rand-bytes-redefinition.patch b/recipes/libnice/libnice-fix-rand-bytes-redefinition.patch deleted file mode 100644 index 7f37438c..00000000 --- a/recipes/libnice/libnice-fix-rand-bytes-redefinition.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 3bc28d43a5189e561087f9340467ef2bd314c7fb Mon Sep 17 00:00:00 2001 -From: Curieux Tres <trescurieux@yahoo.fr> -Date: Mon, 27 Oct 2014 11:32:17 +0000 -Subject: stun: Rename a symbol to avoid a naming clash with OpenSSL -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The symbol is not exported, but nevertheless leaks in the static version -of libnice, due to limitations on symbol visibilities with static -libraries. OpenSSL has a symbol named RAND_bytes(), which ours clashes -with if the two are linked together statically. - -Avoid this by prefixing ours with ‘nice_’. - -diff --git a/stun/rand.c b/stun/rand.c -index 0de7f6e..fd08283 100644 ---- a/stun/rand.c -+++ b/stun/rand.c -@@ -45,7 +45,7 @@ - #include <windows.h> - #include <wincrypt.h> - --void RAND_bytes (uint8_t *dst, int len) -+void nice_RAND_bytes (uint8_t *dst, int len) - { - HCRYPTPROV hCryptProv; - LPCSTR container = "Libnice key container"; -@@ -215,7 +215,7 @@ static unsigned long genrand_int32(void) - - static int initialized = 0; - --void RAND_bytes (uint8_t *dst, int len) -+void nice_RAND_bytes (uint8_t *dst, int len) - { - int i; - -diff --git a/stun/rand.h b/stun/rand.h -index 07c5fb5..0ed0263 100644 ---- a/stun/rand.h -+++ b/stun/rand.h -@@ -45,6 +45,6 @@ - #include <stdint.h> - #endif - --void RAND_bytes (uint8_t *dst, int len); -+void nice_RAND_bytes (uint8_t *dst, int len); - - #endif /* RAND_H */ -diff --git a/stun/stunhmac.c b/stun/stunhmac.c -index db6fb16..df5deb6 100644 ---- a/stun/stunhmac.c -+++ b/stun/stunhmac.c -@@ -122,5 +122,5 @@ void stun_hash_creds (const uint8_t *realm, size_t realm_len, - - void stun_make_transid (StunTransactionId id) - { -- RAND_bytes (id, 16); -+ nice_RAND_bytes (id, 16); - } --- -cgit v0.10.2 - |