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

libosmo-netif-0.0.6.8

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-netif?expand=0&rev=7
This commit is contained in:
Jan Engelhardt 2016-01-22 18:26:27 +00:00 committed by Git OBS Bridge
parent bf6a3803c1
commit 21c22d7f0b
5 changed files with 55 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libosmo-netif-0.0.6.5.tar.xz
View File

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

3
libosmo-netif-0.0.6.8.tar.xz Normal file
View File

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

7
libosmo-netif.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jan 22 18:17:18 UTC 2016 - jengelh@inai.de
- Update to new upstream snapshot 0.0.6.8
* don't link everything to libsctp
* ensure to zero-initialize sctp_sndrcvinfo
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 23 17:13:12 UTC 2015 - jengelh@inai.de Wed Dec 23 17:13:12 UTC 2015 - jengelh@inai.de

21
libosmo-netif.spec
View File

@ -18,7 +18,7 @@
Name: libosmo-netif Name: libosmo-netif
Summary: Osmocom library for muxed audio Summary: Osmocom library for muxed audio
Version: 0.0.6.5 Version: 0.0.6.8
Release: 0 Release: 0
License: AGPL-3.0+ and GPL-2.0+ License: AGPL-3.0+ and GPL-2.0+
Group: Productivity/Telephony/Utilities Group: Productivity/Telephony/Utilities
@ -26,9 +26,9 @@ Url: http://openbsc.osmocom.org/trac/
#Git-Clone: git://git.osmocom.org/libosmo-netif #Git-Clone: git://git.osmocom.org/libosmo-netif
#Git-Web: http://git.osmocom.org/libosmo-netif/ #Git-Web: http://git.osmocom.org/libosmo-netif/
#Snapshot: 0.0.6-5-gcc4ce39 #Snapshot: 0.0.6-8-g4d702db
Source: %name-%version.tar.xz Source: %name-%version.tar.xz
Patch4: osmo-talloc.diff Patch1: osmo-talloc.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -44,6 +44,7 @@ BuildRequires: pkgconfig(libosmovty) >= 0.3.0
BuildRequires: pkgconfig(ortp) >= 0.15.0 BuildRequires: pkgconfig(ortp) >= 0.15.0
%description %description
Network interface demuxer library for OsmoCom projects.
%package -n libosmonetif3 %package -n libosmonetif3
Summary: Osmocom library for muxed audio Summary: Osmocom library for muxed audio
@ -51,6 +52,7 @@ License: AGPL-3.0+
Group: System/Libraries Group: System/Libraries
%description -n libosmonetif3 %description -n libosmonetif3
Network interface demuxer library for OsmoCom projects.
%package -n libosmonetif-devel %package -n libosmonetif-devel
Summary: Development files for the Osmocom muxed audio library Summary: Development files for the Osmocom muxed audio library
@ -59,15 +61,19 @@ Group: Development/Libraries/C and C++
Requires: libosmonetif3 = %version Requires: libosmonetif3 = %version
%description -n libosmonetif-devel %description -n libosmonetif-devel
Network interface demuxer library for OsmoCom projects.
This subpackage contains libraries and header files for developing
applications that want to make use of libosmo-netif.
%prep %prep
%setup -qn %name %setup -qn %name
%patch -P 4 -p1 %patch -P 1 -p1
%build %build
echo "%version" >.tarball-version echo "%version" >.tarball-version
autoreconf -fiv autoreconf -fiv
%configure --enable-shared --disable-static %configure --enable-shared --disable-static --includedir="%_includedir/%name"
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
@ -87,8 +93,9 @@ make %{?_smp_mflags} check
%files -n libosmonetif-devel %files -n libosmonetif-devel
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING %doc COPYING
%dir %_includedir/osmocom %dir %_includedir/%name
%_includedir/osmocom/netif/ %dir %_includedir/%name/osmocom
%_includedir/%name/osmocom/netif/
%_libdir/libosmonetif.so %_libdir/libosmonetif.so
%_libdir/pkgconfig/libosmo-netif.pc %_libdir/pkgconfig/libosmo-netif.pc

65
osmo-talloc.diff
View File

