Commit 8b9098cf authored by Tristan Matthews's avatar Tristan Matthews

* #18603: daemon: migrate to pjsip 2.01

parent eb111f0d

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -11,13 +11,12 @@ INSTALLATION GUIDE
# Go to the root of the application core directory
cd daemon
# Compile pjsip
cd libs/pjproject
./configure
make
cd libs
./compile_pjsip.sh
# Go back to the root
cd ../..
./autogen.sh
./configure --prefix=/usr
./configure
make && sudo make install
You are done with the core !
......@@ -30,7 +29,7 @@ INSTALLATION GUIDE
# Go to the root of the gnome client directory
cd gnome
./autogen.sh
./configure --prefix=/usr
./configure
make && sudo make install
You are done with the gnome client !
......
......@@ -45,15 +45,15 @@ libs/dbus-c++/tools/.libs/
libs/dbus-c++/tools/dbusxx-introspect
libs/dbus-c++/tools/dbusxx-xml2cpp
libs/pjproject/pjlib-util/build/os-auto.mak
libs/pjproject/pjlib/build/os-auto.mak
libs/pjproject/pjlib/include/pj/compat/m_auto.h
libs/pjproject/pjlib/include/pj/compat/os_auto.h
libs/pjproject/pjlib/include/pj/config_site.h
libs/pjproject/pjmedia/build/os-auto.mak
libs/pjproject/pjmedia/include/pjmedia-codec/config_auto.h
libs/pjproject/pjmedia/include/pjmedia/config_auto.h
libs/pjproject/pjsip/build/os-auto.mak
libs/pjproject/pjsip/include/pjsip/sip_autoconf.h
libs/pjproject/third_party/build/os-auto.mak
libs/pjproject/third_party/build/portaudio/os-auto.mak
libs/pjproject-2.0.1/pjlib-util/build/os-auto.mak
libs/pjproject-2.0.1/pjlib/build/os-auto.mak
libs/pjproject-2.0.1/pjlib/include/pj/compat/m_auto.h
libs/pjproject-2.0.1/pjlib/include/pj/compat/os_auto.h
libs/pjproject-2.0.1/pjlib/include/pj/config_site.h
libs/pjproject-2.0.1/pjmedia/build/os-auto.mak
libs/pjproject-2.0.1/pjmedia/include/pjmedia-codec/config_auto.h
libs/pjproject-2.0.1/pjmedia/include/pjmedia/config_auto.h
libs/pjproject-2.0.1/pjsip/build/os-auto.mak
libs/pjproject-2.0.1/pjsip/include/pjsip/sip_autoconf.h
libs/pjproject-2.0.1/third_party/build/os-auto.mak
libs/pjproject-2.0.1/third_party/build/portaudio/os-auto.mak
......@@ -72,9 +72,8 @@ How to compile
--------------
# Compile the PJSIP library
cd libs/pjproject
CFLAGS=-fPIC ./configure && make dep && make -j1
cd libs
./compile_pjsip.sh
If you already have installed a different version of
pjsip on your system, you will most likely have some errors
......
......@@ -355,5 +355,5 @@ AC_CONFIG_FILES([Makefile \
# Go!
AC_OUTPUT
AC_CONFIG_SUBDIRS([libs/pjproject])
AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject) has already been compiled. Run `make' to build the software.]])
AC_CONFIG_SUBDIRS([libs/pjproject-2.0.1])
AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject-2.0.1) has already been compiled. Run `make' to build the software.]])
......@@ -640,7 +640,7 @@ RECURSIVE = YES
# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
EXCLUDE = libs/pjproject
EXCLUDE = libs/pjproject-2.0.1
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
......
......@@ -9,14 +9,14 @@ ASTYLERC="$(top_srcdir)/../astylerc"
indent="/usr/bin/astyle"
# for pjsip
include $(src)/libs/pjproject/build.mak
include $(src)/libs/pjproject-2.0.1/build.mak
PJSIP_LIBS=$(APP_LDFLAGS) $(APP_LDLIBS)
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
SIP_CFLAGS=-I$(src)/libs/pjproject-2.0.1/pjsip/include \
-I$(src)/libs/pjproject-2.0.1/pjlib/include \
-I$(src)/libs/pjproject-2.0.1/pjlib-util/include \
-I$(src)/libs/pjproject-2.0.1/pjmedia/include \
-I$(src)/libs/pjproject-2.0.1/pjnath/include
if BUILD_SPEEX
SPEEXCODEC=-DHAVE_SPEEX_CODEC
......@@ -34,7 +34,7 @@ endif
AM_CPPFLAGS = \
-I$(src)/libs \
-I$(src)/libs/iax2 \
-I$(src)/libs/pjproject \
-I$(src)/libs/pjproject-2.0.1 \
-I$(src)/src \
-I$(src)/src/config \
-I$(src)/test \
......
......@@ -2,4 +2,4 @@ if USE_IAX
SUBDIRS = iax2
endif
EXTRA_DIST=pjproject
EXTRA_DIST=pjproject-2.0.1
#!/bin/bash
# TODO: autotools should be doing this
cd "`dirname $BASH_SOURCE`"/pjproject
cd "`dirname $BASH_SOURCE`"/pjproject-2.0.1
CFLAGS="-fPIC" ./configure --disable-sound && make dep && make -j1 && echo "pjsip successfully compiled"
This diff is collapsed.
[Last update: 2007/02/18]
-= INTRO=-
This top level projects:
- pjlib: portability and basic framework library
- pjlib-util: lexical scanner, XML, STUN, MD5, DNS, etc.
- pjmedia: media framework and codecs
- pjsip: SIP stacks (core, UA layer, SIMPLE, etc.)
- pjsip-apps: SIP apps (pjsua, pjsip-perf)
-= COMPILING =-
On Windows:
- Visual Studio 6: open pjproject.dsw
- Visual Studio 8/2005: open pjproject-vs8.sln
- Embedded VisualC 4: open open pjsip-apps\build\wince-evc4\wince_demos.vcw
- Build pjsua
With Makefile:
- on top level dir (e.g. ~/pjproject)
- ./configure && make dep && make clean && make
Binaries will be in pjsip-apps/bin.
-= PYTHON MODULE =-
On Windows:
- Visual Studio 6: open pjsip-apps\build\pjsip_apps.dsw
- Build py_pjsua module
With GNU and Python:
- cd pjsip-apps/src/py_pjsua
- python setup.py install
One Python sample application is provided:
pjsip-apps/src/py_pjsua/pjsua_app.py
-= PORTING =-
- Just need to port pjlib.
- PJLIB doc has detailed info how to do this.
- Must pass pjlib-test!
include build.mak
include build/host-$(HOST_NAME).mak
-include user.mak
include version.mak
LIB_DIRS = pjlib/build pjlib-util/build pjnath/build third_party/build pjmedia/build pjsip/build
DIRS = $(LIB_DIRS) pjsip-apps/build $(EXTRA_DIRS)
ifdef MINSIZE
MAKE_FLAGS := MINSIZE=1
endif
all clean dep depend distclean print realclean:
for dir in $(DIRS); do \
if $(MAKE) $(MAKE_FLAGS) -C $$dir $@; then \
true; \
else \
exit 1; \
fi; \
done
lib:
for dir in $(LIB_DIRS); do \