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

Accepting request 432152 from network:telephony

Browse Source 
- Update to new upstream snapshot 0.3.2.24
fix build with ortp 0.27

OBS-URL: https://build.opensuse.org/request/show/432152
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libosmo-abis?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2016-11-11 13:33:51 +00:00 committed by Git OBS Bridge
commit 7701e27f74
7 changed files with 81 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
_service Normal file
View File

@ -0,0 +1,13 @@
<services>
<service name="tar_scm" mode="localonly">
<param name="scm">git</param>
<param name="url">git://git.osmocom.org/libosmo-abis</param>
<param name="parent-tag">v0.3.2</param>
<param name="versionformat">0.3.2.@TAG_OFFSET@</param>
</service>
<service name="recompress" mode="localonly">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="localonly"/>
</services>

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

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

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

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

15
libosmo-abis.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Sat Oct 1 12:30:41 UTC 2016 - jengelh@inai.de
- Update to new upstream snapshot 0.3.2.24
* No visible changes
- Add ortp27.diff
-------------------------------------------------------------------
Sat Jul 30 17:54:58 UTC 2016 - jengelh@inai.de
- Update to new upstream snapshot 0.3.2.19
* ipa driver: make bind address vty configurable
* Do not send RTP to port 0
* Add defines for FN to SAMPLE conversion
-------------------------------------------------------------------
Fri Jan 22 19:08:57 UTC 2016 - jengelh@inai.de

11
libosmo-abis.spec
View File

@ -16,8 +16,10 @@
#
%define version_unconverted 0.3.2.24
Name: libosmo-abis
Version: 0.3.2.3
Version: 0.3.2.24
Release: 0
Summary: Osmocom library for A-bis interface between BTS and BSC
License: AGPL-3.0+ and GPL-2.0+
@ -29,6 +31,7 @@ Url: http://openbsc.osmocom.org/trac/wiki/libosmo-abis
Source: %name-%version.tar.xz
Patch1: osmo-talloc.diff
Patch2: 0001-build-resolve-compiler-warnings.patch
Patch3: ortp27.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake >= 1.6
@ -39,7 +42,7 @@ BuildRequires: xz
BuildRequires: pkgconfig(libosmocore) >= 0.3.0
BuildRequires: pkgconfig(libosmogsm) >= 0.3.10
BuildRequires: pkgconfig(libosmovty) >= 0.3.0
BuildRequires: pkgconfig(ortp) >= 0.13.1
BuildRequires: pkgconfig(ortp) >= 0.22
%description
In GSM, A-bis is a BSS-internal interface link between the BTS and
@ -98,8 +101,8 @@ This subpackage contains libraries and header files for developing
applications that want to make use of libosmotrau.
%prep
%setup -qn %name
%patch -P 1 -P 2 -p1
%setup -q
%patch -P 1 -P 2 -P 3 -p1
%build
echo "%version" >.tarball-version

31
ortp27.diff Normal file
View File

@ -0,0 +1,31 @@
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();
}

24
osmo-talloc.diff
View File

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