From a1d3adebf2a96bd58cef21d4da45f53f9160d534787593769591eebd0ea3cd8f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 2 Apr 2015 12:29:37 +0000 Subject: [PATCH] - Add 0001-build-resolve-compiler-warnings.patch OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-abis?expand=0&rev=10 --- 0001-build-resolve-compiler-warnings.patch | 52 ++++++++++++++++++++++ libosmo-abis.changes | 5 +++ libosmo-abis.spec | 5 ++- 3 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 0001-build-resolve-compiler-warnings.patch diff --git a/0001-build-resolve-compiler-warnings.patch b/0001-build-resolve-compiler-warnings.patch new file mode 100644 index 0000000..a39154a --- /dev/null +++ b/0001-build-resolve-compiler-warnings.patch @@ -0,0 +1,52 @@ +From 025e2dd7129483300efe8dd02f8e1198c92aaad5 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Thu, 2 Apr 2015 14:25:43 +0200 +Subject: [PATCH] build: resolve compiler warnings + +gcc: +trau/osmo_ortp.c: In function 'osmo_rtp_socket_create': +trau/osmo_ortp.c:329:8: warning: passing argument 4 of +"rtp_session_signal_connect" makes pointer from integer without +a cast [enabled by default] + (unsigned long) rs); +In file included from /usr/include/ortp/ortp.h:68:0, + from trau/osmo_ortp.c:35: +/usr/include/ortp/rtpsession.h:417:17: note: expected "void *" +but argument is of type "long unsigned int" + ORTP_PUBLIC int rtp_session_signal_connect(RtpSession *session, + const char *signal_name, RtpCallback cb, void *user_data); + +rpmlint: +E: libosmo-abis 64bit-portability-issue trau/osmo_ortp.c:329, 332, 335, 338 +--- + src/trau/osmo_ortp.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c +index fedc977..55fce87 100644 +--- a/src/trau/osmo_ortp.c ++++ b/src/trau/osmo_ortp.c +@@ -326,16 +326,16 @@ struct osmo_rtp_socket *osmo_rtp_socket_create(void *talloc_ctx, unsigned int fl + + rtp_session_signal_connect(rs->sess, "ssrc_changed", + (RtpCallback) ortp_sig_cb_ssrc, +- (unsigned long) rs); ++ rs); + rtp_session_signal_connect(rs->sess, "payload_type_changed", + (RtpCallback) ortp_sig_cb_pt, +- (unsigned long) rs); ++ rs); + rtp_session_signal_connect(rs->sess, "network_error", + (RtpCallback) ortp_sig_cb_net, +- (unsigned long) rs); ++ rs); + rtp_session_signal_connect(rs->sess, "timestamp_jump", + (RtpCallback) ortp_sig_cb_ts, +- (unsigned long) rs); ++ rs); + + /* initialize according to the RFC */ + rtp_session_set_seq_number(rs->sess, random()); +-- +2.1.4 + diff --git a/libosmo-abis.changes b/libosmo-abis.changes index 1f59f24..333f992 100644 --- a/libosmo-abis.changes +++ b/libosmo-abis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 2 12:29:23 UTC 2015 - jengelh@inai.de + +- Add 0001-build-resolve-compiler-warnings.patch + ------------------------------------------------------------------- Sun Mar 1 01:15:24 UTC 2015 - jengelh@inai.de diff --git a/libosmo-abis.spec b/libosmo-abis.spec index 24f52f9..fdaa087 100644 --- a/libosmo-abis.spec +++ b/libosmo-abis.spec @@ -1,7 +1,7 @@ # # spec file for package libosmo-abis # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,7 @@ Url: http://openbsc.osmocom.org/trac/wiki/libosmo-abis #Snapshot: 0.3.1 Source: %name-%version.tar.xz Patch1: osmo-talloc.diff +Patch2: 0001-build-resolve-compiler-warnings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake >= 1.6 @@ -98,7 +99,7 @@ applications that want to make use of libosmotrau. %prep %setup -qn %name -%patch -P 1 -p1 +%patch -P 1 -P 2 -p1 %build echo "%version" >.tarball-version