jengelh/libosmo-abis
SHA256
1
0
Fork 0
forked from pool/libosmo-abis
Code Pull Requests Activity

- Update to new upstream snapshot 0.4.0.2

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-abis?expand=0&rev=29
This commit is contained in:
Jan Engelhardt 2017-10-02 22:58:32 +00:00 committed by Git OBS Bridge
parent 60b79c8e2a
commit b3e902c13c
7 changed files with 42 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
0001-build-resolve-compiler-warnings.patch
View File

@ -1,52 +0,0 @@
From 34ce619dc89fa82f55cc2ebba85e3435d04d2531 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
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 65ec269..f605af9 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.4.3

4
_service
View File

@ -2,8 +2,8 @@
<service name="tar_scm" mode="disabled"> <service name="tar_scm" mode="disabled">
<param name="scm">git</param> <param name="scm">git</param>
<param name="url">git://git.osmocom.org/libosmo-abis</param> <param name="url">git://git.osmocom.org/libosmo-abis</param>
<param name="parent-tag">v0.3.2</param> <param name="parent-tag">0.4.0</param>
<param name="versionformat">0.3.2.@TAG_OFFSET@</param> <param name="versionformat">0.4.0.@TAG_OFFSET@</param>
</service> </service>
<service name="recompress" mode="disabled"> <service name="recompress" mode="disabled">
<param name="file">*.tar</param> <param name="file">*.tar</param>

3
libosmo-abis-0.3.2.68.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5c2272ee9203ff99c5eb4aaed2ffab6660132bd39847c76aaa3cdcab90569518
size 67856

3
libosmo-abis-0.4.0.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:87f423638bf352ef6ccea118c2996b04220ea2ec347f605cf649492d3f541f66
size 68296

11
libosmo-abis.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Oct 2 22:48:02 UTC 2017 - jengelh@inai.de
- Update to new upstream snapshot 0.4.0.2
* osmo_ortp: Duration of a RTP frame affects timestamp of the
next one
* osmo_ortp: Add osmo_rtp_drop_frame API
* osmo_ortp: Fix warning: check ortp API in
rtp_session_signal_connect
- Drop 0001-build-resolve-compiler-warnings.patch (merged)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 28 20:58:28 UTC 2017 - jengelh@inai.de Fri Apr 28 20:58:28 UTC 2017 - jengelh@inai.de

36
libosmo-abis.spec
View File

