[Pkg-voip-commits] [pjproject] 13/14: merge patched into master
tzafrir at debian.org
tzafrir at debian.org
Mon Aug 17 10:41:27 UTC 2015
This is an automated email from the git hooks/post-receive script.
tzafrir pushed a commit to branch master-broken
in repository pjproject.
commit 38289ad559d852757b02edd46f7126f3671a4e68
Merge: e581878 df5f5ff
Author: Tzafrir Cohen <tzafrir at debian.org>
Date: Fri Aug 14 23:04:11 2015 +0200
merge patched into master
aconfigure | 73 +---
aconfigure.ac | 28 +-
build.mak.in | 6 +-
build/rules.mak | 13 +-
config.sub | 4 +-
configure-android | 65 +++-
configure-iphone | 4 +-
debian/.git-dpm | 6 +-
...1-Remove-pointless-linking-with-libasound.patch | 6 +-
...uce-number-of-libraries-linked-with-pjlib.patch | 12 +-
...e-number-of-libraries-linked-with-pjmedia.patch | 8 +-
.../0004-Enable-building-python-bindings.patch | 2 +-
.../0005-CODEC_ID_-changed-to-AV_CODEC_ID_.patch | 2 +-
...o-libs-dependency-for-pj-utils-and-pjnath.patch | 4 +-
... 0007-Reduce-linkage-of-unused-libraries.patch} | 18 +-
...Use-the-OpenSSL-RNG-if-available-for-SRTP.patch | 62 ---
debian/patches/series | 3 +-
pjlib-util/src/pjlib-util/cli_console.c | 4 +-
pjlib-util/src/pjlib-util/cli_telnet.c | 4 +-
pjlib-util/src/pjlib-util/srv_resolver.c | 6 +-
pjlib/include/pj/config.h | 29 +-
pjlib/include/pj/config_site_sample.h | 3 +
pjlib/include/pj/ssl_sock.h | 17 +-
pjlib/src/pj/activesock.c | 7 +-
pjlib/src/pj/addr_resolv_sock.c | 12 +-
pjlib/src/pj/sock_common.c | 4 +-
pjlib/src/pj/ssl_sock_ossl.c | 90 ++++-
pjlib/src/pjlib-test/ssl_sock.c | 4 +-
pjmedia/build/Makefile | 3 +-
pjmedia/include/pjmedia-audiodev/audiodev.h | 8 +-
pjmedia/include/pjmedia-codec/amr_helper.h | 7 +-
pjmedia/include/pjmedia-videodev/avi_dev.h | 8 +-
pjmedia/include/pjmedia-videodev/config.h | 21 +-
pjmedia/include/pjmedia-videodev/opengl_dev.h | 8 +-
pjmedia/include/pjmedia-videodev/videodev.h | 13 +-
pjmedia/include/pjmedia/sdp_neg.h | 11 +-
pjmedia/src/pjmedia-audiodev/android_jni_dev.c | 4 +-
pjmedia/src/pjmedia-audiodev/coreaudio_dev.m | 36 +-
pjmedia/src/pjmedia-codec/l16.c | 4 +-
pjmedia/src/pjmedia-codec/opencore_amr.c | 28 +-
pjmedia/src/pjmedia-codec/silk.c | 4 +-
pjmedia/src/pjmedia-videodev/android_dev.c | 100 ++++-
pjmedia/src/pjmedia-videodev/ios_dev.m | 176 +++++++--
pjmedia/src/pjmedia-videodev/util.c | 365 ++++++++++++++++++
pjmedia/src/pjmedia-videodev/util.h | 96 +++++
pjmedia/src/pjmedia-videodev/videodev.c | 6 +-
pjmedia/src/pjmedia/sdp.c | 6 +-
pjmedia/src/pjmedia/sdp_neg.c | 41 +-
pjmedia/src/pjmedia/sound_legacy.c | 8 +-
pjmedia/src/pjmedia/sound_port.c | 16 +-
pjmedia/src/pjmedia/stream.c | 16 +-
pjmedia/src/pjmedia/transport_srtp.c | 22 +-
pjmedia/src/pjmedia/vid_port.c | 46 ++-
pjmedia/src/pjmedia/vid_stream.c | 17 +-
pjnath/src/pjnath/ice_session.c | 8 +-
pjnath/src/pjnath/ice_strans.c | 33 +-
pjnath/src/pjnath/stun_transaction.c | 4 +-
pjsip-apps/build/Makefile | 28 +-
.../src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj | 152 ++++----
.../src/pjsua/ios/ipjsua/ipjsuaAppDelegate.m | 53 ++-
pjsip-apps/src/pjsua/pjsua_app.c | 20 +-
pjsip-apps/src/pjsua/pjsua_app_config.c | 13 +-
pjsip-apps/src/pjsua/pjsua_app_legacy.c | 25 +-
pjsip-apps/src/samples/streamutil.c | 3 +-
pjsip-apps/src/samples/util.h | 4 +-
pjsip-apps/src/swig/importsym.py | 4 +-
.../src/swig/java/android/AndroidManifest.xml | 1 +
.../swig/java/android/res/layout/activity_call.xml | 61 ++-
.../src/swig/java/android/res/values/strings.xml | 3 +-
.../src/org/pjsip/pjsua2/app/CallActivity.java | 193 +++++++++-
.../android/src/org/pjsip/pjsua2/app/MyApp.java | 4 +-
pjsip-apps/src/swig/pjsua2.i | 14 +-
pjsip-apps/src/swig/symbols.i | 8 +-
pjsip-apps/src/swig/symbols.lst | 4 +-
pjsip/build/Makefile | 2 +-
pjsip/include/pjsip-ua/sip_inv.h | 6 +-
pjsip/include/pjsip/sip_config.h | 72 +++-
pjsip/include/pjsip/sip_transport.h | 63 ++-
pjsip/include/pjsip/sip_transport_tls.h | 3 +-
pjsip/include/pjsua-lib/pjsua.h | 101 ++++-
pjsip/include/pjsua-lib/pjsua_internal.h | 8 +-
pjsip/include/pjsua2/endpoint.hpp | 67 +++-
pjsip/include/pjsua2/media.hpp | 427 ++++++++++++++++++++-
pjsip/src/pjsip-ua/sip_inv.c | 138 ++++---
pjsip/src/pjsip/sip_config.c | 12 +-
pjsip/src/pjsip/sip_multipart.c | 8 +-
pjsip/src/pjsip/sip_transaction.c | 29 +-
pjsip/src/pjsip/sip_transport.c | 54 ++-
pjsip/src/pjsip/sip_transport_tcp.c | 82 +++-
pjsip/src/pjsip/sip_transport_tls.c | 37 +-
pjsip/src/pjsua-lib/pjsua_acc.c | 11 +-
pjsip/src/pjsua-lib/pjsua_call.c | 34 +-
pjsip/src/pjsua-lib/pjsua_core.c | 25 +-
pjsip/src/pjsua-lib/pjsua_media.c | 175 +++++++--
pjsip/src/pjsua-lib/pjsua_vid.c | 149 ++++++-
pjsip/src/pjsua2/endpoint.cpp | 104 ++++-
pjsip/src/pjsua2/media.cpp | 407 +++++++++++++++++++-
.../{iphone.xml.template => android.xml.template} | 8 +-
...{iphone.xml.template => android64.xml.template} | 8 +-
tests/automated/gnu-ipp.xml.template | 2 +-
tests/automated/gnu.xml.template | 2 +-
tests/automated/iphone.xml.template | 6 +-
.../{iphone.xml.template => iphone64.xml.template} | 6 +-
tests/pjsua/inc_cfg.py | 21 +-
tests/pjsua/mod_call.py | 30 +-
tests/pjsua/mod_sipp.py | 10 +-
tests/pjsua/run.py | 125 ++++--
tests/pjsua/scripts-call/300_ice_1_1.py | 6 +-
tests/pjsua/scripts-call/305_ice_comp_1_2.py | 6 +-
tests/pjsua/scripts-call/305_ice_comp_2_1.py | 6 +-
tests/pjsua/scripts-sendto/200_ice_success_2.py | 5 +-
tests/pjsua/scripts-sendto/200_ice_success_3.py | 5 +-
tests/pjsua/scripts-sendto/200_ice_success_4.py | 5 +-
.../scripts-sipp/uac-reinvite-bad-via-branch.xml | 58 ++-
.../scripts-sipp/uac-ticket-1864-scenario1.py | 7 +
...ia-branch.xml => uac-ticket-1864-scenario1.xml} | 399 ++++++++++---------
.../scripts-sipp/uac-ticket-1864-scenario2.py | 7 +
...ia-branch.xml => uac-ticket-1864-scenario2.xml} | 400 ++++++++++---------
.../uac-ticket-1866-reinv-after-failed-nego.py | 7 +
...=> uac-ticket-1866-reinv-after-failed-nego.xml} | 391 ++++++++++---------
.../scripts-sipp/uas-reinv-with-less-media.py | 6 +-
tests/pjsua/tools/Makefile | 2 +-
tests/pjsua/tools/cmp_wav.c | 9 +-
third_party/build/gsm/Makefile | 2 +-
third_party/build/gsm/config.h | 5 +
third_party/build/speex/config.h | 5 +
third_party/gsm/src/gsm_create.c | 4 +-
version.mak | 4 +-
128 files changed, 4446 insertions(+), 1326 deletions(-)
diff --cc debian/.git-dpm
index 831e545,0000000..cf493df
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
- 4761f0bc6664cb4f6e640257653f67cd66f33c22
- 4761f0bc6664cb4f6e640257653f67cd66f33c22
- def680d5e127e3964d3b965931d9588a6b87170d
++df5f5ffdfa45cc3975c18279ac0b44212b00370f
++df5f5ffdfa45cc3975c18279ac0b44212b00370f
++8bc494943161dfa21ff5d95e9ec78efd4f35e408
+8bc494943161dfa21ff5d95e9ec78efd4f35e408
+pjproject_2.4.5~dfsg.orig.tar.bz2
+be4b2b7739c3d02d6265a4cc2ca0661df38dd151
+4449242
diff --cc debian/patches/0001-Remove-pointless-linking-with-libasound.patch
index 959aa73,0000000..34a05a1
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,41 -1,0 +1,41 @@@
- From d5a00611ee76e015fcb89b019cbecd4aab77d84b Mon Sep 17 00:00:00 2001
++From 47cd036dddae3bac96e78fef557b9859c44427b6 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 | 2 --
+ aconfigure.ac | 1 -
+ 2 files changed, 3 deletions(-)
+
+diff --git a/aconfigure b/aconfigure
- index 084ab0a..83d85a1 100755
++index 83fc5d7..42c5da6 100755
+--- a/aconfigure
++++ b/aconfigure
+@@ -6102,8 +6102,6 @@ $as_echo "Checking sound device backend... null sound" >&6; }
+ if test "x$ac_cv_header_alsa_version_h" = xyes; then :
+ ac_pa_use_alsa=1
+
+- LIBS="$LIBS -lasound"
+-
+ else
+ ac_pa_use_alsa=0
+
+diff --git a/aconfigure.ac b/aconfigure.ac
- index 67cf24f..3b9f5e5 100644
++index 179dfac..e86e27c 100644
+--- a/aconfigure.ac
++++ b/aconfigure.ac
+@@ -654,7 +654,6 @@ else
+ ac_pjmedia_snd=pa_unix
+ AC_CHECK_HEADER(alsa/version.h,
+ [AC_SUBST(ac_pa_use_alsa,1)
+- LIBS="$LIBS -lasound"
+ ],
+ [AC_SUBST(ac_pa_use_alsa,0)])
+ AC_MSG_RESULT([Checking sound device backend... unix])
diff --cc debian/patches/0002-Reduce-number-of-libraries-linked-with-pjlib.patch
index 707980f,0000000..b077aa5
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,104 -1,0 +1,104 @@@
- From 3afb4b016a50df786ee1f18af2e0f29e413b664a Mon Sep 17 00:00:00 2001
++From 0498e9e2daf6f160258b13de4ee13eb94b747195 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 | 7 ++++---
+ aconfigure.ac | 7 ++++---
+ build.mak.in | 2 ++
+ pjlib/build/Makefile | 2 +-
+ 4 files changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/aconfigure b/aconfigure
- index 83d85a1..ea868d2 100755
++index 42c5da6..eb50910 100755
+--- a/aconfigure
++++ b/aconfigure
+@@ -620,6 +620,7 @@ ac_includes_default="\
+
+ ac_subst_vars='LTLIBOBJS
+ LIBOBJS
++PJLIB_EXT
+ ac_main_obj
+ ac_host
+ ac_linux_poll
+@@ -4213,7 +4214,7 @@ if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then :
+ #define HAVE_LIBUUID 1
+ _ACEOF
+
+- LIBS="-luuid $LIBS"
++ PJLIB_EXT="-luuid $PJLIB_EXT"
+
+ fi
+
+@@ -7705,7 +7706,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_ERR_load_BIO_strings" >&5
+ $as_echo "$ac_cv_lib_crypto_ERR_load_BIO_strings" >&6; }
+ if test "x$ac_cv_lib_crypto_ERR_load_BIO_strings" = xyes; then :
- - libcrypto_present=1 && LIBS="-lcrypto -ldl -lz $LIBS"
++- libcrypto_present=1 && LIBS="-lcrypto $LIBS"
++ libcrypto_present=1 && PJLIB_EXT="-lcrypto $PJLIB_EXT"
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
+@@ -7745,7 +7746,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+ $as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+ if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
+- libssl_present=1 && LIBS="-lssl $LIBS"
++ libssl_present=1 && PJLIB_EXT="-lssl $PJLIB_EXT"
+ fi
+
+ if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then
+diff --git a/aconfigure.ac b/aconfigure.ac
- index 3b9f5e5..9d9bc26 100644
++index e86e27c..72446dd 100644
+--- a/aconfigure.ac
++++ b/aconfigure.ac
+@@ -114,7 +114,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)
+
+@@ -1532,8 +1533,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 -ldl -lz $LIBS"],,-ldl -lz)
++- 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 8a986d7..a63808d 100644
++index 074977d..1add583 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 3fa858f,0000000..3f4d6c9
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 a78635de45e7ef35e45c86f3549c254674c8ac14 Mon Sep 17 00:00:00 2001
++From 8cc3c5d59c3f19f4038fad879381cd383b7cd659 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 a63808d..d886df5 100644
++index 1add583..faa9c98 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 54395c3..fe6b8a1 100644
++index 702efdc..340bfc4 100644
+--- a/pjmedia/build/Makefile
++++ b/pjmedia/build/Makefile
+@@ -84,6 +84,7 @@ export PJMEDIA_LDFLAGS += $(PJMEDIA_VIDEODEV_LDLIB) \
+ $(PJLIB_LDLIB) \
+ $(PJLIB_UTIL_LDLIB) \
+ $(PJNATH_LDLIB) \
++ $(PJMEDIA_EXT) \
+ $(_LDFLAGS)
+
+
+@@ -98,6 +99,7 @@ export PJMEDIA_AUDIODEV_OBJS += audiodev.o audiotest.o errno.o \
+ export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
+ export PJMEDIA_AUDIODEV_CXXFLAGS += $(_CXXFLAGS)
+ export PJMEDIA_AUDIODEV_LDFLAGS += $(PJLIB_LDLIB) \
++ $(PJMEDIA_AUDIODEV_EXT) \
+ $(_LDFLAGS)
+
+
- @@ -145,6 +147,7 @@ export PJMEDIA_CODEC_CXXFLAGS += $(_CXXFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \
++@@ -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 80ce355,0000000..3aa0bea
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 fae86f07a5971338af6788d98009e12324f8a509 Mon Sep 17 00:00:00 2001
++From 8b0626ecfcfcfa7ab676e5bec7a3623a4f347d9f 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-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
index 161c097,0000000..9d26fd6
mode 100644,000000..100644
--- a/debian/patches/0005-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
+++ b/debian/patches/0005-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
@@@ -1,36 -1,0 +1,36 @@@
- From 4747bca13fdaa4945d5953d651b5f44efd9d9e13 Mon Sep 17 00:00:00 2001
++From 054f4253a2f2584d134997ed2fc5814226bd5a64 Mon Sep 17 00:00:00 2001
+From: Tzafrir Cohen <tzafrir at debian.org>
+Date: Thu, 30 Oct 2014 09:15:03 +0200
+Subject: CODEC_ID_* changed to AV_CODEC_ID_*
+
+---
+ pjmedia/src/pjmedia/ffmpeg_util.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/pjmedia/src/pjmedia/ffmpeg_util.c b/pjmedia/src/pjmedia/ffmpeg_util.c
+index ba01a3c..300bad3 100644
+--- a/pjmedia/src/pjmedia/ffmpeg_util.c
++++ b/pjmedia/src/pjmedia/ffmpeg_util.c
+@@ -68,14 +68,14 @@ static const struct ffmpeg_codec_table_t
+ unsigned codec_id;
+ } ffmpeg_codec_table[] =
+ {
+- {PJMEDIA_FORMAT_H261, CODEC_ID_H261},
+- {PJMEDIA_FORMAT_H263, CODEC_ID_H263},
+- {PJMEDIA_FORMAT_H263P, CODEC_ID_H263P},
+- {PJMEDIA_FORMAT_H264, CODEC_ID_H264},
+- {PJMEDIA_FORMAT_MPEG1VIDEO, CODEC_ID_MPEG1VIDEO},
+- {PJMEDIA_FORMAT_MPEG2VIDEO, CODEC_ID_MPEG2VIDEO},
+- {PJMEDIA_FORMAT_MPEG4, CODEC_ID_MPEG4},
+- {PJMEDIA_FORMAT_MJPEG, CODEC_ID_MJPEG}
++ {PJMEDIA_FORMAT_H261, AV_CODEC_ID_H261},
++ {PJMEDIA_FORMAT_H263, AV_CODEC_ID_H263},
++ {PJMEDIA_FORMAT_H263P, AV_CODEC_ID_H263P},
++ {PJMEDIA_FORMAT_H264, AV_CODEC_ID_H264},
++ {PJMEDIA_FORMAT_MPEG1VIDEO, AV_CODEC_ID_MPEG1VIDEO},
++ {PJMEDIA_FORMAT_MPEG2VIDEO, AV_CODEC_ID_MPEG2VIDEO},
++ {PJMEDIA_FORMAT_MPEG4, AV_CODEC_ID_MPEG4},
++ {PJMEDIA_FORMAT_MJPEG, AV_CODEC_ID_MJPEG}
+ };
+
+ static int pjmedia_ffmpeg_ref_cnt;
diff --cc debian/patches/0006-Remove-video-libs-dependency-for-pj-utils-and-pjnath.patch
index dd28487,0000000..808eb21
mode 100644,000000..100644
--- a/debian/patches/0006-Remove-video-libs-dependency-for-pj-utils-and-pjnath.patch
+++ b/debian/patches/0006-Remove-video-libs-dependency-for-pj-utils-and-pjnath.patch
@@@ -1,52 -1,0 +1,52 @@@
- From ba4f81c07541cae77808b589b687ac9f98c4968d Mon Sep 17 00:00:00 2001
++From 93d80f235e2aaaf50d467b62fc111c866578ab23 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 d886df5..d8c7a55 100644
++index faa9c98..5c4fc40 100644
+--- a/build.mak.in
++++ b/build.mak.in
+@@ -186,7 +186,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/0007-Reduce-linkage-of-unused-libraries.patch
index f5f9c87,0000000..102deb3
mode 100644,000000..100644
--- a/debian/patches/0007-Reduce-linkage-of-unused-libraries.patch
+++ b/debian/patches/0007-Reduce-linkage-of-unused-libraries.patch
@@@ -1,211 -1,0 +1,211 @@@
- From 4761f0bc6664cb4f6e640257653f67cd66f33c22 Mon Sep 17 00:00:00 2001
++From df5f5ffdfa45cc3975c18279ac0b44212b00370f 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 | 22 ++++++++++++++++++----
+ aconfigure.ac | 24 +++++++++++++++++++-----
+ build.mak.in | 5 +++++
+ pjlib-util/build/Makefile | 2 +-
+ pjmedia/build/Makefile | 1 +
+ pjnath/build/Makefile | 3 ++-
+ 6 files changed, 46 insertions(+), 11 deletions(-)
+
+diff --git a/aconfigure b/aconfigure
- index ea868d2..840c6c2 100755
++index eb50910..cbebe1c 100755
+--- a/aconfigure
++++ b/aconfigure
+@@ -621,6 +621,11 @@ ac_includes_default="\
+ ac_subst_vars='LTLIBOBJS
+ LIBOBJS
+ PJLIB_EXT
++PJLIB_UTIL_EXT
++PJMEDIA_EXT
++PJMEDIA_CODEC_EXT
++PJMEDIA_VIDEODEV_EXT
++PJNATH_EXT
+ ac_main_obj
+ ac_host
+ ac_linux_poll
+@@ -6647,7 +6652,9 @@ $as_echo "not found" >&6; }
+ 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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Unsupported SDL version" >&5
+ $as_echo "Unsupported SDL version" >&6; }
+@@ -7050,7 +7057,11 @@ fi
+
+ fi
+
+- 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
+
+
+@@ -7108,7 +7119,9 @@ $as_echo "$ac_cv_lib_v4l2_v4l2_open" >&6; }
+ if test "x$ac_cv_lib_v4l2_v4l2_open" = xyes; then :
+ 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"
+
+
+ fi
- @@ -7921,6 +7934,7 @@ fi
++@@ -7878,6 +7891,7 @@ fi
+ $as_echo "$ac_cv_lib_opencore_amrnb_Encoder_Interface_init" >&6; }
+ if test "x$ac_cv_lib_opencore_amrnb_Encoder_Interface_init" = xyes; then :
+ opencore_amrnb_present=1 && LIBS="$LIBS -lopencore-amrnb"
++ opencore_amrnb_present=1 && PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT -lopencore-amrnb" && PJNATH_EXT="$PJNATH_EXT -lopencore-amrnb"
+ fi
+
+ if test "x$opencore_amrnb_h_present" = "x1" -a "x$opencore_amrnb_present" = "x1"; then
- @@ -7986,7 +8000,7 @@ fi
++@@ -7943,7 +7957,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opencore_amrwb_D_IF_init" >&5
+ $as_echo "$ac_cv_lib_opencore_amrwb_D_IF_init" >&6; }
+ if test "x$ac_cv_lib_opencore_amrwb_D_IF_init" = xyes; then :
+- opencore_amrwb_dec_present=1 && LIBS="$LIBS -lopencore-amrwb"
++ opencore_amrwb_dec_present=1 && PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT -lopencore-amrnb" && PJNATH_EXT="$PJNATH_EXT -lopencore-amrwb"
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for E_IF_init in -lvo-amrwbenc" >&5
+diff --git a/aconfigure.ac b/aconfigure.ac
- index 9d9bc26..876af02 100644
++index 72446dd..db287a1 100644
+--- a/aconfigure.ac
++++ b/aconfigure.ac
+@@ -115,6 +115,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)
+@@ -951,7 +956,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
+@@ -1088,7 +1095,11 @@ AC_ARG_ENABLE(ffmpeg,
+
+ fi
+
+- 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
+ ]
+ )
+@@ -1109,7 +1120,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"
++
+ ]
+ )
+ ])
- @@ -1615,7 +1629,7 @@ AC_ARG_ENABLE(opencore_amr,
++@@ -1611,7 +1625,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)
- @@ -1629,7 +1643,7 @@ AC_ARG_ENABLE(opencore_amr,
++@@ -1625,7 +1639,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 d8c7a55..615cbd5 100644
++index 5c4fc40..4555ae9 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 fe6b8a1..926da47 100644
++index 340bfc4..83d852a 100644
+--- a/pjmedia/build/Makefile
++++ b/pjmedia/build/Makefile
+@@ -85,6 +85,7 @@ export PJMEDIA_LDFLAGS += $(PJMEDIA_VIDEODEV_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/series
index fd3704e,0000000..faf728e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,0 +1,7 @@@
+0001-Remove-pointless-linking-with-libasound.patch
+0002-Reduce-number-of-libraries-linked-with-pjlib.patch
+0003-Reduce-number-of-libraries-linked-with-pjmedia.patch
+0004-Enable-building-python-bindings.patch
+0005-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
+0006-Remove-video-libs-dependency-for-pj-utils-and-pjnath.patch
- 0007-Use-the-OpenSSL-RNG-if-available-for-SRTP.patch
- 0008-Reduce-linkage-of-unused-libraries.patch
++0007-Reduce-linkage-of-unused-libraries.patch
--
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