diff --git a/_service b/_service new file mode 100644 index 0000000..b6c1e5a --- /dev/null +++ b/_service @@ -0,0 +1,13 @@ + + + git + git://git.osmocom.org/libosmo-abis + v0.3.2 + 0.3.2.@TAG_OFFSET@ + + + *.tar + xz + + + diff --git a/libosmo-abis-0.3.2.24.tar.xz b/libosmo-abis-0.3.2.24.tar.xz new file mode 100644 index 0000000..502863c --- /dev/null +++ b/libosmo-abis-0.3.2.24.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:578321ce1402835e3c50c65c60cd20edc762cfbe14203fe86426f0d25766fcec +size 62292 diff --git a/libosmo-abis-0.3.2.3.tar.xz b/libosmo-abis-0.3.2.3.tar.xz deleted file mode 100644 index 51b7fa2..0000000 --- a/libosmo-abis-0.3.2.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2a68b40935e1496f26c51f25850ec662a3b69833facda16b00b058e57bab841 -size 63024 diff --git a/libosmo-abis.changes b/libosmo-abis.changes index 1f61d6a..716c0b5 100644 --- a/libosmo-abis.changes +++ b/libosmo-abis.changes @@ -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 diff --git a/libosmo-abis.spec b/libosmo-abis.spec index d58e35d..cae29c8 100644 --- a/libosmo-abis.spec +++ b/libosmo-abis.spec @@ -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 diff --git a/ortp27.diff b/ortp27.diff new file mode 100644 index 0000000..a924979 --- /dev/null +++ b/ortp27.diff @@ -0,0 +1,31 @@ +From: Jan Engelhardt +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(); + } diff --git a/osmo-talloc.diff b/osmo-talloc.diff index 3a564a8..92f9fe1 100644 --- a/osmo-talloc.diff +++ b/osmo-talloc.diff @@ -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)