diff options
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/libnice.recipe | 9 | ||||
| -rw-r--r-- | recipes/libnice/0001-meson-We-don-t-need-gtkdoc-reduce-meson-req.patch | 24 | ||||
| -rw-r--r-- | recipes/libnice/0001-stund-Use-lowercase-winsock2.h.patch | 30 |
3 files changed, 59 insertions, 4 deletions
diff --git a/recipes/libnice.recipe b/recipes/libnice.recipe index bfd519ab..299c03a7 100644 --- a/recipes/libnice.recipe +++ b/recipes/libnice.recipe @@ -3,11 +3,11 @@ from cerbero.tools.libtool import LibtoolLibrary class Recipe(recipe.Recipe): name = 'libnice' - version = '0.1.15' + version = '0.1.17' stype = SourceType.TARBALL btype = BuildType.MESON url = 'https://nice.freedesktop.org/releases/%(name)s-%(version)s.tar.gz' - tarball_checksum = 'f7280f3f58f594409c719a03009aa819c599078b410796f408251277807587da' + tarball_checksum = '1952a0dec58b5c9ccc3f25193df4e2d1244cb382cac611b71e25afcd7b069526' # Either LGPL-2.1+ or MPL-1.1 licenses = [License.LGPLv2_1Plus, License.MPLv1_1] meson_options = {'tests' : 'disabled', @@ -16,8 +16,9 @@ class Recipe(recipe.Recipe): 'crypto-library' : 'gnutls'} deps = ['glib', 'gstreamer-1.0', 'gnutls'] patches = [ - "libnice/0001-nicesrc-spin-the-agent-mainloop-in-a-separate-thread.patch", - "libnice/0001-meson-install-.pc-file-for-static-gstreamer-plugin.patch", + # https://gitlab.freedesktop.org/libnice/libnice/-/merge_requests/150 + 'libnice/0001-stund-Use-lowercase-winsock2.h.patch', + 'libnice/0001-meson-We-don-t-need-gtkdoc-reduce-meson-req.patch', ] files_bins = ['stunbdc', 'stund'] diff --git a/recipes/libnice/0001-meson-We-don-t-need-gtkdoc-reduce-meson-req.patch b/recipes/libnice/0001-meson-We-don-t-need-gtkdoc-reduce-meson-req.patch new file mode 100644 index 00000000..00682d5f --- /dev/null +++ b/recipes/libnice/0001-meson-We-don-t-need-gtkdoc-reduce-meson-req.patch @@ -0,0 +1,24 @@ +From 164a4059ea4c7c11d600d3f2598b3eadf2710f46 Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan <nirbheek@centricular.com> +Date: Fri, 9 Oct 2020 02:00:21 +0530 +Subject: [PATCH] meson: We don't need gtkdoc, reduce meson req + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 0004d91..b3b9005 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,6 +1,6 @@ + project('libnice', 'c', + version: '0.1.17', +- meson_version : '>= 0.52', ++ meson_version : '>= 0.49', + default_options : ['warning_level=1', 'buildtype=debugoptimized']) + + nice_version = meson.project_version() +-- +2.26.2 + diff --git a/recipes/libnice/0001-stund-Use-lowercase-winsock2.h.patch b/recipes/libnice/0001-stund-Use-lowercase-winsock2.h.patch new file mode 100644 index 00000000..d9d3992e --- /dev/null +++ b/recipes/libnice/0001-stund-Use-lowercase-winsock2.h.patch @@ -0,0 +1,30 @@ +From ffb45c21af0c0f028a800cfe4c1b7235ee8febba Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan <nirbheek@centricular.com> +Date: Mon, 15 Jun 2020 19:54:21 +0530 +Subject: [PATCH] stund: Use lowercase winsock2.h + +Windows ships with `WinSock2.h` but mingw ships with `winsock2.h`. +This is fine on Windows because files are case-insensitive, but on +Linux it causes the compiler to not find the header. + +All other #includes are lowercase, so just use that. +--- + stun/tools/stund.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/stun/tools/stund.c b/stun/tools/stund.c +index ed74c87..5d0987a 100644 +--- a/stun/tools/stund.c ++++ b/stun/tools/stund.c +@@ -54,7 +54,7 @@ + #include <sys/types.h> + + #ifdef _WIN32 +-#include <WinSock2.h> ++#include <winsock2.h> + #else + #include <sys/socket.h> + #include <netdb.h> +-- +2.26.2 + |