[libnice] Update version to 0.1.22 (#41209)

This commit is contained in:
Frank 2024-10-02 14:09:01 +00:00 committed by GitHub
parent 5d4801387f
commit 550ecc8fd9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 36 additions and 42 deletions

View File

@ -2,11 +2,11 @@ vcpkg_from_gitlab(
GITLAB_URL https://gitlab.freedesktop.org GITLAB_URL https://gitlab.freedesktop.org
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO libnice/libnice REPO libnice/libnice
REF 0.1.21 REF 0.1.22
SHA512 8808523d663da5974e81ffeef10812b758792b1f762edc1f3713d09962598a8a30d17ac1985438361d2a284b9bc82b5ba1e8d73c6e1ca86c93901bc06b634e9a SHA512 545c759a827e039d0aed262a4ec31b17610f7e67d93389c939763ed3d99530a4a6c3d13864ff05a2011fb3c3847ce3380a988e554de0f92b1348ebb76f5e3da4
HEAD_REF master HEAD_REF master
PATCHES PATCHES
skip_libnice.patch skip_libnice.patch
) )
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

View File

@ -1,34 +1,20 @@
diff --git a/gst/meson.build b/gst/meson.build
index 572c6ab..325a3d5 100644
--- a/gst/meson.build
+++ b/gst/meson.build
@@ -13,12 +13,12 @@ libgstnice = library('gstnice',
c_args : gst_nice_args,
include_directories: nice_incs,
dependencies: [nice_deps, gst_dep],
- link_with: libnice,
install_dir: gst_plugins_install_dir,
install: true)
plugins = [libgstnice]
# Generate pc files for static plugins if we build static plugins
if get_option('default_library') != 'shared'
+ pkg = import('pkgconfig')
pkg.generate(libgstnice, install_dir: join_paths(gst_plugins_install_dir, 'pkgconfig'))
endif
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 60ca250..05fc8c7 100644 index badce49..5641673 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -90,6 +90,7 @@ version_conf.set('NICE_VERSION_MINOR', version_minor) @@ -283,7 +283,10 @@ libm = cc.find_library('m', required: false)
version_conf.set('NICE_VERSION_MICRO', version_micro)
version_conf.set('NICE_VERSION_NANO', version_nano)
nice_version_h = configure_file(output: 'nice-version.h',
+ install: false,
install_dir: get_option('includedir') / 'nice',
configuration: version_conf)
@@ -298,11 +299,7 @@ endif nice_incs = include_directories('.', 'agent', 'random', 'socket', 'stun')
-nice_deps = gio_deps + [gthread_dep, crypto_dep, gupnp_igd_dep] + syslibs
+# libnice dependency using pkg-config
+pkg = import('pkgconfig')
+libnice_dep = dependency('nice', version: '>=0.1.18', method: 'pkg-config', required: true)
+cdata.set('HAVE_LIBNICE', libnice_dep.found(), description: 'Use the libnice library')
ignored_iface_prefix = get_option('ignored-network-interface-prefix')
if ignored_iface_prefix != []
@@ -296,12 +299,6 @@ endif
gir = find_program('g-ir-scanner', required : get_option('introspection')) gir = find_program('g-ir-scanner', required : get_option('introspection'))
@ -37,7 +23,7 @@ index 60ca250..05fc8c7 100644
-subdir('socket') -subdir('socket')
-subdir('random') -subdir('random')
-subdir('nice') -subdir('nice')
+nice_deps += [dependency('nice', version: '= @0@'.format(meson.project_version()), required: true)] -
if gst_dep.found() if gst_dep.found()
subdir('gst') subdir('gst')
endif

View File

@ -1,7 +1,6 @@
{ {
"name": "libnice-gst", "name": "libnice-gst",
"version": "0.1.21", "version": "0.1.22",
"port-version": 4,
"description": "Gstreamer Libnice plugins.", "description": "Gstreamer Libnice plugins.",
"homepage": "https://nice.freedesktop.org", "homepage": "https://nice.freedesktop.org",
"license": "LGPL-2.1-only AND MPL-1.1", "license": "LGPL-2.1-only AND MPL-1.1",

View File

@ -2,8 +2,8 @@ vcpkg_from_gitlab(
GITLAB_URL https://gitlab.freedesktop.org GITLAB_URL https://gitlab.freedesktop.org
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO libnice/libnice REPO libnice/libnice
REF 0.1.21 REF 0.1.22
SHA512 8808523d663da5974e81ffeef10812b758792b1f762edc1f3713d09962598a8a30d17ac1985438361d2a284b9bc82b5ba1e8d73c6e1ca86c93901bc06b634e9a SHA512 545c759a827e039d0aed262a4ec31b17610f7e67d93389c939763ed3d99530a4a6c3d13864ff05a2011fb3c3847ce3380a988e554de0f92b1348ebb76f5e3da4
HEAD_REF master HEAD_REF master
) )

View File

@ -1,7 +1,6 @@
{ {
"name": "libnice", "name": "libnice",
"version": "0.1.21", "version": "0.1.22",
"port-version": 2,
"description": "Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389).", "description": "Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389).",
"homepage": "https://nice.freedesktop.org", "homepage": "https://nice.freedesktop.org",
"license": "LGPL-2.1-only AND MPL-1.1", "license": "LGPL-2.1-only AND MPL-1.1",

View File

@ -4817,12 +4817,12 @@
"port-version": 0 "port-version": 0
}, },
"libnice": { "libnice": {
"baseline": "0.1.21", "baseline": "0.1.22",
"port-version": 2 "port-version": 0
}, },
"libnice-gst": { "libnice-gst": {
"baseline": "0.1.21", "baseline": "0.1.22",
"port-version": 4 "port-version": 0
}, },
"libnick": { "libnick": {
"baseline": "2024.9.2", "baseline": "2024.9.2",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "040d334c5cb1a71a7ffb8059202fa84c86bce0f0",
"version": "0.1.22",
"port-version": 0
},
{ {
"git-tree": "3717f8377e0dbac46191136366973c45a623850f", "git-tree": "3717f8377e0dbac46191136366973c45a623850f",
"version": "0.1.21", "version": "0.1.21",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "3f073aeceab2d83e6e682795493eb97c042068f0",
"version": "0.1.22",
"port-version": 0
},
{ {
"git-tree": "e727ccac25d95c7a8e43a944407c80a1a071c581", "git-tree": "e727ccac25d95c7a8e43a944407c80a1a071c581",
"version": "0.1.21", "version": "0.1.21",