From 554edd4e12901c7dc91d9601d7d9a673515b26c6 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Feb 09 2018 22:28:16 +0000 Subject: make tests/test-pseudotcp.c compile on i686 --- diff --git a/libnice-0.1.14-tests-i686.patch b/libnice-0.1.14-tests-i686.patch new file mode 100644 index 0000000..6558549 --- /dev/null +++ b/libnice-0.1.14-tests-i686.patch @@ -0,0 +1,48 @@ +From 3f8364b41207d8c26d3d3be518a7d9ebf4243b92 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +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 + diff --git a/libnice.spec b/libnice.spec index 17156df..b8c13cf 100644 --- a/libnice.spec +++ b/libnice.spec @@ -12,6 +12,9 @@ URL: https://nice.freedesktop.org/wiki/ Source0: https://nice.freedesktop.org/releases/%{name}-%{version}.tar.gz Patch1: libnice-0.1.14-70-gfb2f1f7.patch +# make tests compile on i686 +Patch2: libnice-0.1.14-tests-i686.patch + BuildRequires: autoconf BuildRequires: automake BuildRequires: glib2-devel @@ -70,6 +73,7 @@ developing applications that use %{name}. %prep %setup -q %patch1 -p1 +%patch2 -p1 autoreconf -fiv %check @@ -139,6 +143,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog * Fri Feb 09 2018 Kamil Dudka - 0.1.14-4.20171128gitfb2f1f7 +- make tests compile on i686 - make the package build on armv7hl - make the package build on Fedora 28 - avoid build failure if gstreamer-plugins-base-devel is installed