Attachment 925525 Details for Bug 1128464 – Unbundle iax, spandsp

[patch] Unbundle iax, spandsp

0001-Unbundle-iax-spandsp.patch (text/plain), 3.66 KB, created by Sandro Mani on 2014-08-10 16:47:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sandro Mani

Created: 2014-08-10 16:47:11 UTC

Size: 3.66 KB

patch

obsolete

>From a68d3e2934105930d61fa5ed8a52b13f54b10c9c Mon Sep 17 00:00:00 2001
>From: Sandro Mani <manisandro@gmail.com>
>Date: Sun, 10 Aug 2014 18:40:29 +0200
>Subject: [PATCH] Unbundle iax, spandsp
>
>---
> iaxclient-2.1beta3_unbundle.patch | 36 ++++++++++++++++++++++++++++++++++++
> iaxclient.spec                    | 15 ++++++++++++---
> 2 files changed, 48 insertions(+), 3 deletions(-)
> create mode 100644 iaxclient-2.1beta3_unbundle.patch
>
>diff --git a/iaxclient-2.1beta3_unbundle.patch b/iaxclient-2.1beta3_unbundle.patch
>new file mode 100644
>index 0000000..fc8555a
>--- /dev/null
>+++ b/iaxclient-2.1beta3_unbundle.patch
>@@ -0,0 +1,36 @@
>+diff -rupN iaxclient-2.1beta3/lib/iaxclient_lib.h iaxclient-2.1beta3-new/lib/iaxclient_lib.h
>+--- iaxclient-2.1beta3/lib/iaxclient_lib.h	2008-04-07 18:05:42.000000000 +0200
>++++ iaxclient-2.1beta3-new/lib/iaxclient_lib.h	2014-08-10 17:41:39.124310918 +0200
>+@@ -54,7 +54,7 @@ extern "C" {
>+ 
>+ #include <stdlib.h>
>+ #include <math.h>
>+-#include "spandsp/plc.h"
>++#include <spandsp.h>
>+ 
>+ 
>+ 
>+diff -rupN iaxclient-2.1beta3/lib/Makefile.am iaxclient-2.1beta3-new/lib/Makefile.am
>+--- iaxclient-2.1beta3/lib/Makefile.am	2008-04-07 18:05:42.000000000 +0200
>++++ iaxclient-2.1beta3-new/lib/Makefile.am	2014-08-10 17:52:10.554282860 +0200
>+@@ -27,7 +27,8 @@ libiaxclient_la_LIBADD =			\
>+ 	$(IAX2_LIBS)				\
>+ 	$(PORTAUDIO_LIBS)			\
>+ 	$(SPEEX_LIBS)				\
>+-	$(SPEEXDSP_LIBS)
>++	$(SPEEXDSP_LIBS)			\
>++	-lspandsp
>+ 
>+ AM_LDFLAGS =					\
>+ 	-no-undefined				\
>+@@ -143,9 +144,7 @@ SRCS +=						\
>+ 	ringbuffer.h				\
>+ 	portmixer/px_common/portmixer.h		\
>+ 	slice.c					\
>+-	slice.h					\
>+-	spandsp/plc.c				\
>+-	spandsp/plc.h
>++	slice.h
>+ 
>+ SRCS_VIDEO=					\
>+ 	video.c					\
>diff --git a/iaxclient.spec b/iaxclient.spec
>index 439c26a..3116638 100644
>--- a/iaxclient.spec
>+++ b/iaxclient.spec
>@@ -7,7 +7,7 @@
> 
> Name:		iaxclient
> Version:	%{mainver}
>-Release:	0.19.%{betaver}%{?dist}
>+Release:	0.20.%{betaver}%{?dist}
> Summary:	Library for creating telephony solutions that interoperate with Asterisk
> Group:		System Environment/Libraries
> License:	LGPLv2+
>@@ -27,10 +27,12 @@ Patch6:		iaxclient-2.1beta3-implicit-DSO-libm.patch
> Patch7:		iaxclient-2.1beta3-arm-barriers.patch
> Patch8:		iaxclient-2.1beta3-format-security-fix.patch
> Patch9:		iaxclient-portable.patch
>+Patch10:	iaxclient-2.1beta3_unbundle.patch
> 
> BuildRequires:	speex-devel, libtheora-devel, gsm-devel, portaudio-devel, iax-devel
> BuildRequires:	tk-devel, gtk2-devel, SDL-devel, libogg-devel, liboggz-devel 
> BuildRequires:	wxGTK-devel, libvidcap-devel, desktop-file-utils, libtool
>+BuildRequires:	spandsp-devel
> 
> %description
> Iaxclient is an open source, multiplatform library for creating telephony 
>@@ -97,13 +99,17 @@ wx IAX Phone Client.
> %patch7 -p1 -b .arm
> %patch8 -p1 -b .format-security
> %patch9 -p1 -b .portable
>+%patch10 -p1 -b .unbundle
>+
> autoreconf -vif
> chmod -x contrib/tcl/README.txt
> 
>-sed -i 's|/usr/lib|%{_libdir}|g' lib/libiax2/iax-config.in
>+# Delete bundled libraries (just to be sure)
>+rm -rf lib/gsm lib/libiax2 lib/sox lib/spandsp lib/wince
>+# rm -rf lib/portmixer
> 
> %build
>-%configure --disable-static
>+%configure --disable-static --disable-local-iax
> # sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
> # sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
> make %{?_smp_mflags} LIBTOOL="%{_bindir}/libtool"
>@@ -178,6 +184,9 @@ ln -s iaxcli iaxcli-Linux-%{tkphonearch}
> %{_datadir}/pixmaps/wxiax.png
> 
> %changelog
>+* Sun Aug 10 2014 Sandro Mani <manisandro@gmail.com> - 2.1-0.20.beta3
>+- Don't use bundled libraries as far as possible
>+
> * Thu Jul  3 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2.1-0.19.beta3
> - Add patch to fix build on aarch64
> 
>-- 
>2.0.4
>

Actions: View | Diff

Attachments on bug 1128464: 925525