- updated to 2.0.3

- build with webrtc-libilbc

diff --git a/msilbc-plugindirfix.patch b/msilbc-plugindirfix.patch
deleted file mode 100644 (file)
index 6a93358..0000000
--- a/msilbc-plugindirfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig  2010-01-27 16:57:48.000000000 +0100
-+++ configure.ac       2011-01-21 20:16:57.161691068 +0100
-@@ -86,7 +86,7 @@
- if test "$prefix" = "NONE"; then
-       theprefix="/usr/local"
- fi
--PACKAGE_PLUGINS_DIR=`eval echo $theprefix/lib/mediastreamer/plugins`
-+PACKAGE_PLUGINS_DIR="${libdir}/mediastreamer/plugins"
- AC_DEFINE_UNQUOTED(PACKAGE_PLUGINS_DIR,  "$PACKAGE_PLUGINS_DIR" ,[path of plugins])
- AC_SUBST(PACKAGE_PLUGINS_DIR)
- 

diff --git a/msilbc-webrtc-libilbc.patch b/msilbc-webrtc-libilbc.patch
new file mode 100644 (file)
index 0000000..8eef4ef
--- /dev/null
+++ b/msilbc-webrtc-libilbc.patch
@@ -0,0 +1,27 @@
+diff -ur msilbc-2.0.3/configure.ac msilbc-2.0.3-webrtc/configure.ac
+--- msilbc-2.0.3/configure.ac  2011-02-07 15:26:04.000000000 +0100
++++ msilbc-2.0.3-webrtc/configure.ac   2012-11-19 11:50:19.000000000 +0100
+@@ -48,7 +48,7 @@
+ # check for libraries that have pkg-config files installed
+ PKG_CHECK_MODULES(ORTP, ortp >= 0.16.0)
+ PKG_CHECK_MODULES(MEDIASTREAMER, mediastreamer >= 2.0.0)
+-PKG_CHECK_MODULES(ILBC, ilbc >= 0.0.0)
++PKG_CHECK_MODULES(ILBC, libilbc >= 0.0.0)
+ 
+ # create the following files from their .in counterparts
+ AC_CONFIG_FILES([
+diff -ur msilbc-2.0.3/ilbc.c msilbc-2.0.3-webrtc/ilbc.c
+--- msilbc-2.0.3/ilbc.c        2011-02-07 15:26:04.000000000 +0100
++++ msilbc-2.0.3-webrtc/ilbc.c 2012-11-19 11:55:40.000000000 +0100
+@@ -5,8 +5,9 @@
+       #include <iLBC_encode.h>
+       #include <iLBC_decode.h>
+ #else
+-      #include <ilbc/iLBC_encode.h>
+-      #include <ilbc/iLBC_decode.h>
++      #include <ilbc.h>
++      #define NO_OF_BYTES_30MS   50
++      #define NO_OF_BYTES_20MS   38
+ #endif /*ANDROID*/
+ 
+ #include "mediastreamer2/msfilter.h"

diff --git a/msilbc.spec b/msilbc.spec
index 9c3b2091f77d345ae2dd97a2f91633253a7a0710..8d31e1a86d20736b5213c832b73c89a23a18872c 100644 (file)
--- a/msilbc.spec
+++ b/msilbc.spec
@@ -1,15 +1,18 @@
 #
+# Conditional build:
+%bcond_without static_libs     # don't build static libraries
+#
 Summary:       msilbc
 Summary(pl.UTF-8):     msilbc
 Name:          msilbc
-Version:       2.0.1
-Release:       3
+Version:       2.0.3
+Release:       1
 License:       GPL v2
 Group:         Development/Libraries
 Source0:       http://mirror.lihnidos.org/GNU/savannah/linphone/plugins/sources/%{name}-%{version}.tar.gz
-# Source0-md5: ec2855c57b4344f14fbbc8cfd4c433fe
+# Source0-md5: 9c8740345dd8ee9732604a8f6a4329e6
+Patch0:                %{name}-webrtc-libilbc.patch
 URL:           http://git.exherbo.org/summer/packages/media-plugins/msilbc
-Patch0:                %{name}-plugindirfix.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: webrtc-libilbc-devel
@@ -48,14 +51,16 @@ Statyczna biblioteka msilbc.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+       %{?with_static_libs:--enable-static}
+
 %{__make}
 
 %install