aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Zimmermann <zimmermann@vdm-design.de>2011-05-28 12:03:21 +0200
committerThomas Zimmermann <zimmermann@vdm-design.de>2011-05-28 12:03:21 +0200
commitfc7618a9c6090990a03e3607d070879624d953bc (patch)
treeb6971b9d42152c06565cf18b97e213152812ffc9
parentd452edb9ada527f50b4222af8f34e34348825462 (diff)
downloadopenembedded-fc7618a9c6090990a03e3607d070879624d953bc.tar.gz
openembedded-fc7618a9c6090990a03e3607d070879624d953bc.tar.bz2
openembedded-fc7618a9c6090990a03e3607d070879624d953bc.zip
sflphone-common: Update to 0.9.13 and remove sflphone-pjproject
* sflphone-pjproject has installed .h files which have broken the build for other recipes, e.g. err.h and integers.h Signed-off-by: Thomas Zimmermann <zimmermann@vdm-design.de>
-rw-r--r--recipes/sflphone/sflphone-common/fix-Makefile.patch274
-rw-r--r--recipes/sflphone/sflphone-common_0.9.13.bb (renamed from recipes/sflphone/sflphone-common_0.9.12.bb)19
-rw-r--r--recipes/sflphone/sflphone-pjproject/fix-Makefile.patch42
-rw-r--r--recipes/sflphone/sflphone-pjproject_0.9.12.bb21
4 files changed, 117 insertions, 239 deletions
diff --git a/recipes/sflphone/sflphone-common/fix-Makefile.patch b/recipes/sflphone/sflphone-common/fix-Makefile.patch
index 5a5034aefb..f156c117b4 100644
--- a/recipes/sflphone/sflphone-common/fix-Makefile.patch
+++ b/recipes/sflphone/sflphone-common/fix-Makefile.patch
@@ -1,44 +1,28 @@
-diff -Nurd sflphone-common-orig/configure.ac sflphone-common/configure.ac
---- sflphone-common-orig/configure.ac 2011-01-14 20:29:03.000000000 +0100
-+++ sflphone-common/configure.ac 2011-01-15 03:01:11.000000000 +0100
-@@ -44,10 +44,6 @@
- libs/utilspp/Makefile \
- libs/utilspp/functor/Makefile \
- libs/utilspp/singleton/Makefile \
-- libs/dbus-c++/Makefile \
-- libs/dbus-c++/src/Makefile \
-- libs/dbus-c++/tools/Makefile \
-- libs/dbus-c++/data/Makefile \
- libs/iax2/Makefile])
-
- AC_CONFIG_FILES([src/Makefile \
-@@ -154,12 +150,9 @@
- dnl Check for GNU ccRTP
- PKG_PROG_PKG_CONFIG
-
--#Trying to set PJSIP using pkg-config
--#PKG_CHECK_MODULES(SIP, libpj-sfl, have_libpj=true, have_libpj=false)
--#if test "x${have_libpj}" = "xfalse" ; then
--# AC_MSG_ERROR([PJSIP not found. http://www.pjsip.org/download.htm])
--#fi
--#AC_SUBST(SIP_CFLAGS)
-+ PKG_CHECK_MODULES(PJLIB, libpj)
-+ AC_SUBST(PJLIB_CFLAGS)
-+ AC_SUBST(PJLIB_LIBS)
-
- dnl Check for uuid development package - name: uuid-dev
- dnl PKG_CHECK_MODULES(UUID, uuid >= ${UUID_MIN_VERSION})
-@@ -191,7 +184,7 @@
- LIBCCGNU2_MIN_VERSION=1.3.1
- PKG_CHECK_MODULES(CCGNU2, libccgnu2 >= ${LIBCCGNU2_MIN_VERSION})
- AC_SUBST(CCGNU2_LIBS)
+diff -Nurd sflphone-common/configure.ac sflphone-common.new//configure.ac
+--- sflphone-common/configure.ac 2011-04-05 01:01:39.000000000 +0200
++++ sflphone-common.new//configure.ac 2011-05-28 10:59:32.443337188 +0200
+@@ -43,10 +43,6 @@
+ libs/utilspp/Makefile \
+ libs/utilspp/functor/Makefile \
+ libs/utilspp/singleton/Makefile \
+- libs/dbus-c++/Makefile \
+- libs/dbus-c++/src/Makefile \
+- libs/dbus-c++/tools/Makefile \
+- libs/dbus-c++/data/Makefile \
+ libs/iax2/Makefile])
+
+ AC_CONFIG_FILES([src/Makefile \
+@@ -202,7 +198,7 @@
+ LIBCCGNU2_MIN_VERSION=1.3.1
+ PKG_CHECK_MODULES(CCGNU2, libccgnu2 >= ${LIBCCGNU2_MIN_VERSION},, AC_MSG_ERROR([Mising common cpp development package: libcommoncpp2-dev]))
+ AC_SUBST(CCGNU2_LIBS)
-AC_SUBST(CCGNU2_FLAGS)
+AC_SUBST(CCGNU2_CFLAGS)
- LIBCCEXT2_MIN_VERSION=1.3.1
- PKG_CHECK_MODULES(CCEXT2, libccext2 >= ${LIBCCEXT2_MIN_VERSION})
-@@ -214,6 +207,10 @@
- AC_SUBST(ZRTPCPP_LIBS)
+ LIBCCEXT2_MIN_VERSION=1.3.1
+ PKG_CHECK_MODULES(CCEXT2, libccext2 >= ${LIBCCEXT2_MIN_VERSION})
+@@ -225,6 +221,10 @@
+ AC_SUBST(ZRTPCPP_LIBS)
AC_SUBST(ZRTPCPP_CFLAGS)
+ LIBDBUSCPLUSPLUS_MIN_VERSION=0.6.0-pre1
@@ -47,46 +31,20 @@ diff -Nurd sflphone-common-orig/configure.ac sflphone-common/configure.ac
+AC_SUBST(DBUSCPLUSPLUS_CFLAGS)
dnl DBus-C++ detection (used to be in library own build system)
- DBUS_REQUIRED_VERSION=0.60
-diff -Nurd sflphone-common-orig/globals.mak sflphone-common/globals.mak
---- sflphone-common-orig/globals.mak 2011-01-14 20:29:03.000000000 +0100
-+++ sflphone-common/globals.mak 2011-01-15 03:00:04.000000000 +0100
-@@ -7,34 +7,6 @@
- sflcodecdir=$(sfllibdir)/codecs
- sflplugindir=$(sfllibdir)/plugins
+ DBUS_REQUIRED_VERSION=0.60
+diff -Nurd sflphone-common/globals.mak sflphone-common.new//globals.mak
+--- sflphone-common/globals.mak 2011-04-05 01:01:39.000000000 +0200
++++ sflphone-common.new//globals.mak 2011-05-28 11:00:10.586337202 +0200
+@@ -33,8 +33,6 @@
+ -I$(src)/libs/pjproject/pjmedia/include \
+ -I$(src)/libs/pjproject/pjnath/include
--ASTYLERC="$(top_srcdir)/../astylerc"
--indent="/usr/bin/astyle"
--
--# for pjsip
--PJSIP_LIBS= \
-- -L$(src)/libs/pjproject/pjnath/lib/ \
-- -L$(src)/libs/pjproject/pjsip/lib/ \
-- -L$(src)/libs/pjproject/pjlib/lib/ \
-- -L$(src)/libs/pjproject/pjlib-util/lib/ \
-- -L$(src)/libs/pjproject/pjmedia/lib/ \
-- -lpjnath-$(target) \
-- -lpjsua-$(target) \
-- -lpjsip-$(target) \
-- -lpjmedia-$(target) \
-- -lpjsip-simple-$(target) \
-- -lpjsip-ua-$(target) \
-- -lpjmedia-codec-$(target) \
-- -lpjlib-util-$(target) \
-- -lpj-$(target)
--
--SIP_CFLAGS=-I$(src)/libs/pjproject/pjsip/include \
-- -I$(src)/libs/pjproject/pjlib/include \
-- -I$(src)/libs/pjproject/pjlib-util/include \
-- -I$(src)/libs/pjproject/pjmedia/include \
-- -I$(src)/libs/pjproject/pjnath/include
--
-DBUSCPP_CFLAGS=$(top_srcdir)/libs/dbus-c++/include/dbus-c++
-
if BUILD_SPEEX
SPEEXCODEC=-DHAVE_SPEEX_CODEC
else
-@@ -50,7 +22,6 @@
+@@ -50,7 +48,6 @@
# Preprocessor flags
AM_CPPFLAGS = \
-I$(src)/libs \
@@ -94,7 +52,7 @@ diff -Nurd sflphone-common-orig/globals.mak sflphone-common/globals.mak
-I$(src)/libs/iax2 \
-I$(src)/libs/pjproject \
-I$(src)/src \
-@@ -69,10 +40,3 @@
+@@ -69,10 +66,3 @@
-DENABLE_TRACE \
$(SPEEXCODEC) \
$(GSMCODEC)
@@ -105,15 +63,15 @@ diff -Nurd sflphone-common-orig/globals.mak sflphone-common/globals.mak
- if [ -f $(ASTYLERC) ] ; then \
- find $(top_srcdir)/src/ -name \*.cpp -o -name \*.h | xargs $(indent) --options=$(ASTYLERC) ; \
- fi
-diff -Nurd sflphone-common-orig/libs/Makefile.am sflphone-common/libs/Makefile.am
---- sflphone-common-orig/libs/Makefile.am 2011-01-14 20:29:03.000000000 +0100
-+++ sflphone-common/libs/Makefile.am 2011-01-15 02:59:49.000000000 +0100
+diff -Nurd sflphone-common/libs/Makefile.am sflphone-common.new//libs/Makefile.am
+--- sflphone-common/libs/Makefile.am 2011-04-05 01:01:39.000000000 +0200
++++ sflphone-common.new//libs/Makefile.am 2011-05-28 11:00:35.028337210 +0200
@@ -1 +1 @@
-SUBDIRS = utilspp iax2 dbus-c++
+SUBDIRS = utilspp iax2
-diff -Nurd sflphone-common-orig/src/audio/alsa/Makefile.am sflphone-common/src/audio/alsa/Makefile.am
---- sflphone-common-orig/src/audio/alsa/Makefile.am 2011-01-14 20:29:03.000000000 +0100
-+++ sflphone-common/src/audio/alsa/Makefile.am 2011-01-15 02:59:49.000000000 +0100
+diff -Nurd sflphone-common/src/audio/alsa/Makefile.am sflphone-common.new//src/audio/alsa/Makefile.am
+--- sflphone-common/src/audio/alsa/Makefile.am 2011-04-05 01:01:39.000000000 +0200
++++ sflphone-common.new//src/audio/alsa/Makefile.am 2011-05-28 11:00:59.180337220 +0200
@@ -4,5 +4,7 @@
libalsalayer_la_SOURCES = alsalayer.cpp
@@ -122,44 +80,57 @@ diff -Nurd sflphone-common-orig/src/audio/alsa/Makefile.am sflphone-common/src/a
+
noinst_HEADERS = alsalayer.h
-diff -Nurd sflphone-common-orig/src/audio/audiortp/Makefile.am sflphone-common/src/audio/audiortp/Makefile.am
---- sflphone-common-orig/src/audio/audiortp/Makefile.am 2011-01-14 20:29:03.000000000 +0100
-+++ sflphone-common/src/audio/audiortp/Makefile.am 2011-01-15 02:59:49.000000000 +0100
-@@ -10,6 +10,8 @@
- ZrtpSessionCallback.cpp \
- AudioSrtpSession.cpp
+diff -Nurd sflphone-common/src/audio/audiortp/Makefile.am sflphone-common.new//src/audio/audiortp/Makefile.am
+--- sflphone-common/src/audio/audiortp/Makefile.am 2011-04-05 01:01:39.000000000 +0200
++++ sflphone-common.new//src/audio/audiortp/Makefile.am 2011-05-28 11:01:31.196337231 +0200
+@@ -2,6 +2,8 @@
+
+ noinst_LTLIBRARIES = libaudiortp.la
+libaudiortp_la_CXXFLAGS = @DBUSCPLUSPLUS_CFLAGS@
+
- noinst_HEADERS = \
- AudioRtpRecordHandler.h \
- AudioRtpFactory.h \
-diff -Nurd sflphone-common-orig/src/audio/Makefile.am sflphone-common/src/audio/Makefile.am
---- sflphone-common-orig/src/audio/Makefile.am 2011-01-14 20:29:03.000000000 +0100
-+++ sflphone-common/src/audio/Makefile.am 2011-01-15 02:59:49.000000000 +0100
-@@ -45,6 +45,8 @@
- dcblocker.h \
- samplerateconverter.h
+ libaudiortp_la_SOURCES = \
+ AudioRtpSession.cpp \
+ AudioRtpRecordHandler.cpp \
+diff -Nurd sflphone-common/src/audio/Makefile.am sflphone-common.new//src/audio/Makefile.am
+--- sflphone-common/src/audio/Makefile.am 2011-04-05 01:01:39.000000000 +0200
++++ sflphone-common.new//src/audio/Makefile.am 2011-05-28 11:03:13.367337267 +0200
+@@ -8,6 +8,8 @@
+ # SPEEXDSP=-DHAVE_SPEEXDSP_LIB
+ # endif
+libaudio_la_CXXFLAGS = @DBUSCPLUSPLUS_CFLAGS@
+
- libaudio_la_LIBADD = \
- ./audiortp/libaudiortp.la \
- ./codecs/libcodecdescriptor.la \
-diff -Nurd sflphone-common-orig/src/audio/pulseaudio/Makefile.am sflphone-common/src/audio/pulseaudio/Makefile.am
---- sflphone-common-orig/src/audio/pulseaudio/Makefile.am 2011-01-14 20:29:03.000000000 +0100
-+++ sflphone-common/src/audio/pulseaudio/Makefile.am 2011-01-15 02:59:49.000000000 +0100
-@@ -6,6 +6,7 @@
+ libaudio_la_SOURCES = \
+ audioloop.cpp \
+ ringbuffer.cpp \
+diff -Nurd sflphone-common/src/audio/pulseaudio/Makefile.am sflphone-common.new//src/audio/pulseaudio/Makefile.am
+--- sflphone-common/src/audio/pulseaudio/Makefile.am 2011-04-05 01:01:39.000000000 +0200
++++ sflphone-common.new//src/audio/pulseaudio/Makefile.am 2011-05-28 11:02:03.934337242 +0200
+@@ -2,6 +2,8 @@
+
+ noinst_LTLIBRARIES = libpulselayer.la
+
++libpulselayer_la_CXXFLAGS = @DBUSCPLUSPLUS_CFLAGS@
++
+ libpulselayer_la_SOURCES = \
audiostream.cpp \
pulselayer.cpp
+diff -Nurd sflphone-common/src/audio/sound/Makefile.am sflphone-common.new//src/audio/sound/Makefile.am
+--- sflphone-common/src/audio/sound/Makefile.am 2011-04-05 01:01:39.000000000 +0200
++++ sflphone-common.new//src/audio/sound/Makefile.am 2011-05-28 11:02:48.411337259 +0200
+@@ -2,6 +2,8 @@
-+libpulselayer_la_CXXFLAGS = @DBUSCPLUSPLUS_CFLAGS@
+ noinst_LTLIBRARIES = libsound.la
- noinst_HEADERS = \
- audiostream.h \
-diff -Nurd sflphone-common-orig/src/dbus/Makefile.am sflphone-common/src/dbus/Makefile.am
---- sflphone-common-orig/src/dbus/Makefile.am 2011-01-14 20:29:03.000000000 +0100
-+++ sflphone-common/src/dbus/Makefile.am 2011-01-15 02:59:49.000000000 +0100
++libsound_la_CXXFLAGS = @DBUSCPLUSPLUS_CFLAGS@
++
+ libsound_la_SOURCES = \
+ audiofile.cpp \
+ tone.cpp \
+diff -Nurd sflphone-common/src/dbus/Makefile.am sflphone-common.new//src/dbus/Makefile.am
+--- sflphone-common/src/dbus/Makefile.am 2011-04-05 01:01:39.000000000 +0200
++++ sflphone-common.new//src/dbus/Makefile.am 2011-05-28 11:04:16.179337289 +0200
@@ -1,6 +1,6 @@
include $(top_srcdir)/globals.mak
@@ -179,21 +150,21 @@ diff -Nurd sflphone-common-orig/src/dbus/Makefile.am sflphone-common/src/dbus/Ma
noinst_HEADERS = \
callmanager.h \
-diff -Nurd sflphone-common-orig/src/history/Makefile.am sflphone-common/src/history/Makefile.am
---- sflphone-common-orig/src/history/Makefile.am 2011-01-14 20:29:03.000000000 +0100
-+++ sflphone-common/src/history/Makefile.am 2011-01-15 02:59:49.000000000 +0100
-@@ -4,6 +4,8 @@
+diff -Nurd sflphone-common/src/history/Makefile.am sflphone-common.new//src/history/Makefile.am
+--- sflphone-common/src/history/Makefile.am 2011-04-05 01:01:39.000000000 +0200
++++ sflphone-common.new//src/history/Makefile.am 2011-05-28 11:04:37.341337298 +0200
+@@ -2,6 +2,8 @@
- noinst_LTLIBRARIES = libhistory.la
+ SUBDIRS =
+libhistory_la_CXXFLAGS = @DBUSCPLUSPLUS_CFLAGS@
+
+ noinst_LTLIBRARIES = libhistory.la
+
libhistory_la_SOURCES = \
- historyitem.h \
- historyitem.cpp \
-diff -Nurd sflphone-common-orig/src/iax/Makefile.am sflphone-common/src/iax/Makefile.am
---- sflphone-common-orig/src/iax/Makefile.am 2011-01-14 20:29:03.000000000 +0100
-+++ sflphone-common/src/iax/Makefile.am 2011-01-15 02:59:49.000000000 +0100
+diff -Nurd sflphone-common/src/iax/Makefile.am sflphone-common.new//src/iax/Makefile.am
+--- sflphone-common/src/iax/Makefile.am 2011-04-05 01:01:39.000000000 +0200
++++ sflphone-common.new//src/iax/Makefile.am 2011-05-28 11:04:58.246337305 +0200
@@ -10,7 +10,8 @@
iaxvoiplink.cpp
@@ -204,25 +175,19 @@ diff -Nurd sflphone-common-orig/src/iax/Makefile.am sflphone-common/src/iax/Make
noinst_HEADERS = \
iaxaccount.h \
-diff -Nurd sflphone-common-orig/src/Makefile.am sflphone-common/src/Makefile.am
---- sflphone-common-orig/src/Makefile.am 2011-01-14 20:29:03.000000000 +0100
-+++ sflphone-common/src/Makefile.am 2011-01-15 03:02:12.000000000 +0100
-@@ -38,11 +38,12 @@
+diff -Nurd sflphone-common/src/Makefile.am sflphone-common.new//src/Makefile.am
+--- sflphone-common/src/Makefile.am 2011-04-05 01:01:39.000000000 +0200
++++ sflphone-common.new//src/Makefile.am 2011-05-28 11:06:03.630337329 +0200
+@@ -40,7 +40,7 @@
sflphoned_CXXFLAGS = \
-DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\" $(IAX_CXXFLAG) $(NETWORKMANAGER) \
- -DVERSION=\"$(VERSION)\"
-+ -DVERSION=\"$(VERSION)\" \
-+ @DBUSCPLUSPLUS_CFLAGS@
++ -DVERSION=\"$(VERSION)\" @DBUSCPLUSPLUS_CFLAGS@
# libsflphone
--sflphoned_LDADD = ./libsflphone.la $(libssl_LIBS) -lcrypto
-+sflphoned_LDADD = ./libsflphone.la $(libssl_LIBS) -lcrypto @PJLIB_LIBS@
- noinst_LTLIBRARIES = libsflphone.la
-
- noinst_HEADERS = \
-@@ -64,7 +65,6 @@
+@@ -66,7 +66,6 @@
libsflphone_la_LIBADD = \
$(src)/libs/utilspp/libutilspp.la \
$(src)/libs/iax2/libiax2.la \
@@ -230,7 +195,7 @@ diff -Nurd sflphone-common-orig/src/Makefile.am sflphone-common/src/Makefile.am
$(IAX_LIB) \
./im/libim.la \
./sip/libsiplink.la \
-@@ -76,10 +76,11 @@
+@@ -78,6 +77,7 @@
./history/libhistory.la
libsflphone_la_LDFLAGS = \
@@ -238,12 +203,7 @@ diff -Nurd sflphone-common-orig/src/Makefile.am sflphone-common/src/Makefile.am
@CCGNU2_LIBS@ \
@CCEXT2_LIBS@ \
@ZRTPCPP_LIBS@ \
-- $(PJSIP_LIBS) \
-+ @PJLIB_LIBS@ \
- @CCRTP_LIBS@ \
- @ALSA_LIBS@ \
- @PULSEAUDIO_LIBS@ \
-@@ -90,10 +91,11 @@
+@@ -92,6 +92,7 @@
@xml_LIBS@
libsflphone_la_CFLAGS = \
@@ -251,45 +211,17 @@ diff -Nurd sflphone-common-orig/src/Makefile.am sflphone-common/src/Makefile.am
@CCGNU2_CFLAGS@ \
@CCEXT2_CFLAGS@ \
@ZRTPCPP_CFLAGS@ \
-- $(PJSIP_CFLAGS) \
-+ @PJLIB_CFLAGS@ \
- @CCRTP_CFLAGS@ \
- @ALSA_CFLAGS@ \
- @PULSEAUDIO_CFLAGS@ \
-@@ -104,5 +106,3 @@
- @xml_CFLAGS@
-
- libsflphone_la_SOURCES =
--
--all: indent
-diff -Nurd sflphone-common-orig/src/sip/Makefile.am sflphone-common/src/sip/Makefile.am
---- sflphone-common-orig/src/sip/Makefile.am 2011-01-14 20:29:03.000000000 +0100
-+++ sflphone-common/src/sip/Makefile.am 2011-01-15 02:59:49.000000000 +0100
-@@ -21,4 +21,8 @@
+diff -Nurd sflphone-common/src/sip/Makefile.am sflphone-common.new//src/sip/Makefile.am
+--- sflphone-common/src/sip/Makefile.am 2011-04-05 01:01:39.000000000 +0200
++++ sflphone-common.new//src/sip/Makefile.am 2011-05-28 11:06:37.973337340 +0200
+@@ -21,4 +21,9 @@
sipvoiplink.h
libsiplink_la_CXXFLAGS = \
- @PCRE_LIBS@
++ @PCRE_LIBS@ \
+ @DBUSCPLUSPLUS_CFLAGS@
++
+libsiplink_la_LIBADD = \
+ @PCRE_LIBS@ \
-+ @DBUSCPLUSPLUS_LIBS@ \
-+ @PJLIB_LIBS@
-diff -Nurd sflphone-common-orig/src/sip/sipvoiplink.cpp sflphone-common/src/sip/sipvoiplink.cpp
---- sflphone-common/src/sip/sipvoiplink.cpp 2011-01-15 12:14:14.000000000 +0100
-+++ sflphone-common/src/sip/sipvoiplink.cpp 2011-01-15 12:14:14.000000000 +0100
-@@ -49,10 +49,10 @@
-
- #include "audio/audiolayer.h"
-
--#include "pjsip/sip_endpoint.h"
--#include "pjsip/sip_transport_tls.h"
--#include "pjsip/sip_transport_tls.h"
--#include "pjsip/sip_uri.h"
-+#include <pjsip/sip_endpoint.h>
-+#include <pjsip/sip_transport_tls.h>
-+#include <pjsip/sip_transport_tls.h>
-+#include <pjsip/sip_uri.h>
- #include <pjnath.h>
-
- #include <netinet/in.h>
++ @DBUSCPLUSPLUS_LIBS@
diff --git a/recipes/sflphone/sflphone-common_0.9.12.bb b/recipes/sflphone/sflphone-common_0.9.13.bb
index ea149d9e29..0877e7b2f1 100644
--- a/recipes/sflphone/sflphone-common_0.9.12.bb
+++ b/recipes/sflphone/sflphone-common_0.9.13.bb
@@ -5,19 +5,28 @@ LICENSE = "GPLv3"
DEPENDS = "blktool alsa-lib expat-native dbus-native openssl \
pulseaudio libsamplerate0 commoncpp2 ccrtp libzrtpcpp \
- libpcre dbus-c++ dbus-c++-native sflphone-pjproject speex libgsm"
+ libpcre dbus-c++ dbus-c++-native speex libgsm libyaml"
-SRC_URI = "https://projects.savoirfairelinux.com/attachments/download/1977/sflphone-${PV}.tar.gz \
+SRC_URI = "https://projects.savoirfairelinux.com/attachments/download/2162/sflphone-0.9.13.tar.gz \
file://fix-Makefile.patch"
-SRC_URI[md5sum] = "f784b5dd02542a5beb07d872d50bd8ee"
-SRC_URI[sha256sum] = "eab77836d1205402ad05fc33af2fb9734f69743eabbec4d93fdb5ae7bfdef02b"
+SRC_URI[md5sum] = "203bae7342b80ab87c1c606232d9b38e"
+SRC_URI[sha256sum] = "c264c325c3820189772e63c9cd24ed72f3947f7cb15e8e2d939295ebfcc599fb"
S = "${WORKDIR}/sflphone-${PV}/${PN}"
inherit autotools
-EXTRA_OECONF = "--without-networkmanager"
+EXTRA_OECONF = "--without-networkmanager --without-celt"
FILES_${PN}-dbg += "${libdir}/sflphone/.debug/ ${libdir}/sflphone/*/.debug/"
FILES_${PN} += "${datadir} ${libdir}/sflphone/"
+do_configure_prepend() {
+ cd ${S}/libs/pjproject
+ ${S}/libs/pjproject/autogen.sh
+ ${S}/libs/pjproject/configure ${CONFIGUREOPTS} --disable-ilbc-codec
+ make clean
+ make dep
+ make
+ cd ${S}
+} \ No newline at end of file
diff --git a/recipes/sflphone/sflphone-pjproject/fix-Makefile.patch b/recipes/sflphone/sflphone-pjproject/fix-Makefile.patch
deleted file mode 100644
index 35c7d6f8da..0000000000
--- a/recipes/sflphone/sflphone-pjproject/fix-Makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nurd pjproject-orig/aconfigure pjproject/aconfigure
---- pjproject-orig/aconfigure 2011-01-14 20:29:03.000000000 +0100
-+++ pjproject/aconfigure 2011-01-15 03:08:28.000000000 +0100
-@@ -534,7 +534,7 @@
- #
- # Initializations.
- #
--ac_default_prefix=/usr/local
-+ac_default_prefix=/usr
- ac_clean_files=
- ac_config_libobj_dir=.
- LIBOBJS=
-diff -Nurd pjproject-orig/libpj.pc.in pjproject/libpj.pc.in
---- pjproject-orig/libpj.pc.in 2011-01-14 20:29:03.000000000 +0100
-+++ pjproject/libpj.pc.in 2011-01-15 03:06:31.000000000 +0100
-@@ -1,6 +1,6 @@
- # Package Information for pkg-config
-
--prefix=@PREFIX@
-+prefix=/usr
- exec_prefix=${prefix}
- libdir=${exec_prefix}/lib
- includedir=${prefix}/include
-@@ -8,5 +8,5 @@
- Name: libpj
- Description: Multimedia communication library
- Version: 0.5.10.3
--Libs: -L${libdir} -lpjsua -lpjsip -lpjmedia -lpjsip-ua -lpjsip-simple -lpjsip-ua -lpjmedia-codec -lpjlib-util -lpj
-+Libs: -L${libdir} -lpjnath -lpjsua -lpjsip -lpjmedia -lpjsip-simple -lpjsip-ua -lpjmedia-codec -lpjlib-util -lpj -lpjsdp
- Cflags: -I${includedir}
-diff -Nurd pjproject-orig/Makefile pjproject/Makefile
---- pjproject-orig/Makefile 2011-01-14 20:29:03.000000000 +0100
-+++ pjproject/Makefile 2011-01-15 13:43:07.000000000 +0100
-@@ -90,7 +90,7 @@
- pjsua-test:
- cd tests/pjsua && python runall.py
-
--prefix = /usr/local
-+prefix = /usr
- install:
- mkdir -p $(DESTDIR)$(prefix)/lib
- cp -L $$(find . -name '*.a') $(DESTDIR)$(prefix)/lib
diff --git a/recipes/sflphone/sflphone-pjproject_0.9.12.bb b/recipes/sflphone/sflphone-pjproject_0.9.12.bb
deleted file mode 100644
index 29b39e5da2..0000000000
--- a/recipes/sflphone/sflphone-pjproject_0.9.12.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "pjproject "
-SECTION = "libs"
-HOMEPAGE = "http://www.pjsip.org/"
-LICENSE = "GPLv3"
-
-DEPENDS = "alsa-lib openssl"
-
-PARALLEL_MAKE = ""
-
-SRC_URI = "https://projects.savoirfairelinux.com/attachments/download/1977/sflphone-0.9.12.tar.gz \
- file://fix-Makefile.patch"
-SRC_URI[md5sum] = "f784b5dd02542a5beb07d872d50bd8ee"
-SRC_URI[sha256sum] = "eab77836d1205402ad05fc33af2fb9734f69743eabbec4d93fdb5ae7bfdef02b"
-
-S = "${WORKDIR}/sflphone-${PV}/sflphone-common/libs/pjproject"
-
-inherit pkgconfig autotools
-
-do_compile_prepend() {
- oe_runmake dep
-} \ No newline at end of file