[Pkg-voip-commits] [pjproject] 10/18: merge patched into master
Bernhard Schmidt
berni at moszumanska.debian.org
Tue Nov 1 22:12:02 UTC 2016
This is an automated email from the git hooks/post-receive script.
berni pushed a commit to branch master
in repository pjproject.
commit db1083fbc36ef32cf03d2a022e63b3514b69d35d
Merge: 7a202ba ef05759
Author: Bernhard Schmidt <berni at debian.org>
Date: Thu Oct 27 09:02:28 2016 +0200
merge patched into master
aconfigure | 289 +-
aconfigure.ac | 179 +-
build.mak.in | 31 +-
build/rules.mak | 7 +-
configure-android | 10 +-
debian/.git-dpm | 6 +-
...1-Remove-pointless-linking-with-libasound.patch | 6 +-
...uce-number-of-libraries-linked-with-pjlib.patch | 8 +-
...e-number-of-libraries-linked-with-pjmedia.patch | 4 +-
.../0004-Enable-building-python-bindings.patch | 2 +-
...o-libs-dependency-for-pj-utils-and-pjnath.patch | 6 +-
.../0006-Reduce-linkage-of-unused-libraries.patch | 16 +-
...07-add-v5-suffix-to-soname-of-libpjsua2-2.patch | 6 +-
pjlib-util/include/pjlib-util/cli_telnet.h | 3 +-
pjlib-util/include/pjlib-util/dns.h | 18 +-
pjlib-util/include/pjlib-util/resolver.h | 58 +-
pjlib-util/include/pjlib-util/srv_resolver.h | 29 +-
pjlib-util/src/pjlib-util-test/resolver_test.c | 533 +++-
pjlib-util/src/pjlib-util/dns.c | 17 +-
pjlib-util/src/pjlib-util/dns_server.c | 16 +-
pjlib-util/src/pjlib-util/resolver.c | 330 +-
pjlib-util/src/pjlib-util/srv_resolver.c | 259 +-
pjlib/include/pj/config.h | 4 +-
pjlib/src/pj/addr_resolv_sock.c | 11 +-
pjlib/src/pj/ssl_sock_ossl.c | 92 +-
pjlib/src/pjlib-test/ssl_sock.c | 6 +-
pjmedia/build/os-auto.mak.in | 45 +-
pjmedia/build/pjmedia.vcproj | 96 +-
pjmedia/build/pjmedia.vcxproj | 24 +-
pjmedia/src/pjmedia-audiodev/android_jni_dev.c | 117 +-
pjmedia/src/pjmedia-codec/opus.c | 24 +-
.../pjmedia-videodev/{ios_dev.m => darwin_dev.m} | 444 +--
pjmedia/src/pjmedia-videodev/sdl_dev.c | 122 +-
pjmedia/src/pjmedia-videodev/videodev.c | 10 +-
pjmedia/src/pjmedia/converter.c | 18 +-
pjmedia/src/pjmedia/converter_libyuv.c | 11 +-
pjmedia/src/pjmedia/sdp.c | 5 +-
pjmedia/src/pjmedia/transport_ice.c | 23 +-
pjmedia/src/pjmedia/transport_srtp.c | 10 +-
pjnath/include/pjnath/config.h | 24 +-
pjnath/include/pjnath/ice_session.h | 4 +-
pjnath/include/pjnath/ice_strans.h | 341 +-
pjnath/include/pjnath/nat_detect.h | 28 +-
pjnath/include/pjnath/stun_sock.h | 4 +-
pjnath/src/pjnath-test/concur_test.c | 10 +-
pjnath/src/pjnath-test/ice_test.c | 384 ++-
pjnath/src/pjnath-test/server.c | 86 +-
pjnath/src/pjnath-test/server.h | 12 +-
pjnath/src/pjnath-test/sess_auth.c | 73 +-
pjnath/src/pjnath-test/stun_sock_test.c | 106 +-
pjnath/src/pjnath-test/test.c | 17 +-
pjnath/src/pjnath-test/test.h | 11 +-
pjnath/src/pjnath-test/turn_sock_test.c | 62 +-
pjnath/src/pjnath/ice_session.c | 20 +-
pjnath/src/pjnath/ice_strans.c | 716 +++--
pjnath/src/pjnath/nat_detect.c | 106 +-
pjnath/src/pjnath/stun_msg_dump.c | 16 +-
pjnath/src/pjnath/stun_sock.c | 30 +-
pjnath/src/pjnath/turn_session.c | 34 +-
pjnath/src/pjnath/turn_sock.c | 2 +-
pjproject-vs14.sln | 28 +-
pjproject-vs8.sln | 150 +-
pjsip-apps/build/Samples-vc.mak | 4 +-
pjsip-apps/build/libpjproject.vcxproj | 3 +
pjsip-apps/build/swig_java_pjsua2.vcproj | 395 +++
pjsip-apps/src/samples/siprtp.c | 3 +-
pjsip-apps/src/swig/java/Makefile | 6 +-
.../android/src/org/pjsip/pjsua2/app/MyApp.java | 5 +-
pjsip-apps/src/swig/java/sample.java | 19 +-
pjsip-apps/src/swig/pjsua2.i | 9 +-
pjsip/include/pjsip-simple/evsub.h | 22 +-
pjsip/include/pjsip-ua/sip_regc.h | 3 +-
pjsip/include/pjsip/sip_auth.h | 13 +-
pjsip/include/pjsip/sip_config.h | 12 +-
pjsip/include/pjsua-lib/pjsua_internal.h | 7 +-
pjsip/src/pjsip-simple/evsub.c | 16 +-
pjsip/src/pjsip-simple/publishc.c | 4 +-
pjsip/src/pjsip-ua/sip_reg.c | 49 +-
pjsip/src/pjsip/sip_auth_client.c | 91 +-
pjsip/src/pjsip/sip_dialog.c | 3 +-
pjsip/src/pjsip/sip_resolve.c | 234 +-
pjsip/src/pjsip/sip_transport_tls.c | 18 +-
pjsip/src/pjsip/sip_util.c | 10 +-
pjsip/src/pjsua-lib/pjsua_acc.c | 82 +-
pjsip/src/pjsua-lib/pjsua_core.c | 44 +-
pjsip/src/pjsua-lib/pjsua_im.c | 6 +-
pjsip/src/pjsua-lib/pjsua_media.c | 132 +-
pjsip/src/pjsua2/account.cpp | 6 +-
third_party/build/os-auto.mak.in | 8 +
third_party/build/yuv/Makefile | 111 +
third_party/build/yuv/Notes.txt | 21 +
third_party/build/yuv/libyuv.vcproj | 3320 ++++++++++++++++++++
.../build/yuv/libyuv.vcxproj | 294 +-
third_party/build/yuv/libyuv.vcxproj.filters | 104 +
version.mak | 4 +-
95 files changed, 8280 insertions(+), 1937 deletions(-)
diff --cc debian/.git-dpm
index 5ee390d,0000000..8aaad28
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 163e66a1ce3475d66354f9a20bec250245661d7e
- 163e66a1ce3475d66354f9a20bec250245661d7e
- a57d967590e57e514fda69bd46378facce9f78be
++ef057592fc4cef48537faedb9a356b8bf968dde0
++ef057592fc4cef48537faedb9a356b8bf968dde0
++1047e1c8eed5013605500b204449cbe1e3668430
+1047e1c8eed5013605500b204449cbe1e3668430
+pjproject_2.5.5~dfsg.orig.tar.bz2
+d130318466a02e5734b069ed0e343a5d78c06a5c
+3506099
diff --cc debian/patches/0001-Remove-pointless-linking-with-libasound.patch
index 2051756,0000000..0b67b89
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-pointless-linking-with-libasound.patch
+++ b/debian/patches/0001-Remove-pointless-linking-with-libasound.patch
@@@ -1,30 -1,0 +1,30 @@@
- From 428ccbd291634ba43265c6ef66cc362876cae064 Mon Sep 17 00:00:00 2001
++From a72a834f0f206f99c29bdd05c62a5b46f1d5a302 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine at m4x.org>
+Date: Thu, 30 Oct 2014 08:09:41 +0200
+Subject: Remove pointless linking with libasound
+
+Upstream: no
+
+All libraries and applications were being linked against libasound,
+but it was not being used anywhere.
+
+Upstream says: this cannot be merged as-is.
+---
+ aconfigure.ac | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/aconfigure.ac b/aconfigure.ac
- index 846a782..0f0e201 100644
++index 3c80efa..851b13d 100644
+--- a/aconfigure.ac
++++ b/aconfigure.ac
- @@ -663,9 +663,7 @@ else
++@@ -684,9 +684,7 @@ else
+ dnl # Check if ALSA is available
+ ac_pjmedia_snd=alsa
+ AC_SUBST(ac_pa_use_alsa,1)
+- AC_CHECK_HEADER(alsa/version.h,
+- [LIBS="$LIBS -lasound"],
+- [ac_pa_use_alsa=0])
++ AC_CHECK_HEADER(alsa/version.h, [], [ac_pa_use_alsa=0])
+ AC_MSG_RESULT([Checking sound device backend... unix])
+
+ dnl # Check if OSS is disabled
diff --cc debian/patches/0002-Reduce-number-of-libraries-linked-with-pjlib.patch
index 63b79cc,0000000..c961780
mode 100644,000000..100644
--- a/debian/patches/0002-Reduce-number-of-libraries-linked-with-pjlib.patch
+++ b/debian/patches/0002-Reduce-number-of-libraries-linked-with-pjlib.patch
@@@ -1,64 -1,0 +1,64 @@@
- From 07bd3e90c8832e955b9779b3183ef8349e66661d Mon Sep 17 00:00:00 2001
++From b61267d7583c9293f4f063734ffaf4c84736ea77 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine at m4x.org>
+Date: Thu, 30 Oct 2014 08:09:42 +0200
+Subject: Reduce number of libraries linked with pjlib
+
+All libraries and applications were gratuitously linked against
+libcrypto, libssl and libuuid, but only libpj needs them.
+---
+ aconfigure.ac | 7 ++++---
+ build.mak.in | 2 ++
+ pjlib/build/Makefile | 2 +-
+ 3 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/aconfigure.ac b/aconfigure.ac
- index 0f0e201..214284d 100644
++index 851b13d..8990936 100644
+--- a/aconfigure.ac
++++ b/aconfigure.ac
+@@ -113,7 +113,8 @@ AC_CHECK_LIB(winmm,puts)
+ AC_CHECK_LIB(socket,puts)
+ AC_CHECK_LIB(rt,puts)
+ AC_CHECK_LIB(m,sin)
+-AC_CHECK_LIB(uuid,uuid_generate)
++AC_SUBST(PJLIB_EXT)
++AC_CHECK_LIB(uuid,uuid_generate,[PJLIB_EXT="-luuid $PJLIB_EXT"])
+ AC_CHECK_LIB(uuid,uuid_generate,[ac_has_uuid_lib=1])
+ AC_SEARCH_LIBS(gethostbyname,nsl)
+
- @@ -1618,8 +1619,8 @@ AC_ARG_ENABLE(ssl,
++@@ -1585,8 +1586,8 @@ AC_ARG_ENABLE(ssl,
+ AC_SUBST(libssl_present)
+ AC_SUBST(libcrypto_present)
+ AC_CHECK_HEADER(openssl/ssl.h,[openssl_h_present=1])
+- AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="-lcrypto $LIBS"])
+- AC_CHECK_LIB(ssl,SSL_library_init,[libssl_present=1 && LIBS="-lssl $LIBS"])
++ AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && PJLIB_EXT="-lcrypto $PJLIB_EXT"])
++ AC_CHECK_LIB(ssl,SSL_library_init,[libssl_present=1 && PJLIB_EXT="-lssl $PJLIB_EXT"])
+ if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then
+ AC_MSG_RESULT([OpenSSL library found, SSL support enabled])
+ # PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK
+diff --git a/build.mak.in b/build.mak.in
- index 074977d..1add583 100644
++index 802211c..70c33c8 100644
+--- a/build.mak.in
++++ b/build.mak.in
+@@ -28,6 +28,8 @@ export APP_THIRD_PARTY_EXT :=
+ export APP_THIRD_PARTY_LIBS :=
+ export APP_THIRD_PARTY_LIB_FILES :=
+
++PJLIB_EXT = @PJLIB_EXT@
++
+ ifeq (@ac_external_srtp@,1)
+ # External SRTP library
+ APP_THIRD_PARTY_EXT += -lsrtp
+diff --git a/pjlib/build/Makefile b/pjlib/build/Makefile
+index 1e64950..2bd2b90 100644
+--- a/pjlib/build/Makefile
++++ b/pjlib/build/Makefile
+@@ -39,7 +39,7 @@ export PJLIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
+ string.o timer.o types.o
+ export PJLIB_CFLAGS += $(_CFLAGS)
+ export PJLIB_CXXFLAGS += $(_CXXFLAGS)
+-export PJLIB_LDFLAGS += $(_LDFLAGS)
++export PJLIB_LDFLAGS += $(PJLIB_EXT) $(_LDFLAGS)
+
+ ###############################################################################
+ # Defines for building test application
diff --cc debian/patches/0003-Reduce-number-of-libraries-linked-with-pjmedia.patch
index 64388f4,0000000..cf5956b
mode 100644,000000..100644
--- a/debian/patches/0003-Reduce-number-of-libraries-linked-with-pjmedia.patch
+++ b/debian/patches/0003-Reduce-number-of-libraries-linked-with-pjmedia.patch
@@@ -1,73 -1,0 +1,73 @@@
- From b37e87152e7de654d452e290aa3142325ca1dab3 Mon Sep 17 00:00:00 2001
++From c063f003965215595b32d21a75a3b0f27a71031b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine at m4x.org>
+Date: Thu, 30 Oct 2014 08:09:43 +0200
+Subject: Reduce number of libraries linked with pjmedia
+
+All libraries and applications were gratuitously linked against
+libgsm, libportaudio, libspeex and libspeexdsp but only pjmedia
+needs them.
+---
+ build.mak.in | 7 ++++---
+ pjmedia/build/Makefile | 3 +++
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/build.mak.in b/build.mak.in
- index 1add583..faa9c98 100644
++index 70c33c8..f467dd2 100644
+--- a/build.mak.in
++++ b/build.mak.in
+@@ -62,7 +62,7 @@ endif
+ ifneq (@ac_no_gsm_codec@,1)
+ ifeq (@ac_external_gsm@,1)
+ # External GSM library
+-APP_THIRD_PARTY_EXT += -lgsm
++PJMEDIA_CODEC_EXT += -lgsm
+ else
+ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec-$(LIB_SUFFIX)
+ ifeq ($(PJ_SHARED_LIBRARIES),)
+@@ -76,7 +76,8 @@ endif
+
+ ifneq (@ac_no_speex_codec@,1)
+ ifeq (@ac_external_speex@,1)
+-APP_THIRD_PARTY_EXT += -lspeex -lspeexdsp
++PJMEDIA_EXT += -lspeexdsp
++PJMEDIA_CODEC_EXT += -lspeex
+ else
+ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex-$(LIB_SUFFIX)
+ ifeq ($(PJ_SHARED_LIBRARIES),)
+@@ -111,7 +112,7 @@ endif
+ ifneq ($(findstring pa, at ac_pjmedia_snd@),)
+ ifeq (@ac_external_pa@,1)
+ # External PA
+-APP_THIRD_PARTY_EXT += -lportaudio
++PJMEDIA_AUDIODEV_EXT += -lportaudio
+ else
+ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio-$(LIB_SUFFIX)
+ ifeq ($(PJ_SHARED_LIBRARIES),)
+diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
+index 53faa2d..f7ad4cd 100644
+--- a/pjmedia/build/Makefile
++++ b/pjmedia/build/Makefile
+@@ -82,6 +82,7 @@ export PJMEDIA_CXXFLAGS += $(_CXXFLAGS)
+ export PJMEDIA_LDFLAGS += $(PJLIB_LDLIB) \
+ $(PJLIB_UTIL_LDLIB) \
+ $(PJNATH_LDLIB) \
++ $(PJMEDIA_EXT) \
+ $(_LDFLAGS)
+
+
+@@ -97,6 +98,7 @@ export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
+ export PJMEDIA_AUDIODEV_CXXFLAGS += $(_CXXFLAGS)
+ export PJMEDIA_AUDIODEV_LDFLAGS += $(PJMEDIA_LDLIB) \
+ $(PJLIB_LDLIB) \
++ $(PJMEDIA_AUDIODEV_EXT) \
+ $(_LDFLAGS)
+
+
+@@ -146,6 +148,7 @@ export PJMEDIA_CODEC_CXXFLAGS += $(_CXXFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \
+ $(ILBC_CFLAGS) $(IPP_CFLAGS) $(G7221_CFLAGS)
+ export PJMEDIA_CODEC_LDFLAGS += $(PJMEDIA_LDLIB) \
+ $(PJLIB_LDLIB) \
++ $(PJMEDIA_CODEC_EXT) \
+ $(_LDFLAGS)
+
+ ###############################################################################
diff --cc debian/patches/0004-Enable-building-python-bindings.patch
index e70dc50,0000000..8133050
mode 100644,000000..100644
--- a/debian/patches/0004-Enable-building-python-bindings.patch
+++ b/debian/patches/0004-Enable-building-python-bindings.patch
@@@ -1,21 -1,0 +1,21 @@@
- From 0fd2c8bedfaa6f3f9ba2f8e78987c85a1ab243c3 Mon Sep 17 00:00:00 2001
++From 92a6c0e16b6597c3959025a6375ce9bdac0669da Mon Sep 17 00:00:00 2001
+From: Tzafrir Cohen <tzafrir at debian.org>
+Date: Thu, 30 Oct 2014 08:09:44 +0200
+Subject: Enable building python bindings
+
+---
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile b/Makefile
+index 20af077..1dfac1f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,6 +4,7 @@ include build/host-$(HOST_NAME).mak
+ include version.mak
+
+ LIB_DIRS = pjlib/build pjlib-util/build pjnath/build third_party/build pjmedia/build pjsip/build
++EXTRA_DIRS = pjsip-apps/src/python
+ DIRS = $(LIB_DIRS) pjsip-apps/build $(EXTRA_DIRS)
+
+ ifdef MINSIZE
diff --cc debian/patches/0005-Remove-video-libs-dependency-for-pj-utils-and-pjnath.patch
index b4a037d,0000000..c8d5e30
mode 100644,000000..100644
--- a/debian/patches/0005-Remove-video-libs-dependency-for-pj-utils-and-pjnath.patch
+++ b/debian/patches/0005-Remove-video-libs-dependency-for-pj-utils-and-pjnath.patch
@@@ -1,52 -1,0 +1,52 @@@
- From c87b5207300ae325f8af1e4dbe4d12a17e0f2b2b Mon Sep 17 00:00:00 2001
++From 542a507b926af004908c5bf110508b6be4f9d4c8 Mon Sep 17 00:00:00 2001
+From: Tzafrir Cohen <tzafrir at debian.org>
+Date: Fri, 31 Oct 2014 23:14:49 +0200
+Subject: Remove video libs dependency for pj-utils and pjnath
+
+The video LD flags were duplicated on the app LD flags and the HOST
+LD flags. Remove them from the app LD flags. Remove HOST_LDFLAGS for
+some projects.
+---
+ build.mak.in | 1 -
+ pjlib-util/build/Makefile | 2 +-
+ pjnath/build/Makefile | 2 +-
+ 3 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/build.mak.in b/build.mak.in
- index faa9c98..5c4fc40 100644
++index f467dd2..9cd01b1 100644
+--- a/build.mak.in
++++ b/build.mak.in
- @@ -186,7 +186,6 @@ export APP_LDFLAGS := -L$(PJDIR)/pjlib/lib\
++@@ -199,7 +199,6 @@ export APP_LDFLAGS := -L$(PJDIR)/pjlib/lib\
+ -L$(PJDIR)/pjmedia/lib\
+ -L$(PJDIR)/pjsip/lib\
+ -L$(PJDIR)/third_party/lib\
+- $(PJ_VIDEO_LDFLAGS) \
+ @LDFLAGS@
+ export APP_LDXXFLAGS := $(APP_LDFLAGS)
+
+diff --git a/pjlib-util/build/Makefile b/pjlib-util/build/Makefile
+index cb601cb..a03a558 100644
+--- a/pjlib-util/build/Makefile
++++ b/pjlib-util/build/Makefile
+@@ -28,7 +28,7 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
+ $(CFLAGS) $(CC_INC)../include $(CC_INC)../../pjlib/include
+ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+ $(HOST_CXXFLAGS) $(CXXFLAGS)
+-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
++export _LDFLAGS := $(CC_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+ $(APP_LDFLAGS) $(LDFLAGS)
+
+ ###############################################################################
+diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile
+index 1bc08b5..5f08a8a 100644
+--- a/pjnath/build/Makefile
++++ b/pjnath/build/Makefile
+@@ -30,7 +30,7 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
+ $(CC_INC)../../pjlib-util/include
+ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+ $(HOST_CXXFLAGS) $(CXXFLAGS)
+-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
++export _LDFLAGS := $(CC_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+ $(APP_LDFLAGS) $(LDFLAGS)
+
+ ###############################################################################
diff --cc debian/patches/0006-Reduce-linkage-of-unused-libraries.patch
index 89dd9c4,0000000..8e4b11f
mode 100644,000000..100644
--- a/debian/patches/0006-Reduce-linkage-of-unused-libraries.patch
+++ b/debian/patches/0006-Reduce-linkage-of-unused-libraries.patch
@@@ -1,142 -1,0 +1,142 @@@
- From b6c5de5dc60cef9462e9776b8bd23814e5eaa932 Mon Sep 17 00:00:00 2001
++From 3285ca07efc2314d9d01c3bcb791a1f38fc625c3 Mon Sep 17 00:00:00 2001
+From: Tzafrir Cohen <tzafrir at debian.org>
+Date: Thu, 13 Aug 2015 17:49:57 +0200
+Subject: Reduce linkage of unused libraries
+
+The following libraries: ffmpeg, v4l, opencore-amr and SDL are linked
+with all the libraries. But are only needed for a small part of them.
+
+Have them linked with the relevant ones explicitly.
+---
+ aconfigure.ac | 24 +++++++++++++++++++-----
+ build.mak.in | 5 +++++
+ pjlib-util/build/Makefile | 2 +-
+ pjmedia/build/Makefile | 1 +
+ pjnath/build/Makefile | 3 ++-
+ 5 files changed, 28 insertions(+), 7 deletions(-)
+
+diff --git a/aconfigure.ac b/aconfigure.ac
- index 214284d..c097d86 100644
++index 8990936..1f847fa 100644
+--- a/aconfigure.ac
++++ b/aconfigure.ac
+@@ -114,6 +114,11 @@ AC_CHECK_LIB(socket,puts)
+ AC_CHECK_LIB(rt,puts)
+ AC_CHECK_LIB(m,sin)
+ AC_SUBST(PJLIB_EXT)
++AC_SUBST(PJLIB_UTIL_EXT)
++AC_SUBST(PJMEDIA_EXT)
++AC_SUBST(PJMEDIA_CODEC_EXT)
++AC_SUBST(PJMEDIA_VIDEODEV_EXT)
++AC_SUBST(PJNATH_EXT)
+ AC_CHECK_LIB(uuid,uuid_generate,[PJLIB_EXT="-luuid $PJLIB_EXT"])
+ AC_CHECK_LIB(uuid,uuid_generate,[ac_has_uuid_lib=1])
+ AC_SEARCH_LIBS(gethostbyname,nsl)
- @@ -959,7 +964,9 @@ AC_ARG_ENABLE(sdl,
++@@ -1002,7 +1007,9 @@ AC_ARG_ENABLE(sdl,
+ ac_sdl_cflags=`$SDL_CONFIG --cflags`
+ ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags"
+ ac_sdl_ldflags=`$SDL_CONFIG --libs`
+- LIBS="$LIBS $ac_sdl_ldflags"
++ PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT $ac_sdl_ldflags"
++ PJMEDIA_VIDEODEV_EXT="$PJMEDIA_VIDEODEV_EXT $ac_sdl_ldflags"
++ PJNATH_EXT="$PJNATH_EXT $ac_sdl_ldflags"
+ else
+ AC_MSG_RESULT([Unsupported SDL version])
+ fi
- @@ -1098,7 +1105,11 @@ AC_ARG_ENABLE(ffmpeg,
++@@ -1141,7 +1148,11 @@ AC_ARG_ENABLE(ffmpeg,
+ [[#include <libavformat/avformat.h>]]
+ )
+
+- LIBS="$LIBS $ac_ffmpeg_ldflags"
++ PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT $ac_ffmpeg_ldflags"
++ PJMEDIA_EXT="$PJMEDIA_EXT $ac_ffmpeg_ldflags"
++ PJMEDIA_CODEC_EXT="$PJMEDIA_CODEC_EXT $ac_ffmpeg_ldflags"
++ # FIXME: only needs libavutil
++ PJNATH_EXT="$PJNATH_EXT $ac_ffmpeg_ldflags"
+ export PKG_CONFIG_PATH=$SAVED_PKG_CONFIG_PATH
+ ]
+ )
- @@ -1119,7 +1130,10 @@ AC_ARG_ENABLE(v4l2,
++@@ -1162,7 +1173,10 @@ AC_ARG_ENABLE(v4l2,
+ v4l2_open,
+ [ac_v4l2_cflags="-DPJMEDIA_VIDEO_DEV_HAS_V4L2=1"
+ ac_v4l2_ldflags="-lv4l2"
+- LIBS="$LIBS -lv4l2"
++ PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT -lv4l2"
++ PJMEDIA_VIDEODEV_EXT="$PJMEDIA_VIDEODEV_EXT -lv4l2"
++ PJNATH_EXT="$PJNATH_EXT -lv4l2"
++
+ ]
+ )
+ ])
- @@ -1697,7 +1711,7 @@ AC_ARG_ENABLE(opencore_amr,
++@@ -1664,7 +1678,7 @@ AC_ARG_ENABLE(opencore_amr,
+ AC_SUBST(opencore_amrnb_h_present)
+ AC_SUBST(opencore_amrnb_present)
+ AC_CHECK_HEADER(opencore-amrnb/interf_enc.h,[opencore_amrnb_h_present=1])
+- AC_CHECK_LIB(opencore-amrnb,Encoder_Interface_init,[opencore_amrnb_present=1 && LIBS="$LIBS -lopencore-amrnb"])
++ AC_CHECK_LIB(opencore-amrnb,Encoder_Interface_init,[opencore_amrnb_present=1 && PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT -lopencore-amrnb" && PJNATH_EXT="$PJNATH_EXT -lopencore-amrnb" ])
+ if test "x$opencore_amrnb_h_present" = "x1" -a "x$opencore_amrnb_present" = "x1"; then
+ AC_MSG_RESULT([OpenCORE AMR-NB library found, AMR-NB support enabled])
+ AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC,1)
- @@ -1711,7 +1725,7 @@ AC_ARG_ENABLE(opencore_amr,
++@@ -1678,7 +1692,7 @@ AC_ARG_ENABLE(opencore_amr,
+ AC_SUBST(opencore_amrwb_dec_present)
+ AC_CHECK_HEADER(vo-amrwbenc/enc_if.h,[opencore_amrwb_enc_h_present=1])
+ AC_CHECK_HEADER(opencore-amrwb/dec_if.h,[opencore_amrwb_dec_h_present=1])
+- AC_CHECK_LIB(opencore-amrwb,D_IF_init,[opencore_amrwb_dec_present=1 && LIBS="$LIBS -lopencore-amrwb"])
++ AC_CHECK_LIB(opencore-amrwb,D_IF_init,[opencore_amrwb_dec_present=1 && PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT -lopencore-amrnb" && PJNATH_EXT="$PJNATH_EXT -lopencore-amrwb" ])
+ AC_CHECK_LIB(vo-amrwbenc,E_IF_init,[opencore_amrwb_enc_present=1 && LIBS="$LIBS -lvo-amrwbenc"])
+ if test "x$opencore_amrwb_enc_h_present" = "x1" -a "x$opencore_amrwb_dec_h_present" = "x1" -a "x$opencore_amrwb_enc_present" = "x1" -a "x$opencore_amrwb_dec_present" = "x1"; then
+ AC_MSG_RESULT([OpenCORE AMR-WB library found, AMR-WB support enabled])
+diff --git a/build.mak.in b/build.mak.in
- index 5c4fc40..4555ae9 100644
++index 9cd01b1..27d1517 100644
+--- a/build.mak.in
++++ b/build.mak.in
+@@ -29,6 +29,11 @@ export APP_THIRD_PARTY_LIBS :=
+ export APP_THIRD_PARTY_LIB_FILES :=
+
+ PJLIB_EXT = @PJLIB_EXT@
++PJLIB_UTIL_EXT = @PJLIB_UTIL_EXT@
++PJMEDIA_EXT = @PJMEDIA_EXT@
++PJMEDIA_CODEC_EXT = @PJMEDIA_CODEC_EXT@
++PJMEDIA_VIDEODEV_EXT = @PJMEDIA_VIDEODEV_EXT@
++PJNATH_EXT = @PJNATH_EXT@
+
+ ifeq (@ac_external_srtp@,1)
+ # External SRTP library
+diff --git a/pjlib-util/build/Makefile b/pjlib-util/build/Makefile
+index a03a558..56bc055 100644
+--- a/pjlib-util/build/Makefile
++++ b/pjlib-util/build/Makefile
+@@ -43,7 +43,7 @@ export PJLIB_UTIL_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
+ stun_simple_client.o xml.o
+ export PJLIB_UTIL_CFLAGS += $(_CFLAGS)
+ export PJLIB_UTIL_CXXFLAGS += $(_CXXFLAGS)
+-export PJLIB_UTIL_LDFLAGS += $(PJLIB_LDLIB) $(_LDFLAGS)
++export PJLIB_UTIL_LDFLAGS += $(PJLIB_LDLIB) $(PJLIB_UTIL_EXT) $(_LDFLAGS)
+
+ ###############################################################################
+ # Defines for building test application
+diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
+index f7ad4cd..4d24cf9 100644
+--- a/pjmedia/build/Makefile
++++ b/pjmedia/build/Makefile
+@@ -83,6 +83,7 @@ export PJMEDIA_LDFLAGS += $(PJLIB_LDLIB) \
+ $(PJLIB_UTIL_LDLIB) \
+ $(PJNATH_LDLIB) \
+ $(PJMEDIA_EXT) \
++ $(PJMEDIA_VIDEODEV_EXT) \
+ $(_LDFLAGS)
+
+
+diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile
+index 5f08a8a..8fb976d 100644
+--- a/pjnath/build/Makefile
++++ b/pjnath/build/Makefile
+@@ -43,7 +43,8 @@ export PJNATH_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
+ stun_transaction.o turn_session.o turn_sock.o
+ export PJNATH_CFLAGS += $(_CFLAGS)
+ export PJNATH_CXXFLAGS += $(_CXXFLAGS)
+-export PJNATH_LDFLAGS += $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS)
++export PJNATH_LDFLAGS += $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(PJNATH_EXT) \
++ $(_LDFLAGS)
+
+ ###############################################################################
+ # Defines for building test application
diff --cc debian/patches/0007-add-v5-suffix-to-soname-of-libpjsua2-2.patch
index 04eb35b,0000000..34aa40f
mode 100644,000000..100644
--- a/debian/patches/0007-add-v5-suffix-to-soname-of-libpjsua2-2.patch
+++ b/debian/patches/0007-add-v5-suffix-to-soname-of-libpjsua2-2.patch
@@@ -1,40 -1,0 +1,40 @@@
- From 163e66a1ce3475d66354f9a20bec250245661d7e Mon Sep 17 00:00:00 2001
++From ef057592fc4cef48537faedb9a356b8bf968dde0 Mon Sep 17 00:00:00 2001
+From: Tzafrir Cohen <tzafrir at debian.org>
+Date: Thu, 5 Nov 2015 04:55:06 +0200
+Subject: add 'v5' suffix to soname of libpjsua2-2
+
+pjsua2 is a C++ library and its SONAME needs to be bumped as its ABI has
+changed with GCC 5 (using C++11 ABI).
+
+Remove this patch once the ABI for all libraries has been bumped.
+---
+ build.mak.in | 2 +-
+ pjsip/build/Makefile | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build.mak.in b/build.mak.in
- index 4555ae9..93d3ff7 100644
++index 27d1517..cf09e4a 100644
+--- a/build.mak.in
++++ b/build.mak.in
- @@ -252,7 +252,7 @@ export ADD_LIB_FILES := $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX).$(PJ_VERSIO
++@@ -265,7 +265,7 @@ export ADD_LIB_FILES := $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX).$(PJ_VERSIO
+
+ APP_LIB_FILES += $(ADD_LIB_FILES)
+
+-APP_LIBXX_FILES += $(PJ_DIR)/pjsip/lib/libpjsua2.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsua2.$(SHLIB_SUFFIX) \
++APP_LIBXX_FILES += $(PJ_DIR)/pjsip/lib/libpjsua2.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR)v5 $(PJ_DIR)/pjsip/lib/libpjsua2.$(SHLIB_SUFFIX) \
+ $(ADD_LIB_FILES)
+ endif
+
+diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile
+index a9bd5ad..eef4176 100644
+--- a/pjsip/build/Makefile
++++ b/pjsip/build/Makefile
+@@ -34,7 +34,7 @@ export PJSIP_SIMPLE_SHLIB := $(PJSIP_SIMPLE_SONAME).$(PJ_VERSION_MAJOR)
+ export PJSUA_LIB_SONAME := libpjsua.$(SHLIB_SUFFIX)
+ export PJSUA_LIB_SHLIB := $(PJSUA_LIB_SONAME).$(PJ_VERSION_MAJOR)
+ export PJSUA2_LIB_SONAME := libpjsua2.$(SHLIB_SUFFIX)
+-export PJSUA2_LIB_SHLIB := $(PJSUA2_LIB_SONAME).$(PJ_VERSION_MAJOR)
++export PJSUA2_LIB_SHLIB := $(PJSUA2_LIB_SONAME).$(PJ_VERSION_MAJOR)v5
+ endif
+
+ ###############################################################################
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/pjproject.git
More information about the Pkg-voip-commits
mailing list