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

Accepting request 530612 from network:telephony

Browse Source 
- Update to new upstream snapshot 0.4.0.2

OBS-URL: https://build.opensuse.org/request/show/530612
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libosmo-abis?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2017-10-09 17:41:25 +00:00 committed by Git OBS Bridge
commit 62c74a50d6
8 changed files with 85 additions and 138 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

10
_service
View File

@ -1,13 +1,13 @@
<services> <services>
<service name="tar_scm" mode="localonly"> <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="localonly"> <service name="recompress" mode="disabled">
<param name="file">*.tar</param> <param name="file">*.tar</param>
<param name="compression">xz</param> <param name="compression">xz</param>
</service> </service>
<service name="set_version" mode="localonly"/> <service name="set_version" mode="disabled"/>
</services> </services>

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

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:578321ce1402835e3c50c65c60cd20edc762cfbe14203fe86426f0d25766fcec
size 62292

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

26
libosmo-abis.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
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
- Update to new upstream snapshot 0.3.2.68
* Really fix order of set_connected_mode and set_remote_addr
* Resync RTP session in case of timestamp jump
* e1_input: Add E1 timeslot number to input_signal_data
* Convert e1inp_{sign,ts}type_name() to use struct value_string
* Implement new 'raw' input type for E1 timeslots
* Add HDLC timeslot mode
* lapd: adding support for ericsson's lapd dialect
* Enable adaptive jitter compensation
* lapd: Reduce N200 (SABM retransmission count)
- Drop ortp27.diff (no longer needed)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Oct 1 12:30:41 UTC 2016 - jengelh@inai.de Sat Oct 1 12:30:41 UTC 2016 - jengelh@inai.de

82
libosmo-abis.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libosmo-abis # spec file for package libosmo-abis
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,93 +16,94 @@
# #
%define version_unconverted 0.3.2.24 %define version_unconverted 0.4.0.2
Name: libosmo-abis Name: libosmo-abis
Version: 0.3.2.24 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+
Group: Productivity/Telephony/Utilities Group: Productivity/Telephony/Utilities
Url: http://openbsc.osmocom.org/trac/wiki/libosmo-abis Url: https://osmocom.org/projects/libosmo-abis/wiki/Libosmo-abis
#Git-Clone: git://git.osmocom.org/libosmo-abis
#Snapshot: 0.3.2-1-g86fc3c8
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
Patch3: ortp27.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake >= 1.6 BuildRequires: automake >= 1.6
#BuildRequires: dahdi-linux-devel #BuildRequires: dahdi-linux-devel
BuildRequires: libtool BuildRequires: libtool >= 2
BuildRequires: pkgconfig BuildRequires: pkgconfig >= 0.20
BuildRequires: xz BuildRequires: xz
BuildRequires: pkgconfig(libosmocore) >= 0.3.0 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 A-bis interface core 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
the radio equipment and radio frequency allocation in the BTS. the radio equipment and radio frequency allocation in the BTS.
This library contains common/shared code regarding this A-bis
interface. It also implements drivers for mISDN and DAHDI-based E1
cards, as well as some A-bis/IP dialects.
%package -n libosmoabis-devel %package -n libosmoabis-devel
Summary: Development files for the Osmocom A-bis core 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
%description -n libosmoabis-devel %description -n libosmoabis-devel
In GSM, A-bis is a BSS-internal interface link between the BTS and This library contains common/shared code regarding the GSM A-bis
BSC. This interface allows control of the radio equipment and radio interface. It also implements drivers for mISDN and DAHDI-based E1
frequency allocation in the BTS. 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 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
The Transcoder Rate Adaptor Unit enables the use of lower rates (32, This library implements the Transcoder and Rate Adaptation Unit (TRAU) for
16 or 8 kbps) over the A-bis interface instead of the 64 kbps ISDN GSM systems.
rate for which the Mobile Switching Center (MSC) is designed. The TRAU enables the use of lower rates (32, 16 or 8 kbps) over the
A-bis interface instead of the 64 kbps ISDN rate for which the Mobile
Switching Center (MSC) is designed.
%package -n libosmotrau-devel %package -n libosmotrau-devel
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
The Transcoder Rate Adaptor Unit enables the use of lower bitrates This library implements the Transcoder and Rate Adaptation Unit
over the A-bis interface instead of the 64 kbps design rate of the (TRAU) for GSM systems.
MSC.
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 libosmotrau. applications that want to make use of libosmotrau.
%prep %prep
%setup -q %setup -q
%patch -P 1 -P 2 -P 3 -p1 %patch -P 1 -p1
%build %build
echo "%version" >.tarball-version echo "%version" >.tarball-version
@ -116,16 +117,19 @@ make %{?_smp_mflags} install DESTDIR="$b"
find "$b/%_libdir" -type f -name "*.la" -delete find "$b/%_libdir" -type f -name "*.la" -delete
%check %check
make %{?_smp_mflags} check make %{?_smp_mflags} check \
%ifnarch %ix86 x86_64
|| :
%endif
%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)
@ -136,9 +140,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)

31
ortp27.diff
View File

@ -1,31 +0,0 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2016-10-01 14:30:22.066588957 +0200
build: make libosmo-abis build with ortp-0.27
---
src/trau/osmo_ortp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: libosmo-abis-0.3.2.24/src/trau/osmo_ortp.c
===================================================================
--- libosmo-abis-0.3.2.24.orig/src/trau/osmo_ortp.c
+++ libosmo-abis-0.3.2.24/src/trau/osmo_ortp.c
@@ -94,7 +94,7 @@ static int ortp_to_osmo_lvl(OrtpLogLevel
return LOGL_ERROR;
}
-static void my_ortp_logfn(OrtpLogLevel lev, const char *fmt,
+static void my_ortp_logfn(const char *domain, OrtpLogLevel lev, const char *fmt,
va_list args)
{
osmo_vlogp(DLMIB, ortp_to_osmo_lvl(lev), __FILE__, 0,
@@ -271,7 +271,7 @@ void osmo_rtp_init(void *ctx)
tall_rtp_ctx = ctx;
ortp_set_memory_functions(&osmo_ortp_memfn);
ortp_init();
- ortp_set_log_level_mask(0xffff);
+ ortp_set_log_level_mask(ORTP_LOG_DOMAIN, 0xffff);
ortp_set_log_handler(my_ortp_logfn);
create_payload_types();
}

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)