- added ilbc patch (adapt to webrtc-libilbc 2.0.x)

diff --git a/asterisk-ilbc.patch b/asterisk-ilbc.patch
new file mode 100644 (file)
index 0000000..8407fa7
--- /dev/null
+++ b/asterisk-ilbc.patch
@@ -0,0 +1,13 @@
+--- asterisk-13.4.0/codecs/codec_ilbc.c.orig   2015-06-04 15:20:51.000000000 +0200
++++ asterisk-13.4.0/codecs/codec_ilbc.c        2015-08-01 21:55:41.236727967 +0200
+@@ -40,8 +40,8 @@
+ 
+ #ifdef ILBC_WEBRTC
+ #include <ilbc.h>
+-typedef WebRtc_UWord16 ilbc_bytes;
+-typedef WebRtc_Word16  ilbc_block;
++typedef uint16_t ilbc_bytes;
++typedef int16_t  ilbc_block;
+ #define BUF_TYPE i16
+ #else
+ #include "ilbc/iLBC_encode.h"

diff --git a/asterisk.spec b/asterisk.spec
index 1878e5763d954c7c103028e183baaa8100594c6a..00cda8908783debc640bf78e7f8b7ed7d6884a51 100644 (file)
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -46,6 +46,7 @@ Patch3:               pld-banner.patch
 Patch4:                lpc10-system.patch
 Patch5:                %{name}-histedit.patch
 Patch6:                x32.patch
+Patch7:                %{name}-ilbc.patch
 URL:           http://www.asterisk.org/
 BuildRequires: OSPToolkit-devel >= 4.0.0
 %{?with_oss:BuildRequires:     SDL_image-devel}
@@ -105,7 +106,7 @@ Requires(post,preun,postun):        systemd-units >= 38
 Requires:      systemd-units >= 0.38
 %{?with_odbc:BuildRequires:    unixODBC-devel}
 BuildRequires: uriparser-devel
-%{?with_ilbc:BuildRequires:    webrtc-libilbc-devel}
+%{?with_ilbc:BuildRequires:    webrtc-libilbc-devel >= 2}
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: zlib-devel
 BuildRequires: libpri-devel >= 1.4.6
@@ -717,17 +718,16 @@ Dokumentacja API Asteriska.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # Fixup makefile so sound archives aren't downloaded/installed
 %{__sed} -i -e 's/^all:.*$/all:/' sounds/Makefile
 %{__sed} -i -e 's/^install:.*$/install:/' sounds/Makefile
 
 # avoid using these
-%{__rm} -r imap main/editline codecs/gsm codecs/lpc10
+%{__rm} -r main/editline codecs/gsm codecs/lpc10
 
 %build
-%{__rm} pbx/.depend
-
 %{__aclocal} -I autoconf
 %{__autoheader}
 %{__autoconf}