Commit 99aae467 authored by Tristan Matthews's avatar Tristan Matthews

sip: migrate to pjsip 2.2.1

Refs #44875
parent a475c87f

Too many changes to show.

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

......@@ -48,15 +48,15 @@ libs/dbus-c++/tools/.libs/
libs/dbus-c++/tools/dbusxx-introspect
libs/dbus-c++/tools/dbusxx-xml2cpp
libs/pjproject-2.1.0/pjlib-util/build/os-auto.mak
libs/pjproject-2.1.0/pjlib/build/os-auto.mak
libs/pjproject-2.1.0/pjlib/include/pj/compat/m_auto.h
libs/pjproject-2.1.0/pjlib/include/pj/compat/os_auto.h
libs/pjproject-2.1.0/pjlib/include/pj/config_site.h
libs/pjproject-2.1.0/pjmedia/build/os-auto.mak
libs/pjproject-2.1.0/pjmedia/include/pjmedia-codec/config_auto.h
libs/pjproject-2.1.0/pjmedia/include/pjmedia/config_auto.h
libs/pjproject-2.1.0/pjsip/build/os-auto.mak
libs/pjproject-2.1.0/pjsip/include/pjsip/sip_autoconf.h
libs/pjproject-2.1.0/third_party/build/os-auto.mak
libs/pjproject-2.1.0/third_party/build/portaudio/os-auto.mak
libs/pjproject-2.2.1/pjlib-util/build/os-auto.mak
libs/pjproject-2.2.1/pjlib/build/os-auto.mak
libs/pjproject-2.2.1/pjlib/include/pj/compat/m_auto.h
libs/pjproject-2.2.1/pjlib/include/pj/compat/os_auto.h
libs/pjproject-2.2.1/pjlib/include/pj/config_site.h
libs/pjproject-2.2.1/pjmedia/build/os-auto.mak
libs/pjproject-2.2.1/pjmedia/include/pjmedia-codec/config_auto.h
libs/pjproject-2.2.1/pjmedia/include/pjmedia/config_auto.h
libs/pjproject-2.2.1/pjsip/build/os-auto.mak
libs/pjproject-2.2.1/pjsip/include/pjsip/sip_autoconf.h
libs/pjproject-2.2.1/third_party/build/os-auto.mak
libs/pjproject-2.2.1/third_party/build/portaudio/os-auto.mak
......@@ -425,5 +425,5 @@ AC_CONFIG_FILES([Makefile \
# Go!
AC_OUTPUT
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.]])
AC_CONFIG_SUBDIRS([libs/pjproject-2.2.1])
AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject-2.2.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-2.1.0
EXCLUDE = libs/pjproject-2.2.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
......
......@@ -7,7 +7,7 @@ sflplugindir=$(sfllibdir)/plugins
ASTYLERC="$(top_srcdir)/../astylerc"
indent="/usr/bin/astyle"
PJPROJECT_DIR=pjproject-2.1.0
PJPROJECT_DIR=pjproject-2.2.1
# for pjsip
include $(src)/libs/$(PJPROJECT_DIR)/build.mak
......
......@@ -2,4 +2,4 @@ if USE_IAX
SUBDIRS = iax2
endif
EXTRA_DIST=pjproject-2.1.0
EXTRA_DIST=pjproject-2.2.1
......@@ -15,5 +15,5 @@ OPTIONS="--disable-oss
--disable-ffmpeg
--disable-v4l2"
# TODO: autotools should be doing this
cd "`dirname $BASH_SOURCE`"/pjproject-2.1.0
cd "`dirname $BASH_SOURCE`"/pjproject-2.2.1
CFLAGS=-g ./configure $OPTIONS && make dep && make -j1 && echo "pjsip successfully compiled"
This diff is collapsed.
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)
pjsip-test: pjsip/bin/pjsip-test-$(TARGET_NAME)
cd pjsip/build && ../bin/pjsip-test-$(TARGET_NAME)
pjsua-test:
cd tests/pjsua && python runall.py
prefix = $(ac_prefix)
install:
mkdir -p $(DESTDIR)$(prefix)/lib
cp -f $(APP_LIB_FILES) $(DESTDIR)$(prefix)/lib/
mkdir -p $(DESTDIR)$(prefix)/include
for d in pjlib pjlib-util pjnath pjmedia pjsip; do \
cp -RLf $$d/include/* $(DESTDIR)$(prefix)/include/; \
done
mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
sed -e "s!@PREFIX@!$(DESTDIR)$(prefix)!" libpjproject.pc.in | \
sed -e "s/@PJ_VERSION@/$(PJ_VERSION)/" | \
sed -e "s!@PJ_LDLIBS@!$(PJ_LDLIBS)!" | \
sed -e "s!@PJ_INSTALL_CFLAGS@!$(PJ_INSTALL_CFLAGS)!" > $(DESTDIR)/$(prefix)/lib/pkgconfig/libpjproject.pc
This diff is collapsed.
This diff is collapsed.