Commit 9ee5343b authored by Tristan Matthews's avatar Tristan Matthews

* #25974: daemon: update to pjsip 2.1.0

parent 25647376

Too many changes to show.

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

......@@ -380,5 +380,5 @@ AC_CONFIG_FILES([Makefile \
# Go!
AC_OUTPUT
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.]])
AC_CONFIG_SUBDIRS([libs/pjproject-2.1.0])
AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject-2.1.0) has already been compiled. Run `make' to build the software.]])
......@@ -9,14 +9,14 @@ ASTYLERC="$(top_srcdir)/../astylerc"
indent="/usr/bin/astyle"
# for pjsip
include $(src)/libs/pjproject-2.0.1/build.mak
include $(src)/libs/pjproject-2.1.0/build.mak
PJSIP_LIBS=$(APP_LDFLAGS) $(APP_LDLIBS)
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
SIP_CFLAGS=-I$(src)/libs/pjproject-2.1.0/pjsip/include \
-I$(src)/libs/pjproject-2.1.0/pjlib/include \
-I$(src)/libs/pjproject-2.1.0/pjlib-util/include \
-I$(src)/libs/pjproject-2.1.0/pjmedia/include \
-I$(src)/libs/pjproject-2.1.0/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-2.0.1 \
-I$(src)/libs/pjproject-2.1.0 \
-I$(src)/src \
-I$(src)/src/config \
-I$(src)/test \
......
......@@ -15,5 +15,5 @@ OPTIONS="--disable-oss
--disable-ffmpeg
--disable-v4l2"
# TODO: autotools should be doing this
cd "`dirname $BASH_SOURCE`"/pjproject-2.0.1
cd "`dirname $BASH_SOURCE`"/pjproject-2.1.0
./configure $OPTIONS && 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 \
if $(MAKE) $(MAKE_FLAGS) -C $$dir all; then \
true; \
else \
exit 1; \
fi; \
done; \
.PHONY: lib
doc:
@if test \( ! "$(WWWDIR)" == "" \) -a \( ! -d $(WWWDIR)/pjlib/docs/html \) ; then \
echo 'Directory "$(WWWDIR)" does not look like a valid pjsip web directory'; \
exit 1; \
fi
for dir in $(DIRS); do \
if $(MAKE) $(MAKE_FLAGS) -C $$dir $@; then \
true; \
else \
exit 1; \
fi; \
done
LIBS = pjlib/lib/libpj-$(TARGET_NAME).a \
pjlib-util/lib/libpjlib-util-$(TARGET_NAME).a \
pjnath/lib/libpjnath-$(TARGET_NAME).a \
pjmedia/lib/libpjmedia-$(TARGET_NAME).a \
pjmedia/lib/libpjmedia-audiodev-$(TARGET_NAME).a \
pjmedia/lib/libpjmedia-codec-$(TARGET_NAME).a \
pjsip/lib/libpjsip-$(TARGET_NAME).a \
pjsip/lib/libpjsip-ua-$(TARGET_NAME).a \
pjsip/lib/libpjsip-simple-$(TARGET_NAME).a \
pjsip/lib/libpjsua-$(TARGET_NAME).a
BINS = pjsip-apps/bin/pjsua-$(TARGET_NAME)$(HOST_EXE)
size:
@echo -n 'Date: '
@date
@echo
@for lib in $(LIBS); do \
echo "$$lib:"; \
size -t $$lib | awk '{print $$1 "\t" $$2 "\t" $$3 "\t" $$6}'; \
echo; \
done
@echo
@for bin in $(BINS); do \
echo "size $$bin:"; \
size $$bin; \
done
#dos2unix:
# for f in `find . | egrep '(mak|h|c|S|s|Makefile)$$'`; do \
# dos2unix "$$f" > dos2unix.tmp; \
# cp dos2unix.tmp "$$f"; \
# done
# rm -f dos2unix.tmp
xhdrid:
for f in `find . | egrep '\.(h|c|S|s|cpp|hpp)$$'`; do \
echo Processing $$f...; \
cat $$f | sed 's/.*\$$Author\$$/ */' > /tmp/id; \
cp /tmp/id $$f; \
done
selftest: pjlib-test pjlib-util-test pjnath-test pjmedia-test pjsip-test pjsua-test
pjlib-test: pjlib/bin/pjlib-test-$(TARGET_NAME)
cd pjlib/build && ../bin/pjlib-test-$(TARGET_NAME)
pjlib-util-test: pjlib-util/bin/pjlib-util-test-$(TARGET_NAME)
cd pjlib-util/build && ../bin/pjlib-util-test-$(TARGET_NAME)
pjnath-test: pjnath/bin/pjnath-test-$(TARGET_NAME)
cd pjnath/build && ../bin/pjnath-test-$(TARGET_NAME)
pjmedia-test: pjmedia/bin/pjmedia-test-$(TARGET_NAME)
cd pjmedia/build && ../bin/pjmedia-test-$(TARGET_NAME)