Update to 0.1.19
(cherry picked from commit 19bd671808459cebd7f0b4d2d3272af90026f74f)
This commit is contained in:
starlet-dx
openeuler-sync-bot
parent
008262db53
commit
e8c0ad2962
File diff suppressed because it is too large
Load Diff
@ -1,48 +0,0 @@
|
||||
From 3f8364b41207d8c26d3d3be518a7d9ebf4243b92 Mon Sep 17 00:00:00 2001
|
||||
From: Kamil Dudka <kdudka@redhat.com>
|
||||
Date: Fri, 9 Feb 2018 18:01:57 +0100
|
||||
Subject: [PATCH] tests: make them compile on i686
|
||||
|
||||
---
|
||||
tests/test-pseudotcp-fuzzy.c | 4 ++--
|
||||
tests/test-pseudotcp.c | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/tests/test-pseudotcp-fuzzy.c b/tests/test-pseudotcp-fuzzy.c
|
||||
index 4a714e6..030c03f 100644
|
||||
--- a/tests/test-pseudotcp-fuzzy.c
|
||||
+++ b/tests/test-pseudotcp-fuzzy.c
|
||||
@@ -129,7 +129,7 @@ write_to_sock (PseudoTcpSocket *sock)
|
||||
total += wlen;
|
||||
total_read += wlen;
|
||||
if (wlen < (gint) len) {
|
||||
- g_debug ("seeking %ld from %lu", wlen - len, ftell (in));
|
||||
+ g_debug ("seeking %ld from %lu", (long) wlen - len, ftell (in));
|
||||
fseek (in, wlen - len, SEEK_CUR);
|
||||
g_assert (!feof (in));
|
||||
g_debug ("Socket queue full after %d bytes written", total);
|
||||
@@ -355,7 +355,7 @@ static void adjust_clock (PseudoTcpSocket *sock)
|
||||
|
||||
if (pseudo_tcp_socket_get_next_clock (sock, &timeout)) {
|
||||
timeout -= g_get_monotonic_time () / 1000;
|
||||
- g_debug ("Socket %p: Adjusting clock to %ld ms", sock, timeout);
|
||||
+ g_debug ("Socket %p: Adjusting clock to %ld ms", sock, (long) timeout);
|
||||
if (sock == left) {
|
||||
if (left_clock != 0)
|
||||
g_source_remove (left_clock);
|
||||
diff --git a/tests/test-pseudotcp.c b/tests/test-pseudotcp.c
|
||||
index 1a8391a..584a0d0 100644
|
||||
--- a/tests/test-pseudotcp.c
|
||||
+++ b/tests/test-pseudotcp.c
|
||||
@@ -81,7 +81,7 @@ static void write_to_sock (PseudoTcpSocket *sock)
|
||||
total += wlen;
|
||||
total_read += wlen;
|
||||
if (wlen < (gint) len) {
|
||||
- g_debug ("seeking %ld from %lu", wlen - len, ftell (in));
|
||||
+ g_debug ("seeking %ld from %lu", (long) wlen - len, ftell (in));
|
||||
fseek (in, wlen - len, SEEK_CUR);
|
||||
g_assert (!feof (in));
|
||||
g_debug ("Socket queue full after %d bytes written", total);
|
||||
--
|
||||
2.13.6
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From 527c30ba453753e75d3d31be29a277ea6adc17c0 Mon Sep 17 00:00:00 2001
|
||||
From: Kamil Dudka <kdudka@redhat.com>
|
||||
Date: Fri, 9 Feb 2018 19:10:20 +0100
|
||||
Subject: [PATCH] tests: make the test-suite more verbose
|
||||
|
||||
... and skip test-gstreamer if user's home is not /builddir (a heuristic
|
||||
to detect mock) because multicast traffic is blocked on Koji buildhosts.
|
||||
---
|
||||
configure.ac | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 16988ad..b7b74fa 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -12,7 +12,7 @@ AC_CANONICAL_TARGET
|
||||
|
||||
AC_CONFIG_SRCDIR([agent/agent.c])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
-AM_INIT_AUTOMAKE([1.12 -Wall -Wno-portability subdir-objects])
|
||||
+AM_INIT_AUTOMAKE([1.12 -Wall -Wno-portability subdir-objects serial-tests])
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
@@ -263,7 +263,7 @@ AC_SUBST(gstplugindir)
|
||||
AC_SUBST(gstplugin010dir)
|
||||
|
||||
AM_CONDITIONAL(WITH_GSTREAMER, test "$with_gstreamer" = yes)
|
||||
-AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes)
|
||||
+AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes -a "$HOME" != /builddir)
|
||||
AM_CONDITIONAL(WITH_GSTREAMER010, test "$with_gstreamer010" = yes)
|
||||
|
||||
GUPNP_IGD_REQUIRED=0.2.4
|
||||
--
|
||||
2.13.6
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
From e4d92bf96d0bb64df35790e5b49c58bfa6e9fbcc Mon Sep 17 00:00:00 2001
|
||||
From: Jakub Adam <jakub.adam@ktknet.cz>
|
||||
Date: Thu, 20 Apr 2017 06:47:00 +0200
|
||||
Subject: [PATCH] component: accept TURN in
|
||||
nice_component_verify_remote_candidate()
|
||||
|
||||
When TURN is in operation, agent_recv_message_unlocked() may receive from
|
||||
NiceSocket with type = NICE_SOCKET_TYPE_UDP_TURN. Such messages were always
|
||||
dropped due to failed nice_component_verify_remote_candidate().
|
||||
|
||||
Bug: https://phabricator.freedesktop.org/D1727
|
||||
---
|
||||
agent/component.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/agent/component.c b/agent/component.c
|
||||
index 6eee90e..3e8a7a6 100644
|
||||
--- a/agent/component.c
|
||||
+++ b/agent/component.c
|
||||
@@ -1510,7 +1510,8 @@ nice_component_verify_remote_candidate (NiceComponent *component,
|
||||
(cand->transport == NICE_CANDIDATE_TRANSPORT_TCP_ACTIVE ||
|
||||
cand->transport == NICE_CANDIDATE_TRANSPORT_TCP_PASSIVE ||
|
||||
cand->transport == NICE_CANDIDATE_TRANSPORT_TCP_SO)) ||
|
||||
- cand->transport == NICE_CANDIDATE_TRANSPORT_UDP) &&
|
||||
+ cand->transport == NICE_CANDIDATE_TRANSPORT_UDP ||
|
||||
+ nicesock->type == NICE_SOCKET_TYPE_UDP_TURN) &&
|
||||
nice_address_equal (address, &cand->addr)) {
|
||||
/* fast return if it's already the first */
|
||||
if (item == component->valid_candidates)
|
||||
--
|
||||
2.14.3
|
||||
|
||||
Binary file not shown.
BIN
libnice-0.1.19.tar.gz
Normal file
BIN
libnice-0.1.19.tar.gz
Normal file
Binary file not shown.
28
libnice.spec
28
libnice.spec
@ -1,19 +1,15 @@
|
||||
Name: libnice
|
||||
Version: 0.1.14
|
||||
Release: 12
|
||||
Version: 0.1.19
|
||||
Release: 1
|
||||
Summary: An implementation of ICE standard
|
||||
License: LGPLv2 and MPLv1.1
|
||||
URL: https://nice.freedesktop.org/wiki/
|
||||
Source0: https://nice.freedesktop.org/releases/%{name}-%{version}.tar.gz
|
||||
Patch0001: libnice-0.1.14-85-g34d6044.patch
|
||||
Patch0002: libnice-0.1.14-tests-i686.patch
|
||||
Patch0003: libnice-0.1.14-tests-koji.patch
|
||||
Patch0004: libnice-0.1.14-turn-verify.patch
|
||||
|
||||
BuildRequires: autoconf automake glib2-devel gnutls-devel >= 2.12.0
|
||||
BuildRequires: gobject-introspection-devel gstreamer1-devel >= 0.11.91
|
||||
BuildRequires: gstreamer1-plugins-base-devel >= 0.11.91
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: gtk-doc gupnp-igd-devel >= 0.1.2 graphviz meson
|
||||
|
||||
%description
|
||||
Libnice is an implementation of the IETF's Interactive Connectivity
|
||||
@ -40,23 +36,18 @@ This package provides Libraries and header files for libnice.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
chmod 0755 scripts/valgrind-test-driver
|
||||
sed -e 's/test-new-dribble/#&/' -e 's/test-send-recv/#&/' -i tests/Makefile.am
|
||||
autoreconf -fiv
|
||||
sed -e "s/^ 'test-set-port-range'/#&/" -i tests/meson.build
|
||||
|
||||
%build
|
||||
%configure --enable-compile-warnings=yes --disable-static --without-gstreamer-0.10
|
||||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
%make_build V=1
|
||||
%meson -D gtk_doc=enabled
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
%meson_install
|
||||
%delete_la
|
||||
|
||||
%check
|
||||
export LD_LIBRARY_PATH="$PWD/nice/.libs"
|
||||
make check
|
||||
%meson_test
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
@ -76,6 +67,9 @@ make check
|
||||
%{_datadir}/{gtk-doc/html/libnice/,gir-1.0/Nice-0.1.gir}
|
||||
|
||||
%changelog
|
||||
* Thu Aug 04 2022 yaoxin <yaoxin30@h-partners.com> - 0.1.19-1
|
||||
- Update to 0.1.19
|
||||
|
||||
* Tue Mar 29 2022 wangkai <wangkai385@h-partners.com> - 0.1.14-12
|
||||
- Do check on X86 and ARM64
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user