@ -4,29 +4,29 @@ Date: Thu, 2 Oct 2014 23:26:16 +0200
Subject: [PATCH] build: support external libtalloc Subject: [PATCH] build: support external libtalloc
--- ---
configure.ac | 1 + configure.ac | 1 +
examples/Makefile.am | 26 +++++++++++++------------- examples/Makefile.am | 26 +++++++++++++-------------
examples/channel/Makefile.am | 6 +++--- examples/channel/Makefile.am | 6 +++---
src/Makefile.am | 4 ++-- src/Makefile.am | 4 ++--
src/channel/abis/Makefile.am | 4 ++-- src/channel/abis/Makefile.am | 4 ++--
5 files changed, 21 insertions(+), 20 deletions(-) 5 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/configure.ac b/configure.ac Index: libosmo-netif/configure.ac
index 42f3f42..185557e 100644 ===================================================================
--- a/configure.ac --- libosmo-netif.orig/configure.ac
+++ b/configure.ac +++ libosmo-netif/configure.ac
@@ -47,6 +47,7 @@ AC_CHECK_LIB([sctp], [sctp_send], [ @@ -52,6 +52,7 @@ AC_SEARCH_LIBS([sctp_send], [sctp], [
], [ AC_MSG_ERROR([sctp_send not found in searched libs])])
AC_MSG_ERROR([libsctp not found]) LIBS=$old_LIBS
])
+PKG_CHECK_MODULES([TALLOC], [talloc])
+PKG_CHECK_MODULES([TALLOC], [talloc])
AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built))
diff --git a/examples/Makefile.am b/examples/Makefile.am AC_OUTPUT(
index ddfaa48..a5f4d1f 100644 Index: libosmo-netif/examples/Makefile.am
--- a/examples/Makefile.am ===================================================================
+++ b/examples/Makefile.am --- libosmo-netif.orig/examples/Makefile.am
+++ libosmo-netif/examples/Makefile.am
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) -AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS)
@ -95,10 +95,10 @@ index ddfaa48..a5f4d1f 100644
osmux_test_output_LDADD = $(top_builddir)/src/libosmonetif.la \ osmux_test_output_LDADD = $(top_builddir)/src/libosmonetif.la \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
diff --git a/examples/channel/Makefile.am b/examples/channel/Makefile.am Index: libosmo-netif/examples/channel/Makefile.am
index c417909..2f003ce 100644 ===================================================================
--- a/examples/channel/Makefile.am --- libosmo-netif.orig/examples/channel/Makefile.am
+++ b/examples/channel/Makefile.am +++ libosmo-netif/examples/channel/Makefile.am
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) -AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS)
@ -106,7 +106,7 @@ index c417909..2f003ce 100644
AM_LDFLAGS = $(COVERAGE_LDFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS)
noinst_PROGRAMS = abis_ipa_stream_server \ noinst_PROGRAMS = abis_ipa_stream_server \
@@ -7,8 +7,8 @@ noinst_PROGRAMS = abis_ipa_stream_server \ @@ -7,8 +7,8 @@ noinst_PROGRAMS = abis_ipa_stream_server
abis_ipa_stream_server_SOURCES = abis_ipa_stream_server.c abis_ipa_stream_server_SOURCES = abis_ipa_stream_server.c
abis_ipa_stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \ abis_ipa_stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \
@ -117,10 +117,10 @@ index c417909..2f003ce 100644
abis_ipa_stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \ abis_ipa_stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
diff --git a/src/Makefile.am b/src/Makefile.am Index: libosmo-netif/src/Makefile.am
index 4bc481e..3a0460d 100644 ===================================================================
--- a/src/Makefile.am --- libosmo-netif.orig/src/Makefile.am
+++ b/src/Makefile.am +++ libosmo-netif/src/Makefile.am
@@ -3,14 +3,14 @@ @@ -3,14 +3,14 @@
LIBVERSION=3:0:0 LIBVERSION=3:0:0
@ -138,10 +138,10 @@ index 4bc481e..3a0460d 100644
libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
libosmonetif_la_SOURCES = amr.c \ libosmonetif_la_SOURCES = amr.c \
diff --git a/src/channel/abis/Makefile.am b/src/channel/abis/Makefile.am Index: libosmo-netif/src/channel/abis/Makefile.am
index 9ccce1d..bc066cb 100644 ===================================================================
--- a/src/channel/abis/Makefile.am --- libosmo-netif.orig/src/channel/abis/Makefile.am
+++ b/src/channel/abis/Makefile.am +++ libosmo-netif/src/channel/abis/Makefile.am
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
@ -154,6 +154,3 @@ index 9ccce1d..bc066cb 100644
ipa_stream_client.c ipa_stream_client.c
-libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) -libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS)
+libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(TALLOC_LIBS) +libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(TALLOC_LIBS)
--
2.4.3