@ -16,10 +16,10 @@
# #
%define version_unconverted 0.3.2.68 %define version_unconverted 0.4.0.2
Name: libosmo-abis Name: libosmo-abis
Version: 0.3.2.68 Version: 0.4.0.2
Release: 0 Release: 0
Summary: Osmocom library for A-bis interface between BTS and BSC Summary: Osmocom library for A-bis interface between BTS and BSC
License: AGPL-3.0+ and GPL-2.0+ License: AGPL-3.0+ and GPL-2.0+
@ -28,7 +28,6 @@ Url: https://osmocom.org/projects/libosmo-abis/wiki/Libosmo-abis
Source: %name-%version.tar.xz Source: %name-%version.tar.xz
Patch1: osmo-talloc.diff Patch1: osmo-talloc.diff
Patch2: 0001-build-resolve-compiler-warnings.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: automake >= 1.6 BuildRequires: automake >= 1.6
#BuildRequires: dahdi-linux-devel #BuildRequires: dahdi-linux-devel
@ -39,18 +38,19 @@ BuildRequires: pkgconfig(libosmocore) >= 0.3.0
BuildRequires: pkgconfig(libosmogsm) >= 0.3.10 BuildRequires: pkgconfig(libosmogsm) >= 0.3.10
BuildRequires: pkgconfig(libosmovty) >= 0.3.0 BuildRequires: pkgconfig(libosmovty) >= 0.3.0
BuildRequires: pkgconfig(ortp) >= 0.22 BuildRequires: pkgconfig(ortp) >= 0.22
BuildRequires: pkgconfig(talloc)
%description %description
In GSM, A-bis is a BSS-internal interface link between the BTS and In GSM, A-bis is a BSS-internal interface link between the BTS and
BSC. This interface allows control of the radio equipment and radio BSC. This interface allows control of the radio equipment and radio
frequency allocation in the BTS. frequency allocation in the BTS.
%package -n libosmoabis5 %package -n libosmoabis6
Summary: Osmocom GSM A-bis interface library Summary: Osmocom GSM A-bis interface library
License: AGPL-3.0+ License: AGPL-3.0+
Group: System/Libraries Group: System/Libraries
%description -n libosmoabis5 %description -n libosmoabis6
In the GSM system architecture, A-bis is a Base Station In the GSM system architecture, A-bis is a Base Station
System-internal interface linking the Base Transceiver Stations (BTS) System-internal interface linking the Base Transceiver Stations (BTS)
and Base Station Controller (BSC). This interface allows control of and Base Station Controller (BSC). This interface allows control of
@ -64,7 +64,7 @@ cards, as well as some A-bis/IP dialects.
Summary: Development files for the Osmocom GSM A-bis library Summary: Development files for the Osmocom GSM A-bis library
License: AGPL-3.0+ License: AGPL-3.0+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libosmoabis5 = %version Requires: libosmoabis6 = %version
Requires: libosmocore-devel >= 0.3.0 Requires: libosmocore-devel >= 0.3.0
Requires: libosmogsm-devel >= 0.3.10 Requires: libosmogsm-devel >= 0.3.10
@ -76,12 +76,12 @@ cards, as well as some A-bis/IP dialects.
This subpackage contains libraries and header files for developing This subpackage contains libraries and header files for developing
applications that want to make use of libosmoabis. applications that want to make use of libosmoabis.
%package -n libosmotrau1 %package -n libosmotrau2
Summary: Osmocom GSM TRAU (E1/RTP) library Summary: Osmocom GSM TRAU (E1/RTP) library
License: GPL-2.0+ License: GPL-2.0+
Group: System/Libraries Group: System/Libraries
%description -n libosmotrau1 %description -n libosmotrau2
This library implements the Transcoder and Rate Adaptation Unit (TRAU) for This library implements the Transcoder and Rate Adaptation Unit (TRAU) for
GSM systems. GSM systems.
The TRAU enables the use of lower rates (32, 16 or 8 kbps) over the The TRAU enables the use of lower rates (32, 16 or 8 kbps) over the
@ -92,7 +92,7 @@ Switching Center (MSC) is designed.
Summary: Development files for the Osmocom TRAU (E1/RTP) library Summary: Development files for the Osmocom TRAU (E1/RTP) library
License: GPL-2.0+ License: GPL-2.0+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libosmotrau1 = %version Requires: libosmotrau2 = %version
%description -n libosmotrau-devel %description -n libosmotrau-devel
This library implements the Transcoder and Rate Adaptation Unit This library implements the Transcoder and Rate Adaptation Unit
@ -103,7 +103,7 @@ applications that want to make use of libosmotrau.
%prep %prep
%setup -q %setup -q
%patch -P 1 -P 2 -p1 %patch -P 1 -p1
%build %build
echo "%version" >.tarball-version echo "%version" >.tarball-version
@ -119,14 +119,14 @@ find "$b/%_libdir" -type f -name "*.la" -delete
%check %check
make %{?_smp_mflags} check make %{?_smp_mflags} check
%post -n libosmoabis5 -p /sbin/ldconfig %post -n libosmoabis6 -p /sbin/ldconfig
%postun -n libosmoabis5 -p /sbin/ldconfig %postun -n libosmoabis6 -p /sbin/ldconfig
%post -n libosmotrau1 -p /sbin/ldconfig %post -n libosmotrau2 -p /sbin/ldconfig
%postun -n libosmotrau1 -p /sbin/ldconfig %postun -n libosmotrau2 -p /sbin/ldconfig
%files -n libosmoabis5 %files -n libosmoabis6
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/libosmoabis.so.5* %_libdir/libosmoabis.so.6*
%files -n libosmoabis-devel %files -n libosmoabis-devel
%defattr(-,root,root) %defattr(-,root,root)
@ -137,9 +137,9 @@ make %{?_smp_mflags} check
%_libdir/libosmoabis.so %_libdir/libosmoabis.so
%_libdir/pkgconfig/libosmoabis.pc %_libdir/pkgconfig/libosmoabis.pc
%files -n libosmotrau1 %files -n libosmotrau2
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/libosmotrau.so.1* %_libdir/libosmotrau.so.2*
%files -n libosmotrau-devel %files -n libosmotrau-devel
%defattr(-,root,root) %defattr(-,root,root)

16
osmo-talloc.diff
View File

@ -9,11 +9,11 @@ The source files use talloc, so link to talloc.
src/Makefile.am | 2 +- src/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-) 2 files changed, 2 insertions(+), 1 deletion(-)
Index: libosmo-abis-0.3.2.24/configure.ac Index: libosmo-abis-0.4.0.2/configure.ac
=================================================================== ===================================================================
--- libosmo-abis-0.3.2.24.orig/configure.ac --- libosmo-abis-0.4.0.2.orig/configure.ac
+++ libosmo-abis-0.3.2.24/configure.ac +++ libosmo-abis-0.4.0.2/configure.ac
@@ -30,6 +30,7 @@ AC_SUBST(SYMBOL_VISIBILITY) @@ -47,6 +47,7 @@ AC_SUBST(SYMBOL_VISIBILITY)
dnl Generate the output dnl Generate the output
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
@ -21,11 +21,11 @@ Index: libosmo-abis-0.3.2.24/configure.ac
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0) PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0)
PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0)
PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.10) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.10)
Index: libosmo-abis-0.3.2.24/src/Makefile.am Index: libosmo-abis-0.4.0.2/src/Makefile.am
=================================================================== ===================================================================
--- libosmo-abis-0.3.2.24.orig/src/Makefile.am --- libosmo-abis-0.4.0.2.orig/src/Makefile.am
+++ libosmo-abis-0.3.2.24/src/Makefile.am +++ libosmo-abis-0.4.0.2/src/Makefile.am
@@ -6,7 +6,7 @@ TRAU_LIBVERSION=1:0:0 @@ -7,7 +7,7 @@ TRAU_LIBVERSION=2:0:0
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
AM_LDFLAGS = $(COVERAGE_LDFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS)