[Pkg-voip-commits] [pjproject] 08/11: merge patched into master
tzafrir at debian.org
tzafrir at debian.org
Wed Jun 17 05:29:26 UTC 2015
This is an automated email from the git hooks/post-receive script.
tzafrir pushed a commit to branch master
in repository pjproject.
commit f4e361fad0f3334cd1b30b9f5b6049f3410470ce
Merge: 0adae0f ba4f81c
Author: Tzafrir Cohen <tzafrir at debian.org>
Date: Tue Jun 16 06:53:05 2015 +0300
merge patched into master
aconfigure | 48 +-
aconfigure.ac | 25 +-
build.mak.in | 3 +
configure-android | 2 +-
debian/.git-dpm | 6 +-
...1-Remove-pointless-linking-with-libasound.patch | 8 +-
...uce-number-of-libraries-linked-with-pjlib.patch | 32 +-
...e-number-of-libraries-linked-with-pjmedia.patch | 4 +-
.../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 | 6 +-
pjlib-util/src/pjlib-util/srv_resolver.c | 12 +-
pjlib-util/src/pjlib-util/stun_simple_client.c | 5 +-
pjlib/include/pj/config.h | 10 +-
pjlib/include/pj/config_site_sample.h | 4 +-
pjlib/include/pj/lock.h | 23 +-
pjlib/include/pj/os.h | 6 +-
pjlib/include/pj/pool_alt.h | 5 +-
pjlib/include/pj/ssl_sock.h | 86 +-
pjlib/src/pj/activesock.c | 6 +-
pjlib/src/pj/ioqueue_select.c | 7 +-
pjlib/src/pj/lock.c | 58 +-
pjlib/src/pj/os_core_unix.c | 24 +-
pjlib/src/pj/ssl_sock_ossl.c | 114 +-
pjlib/src/pj/ssl_sock_symbian.cpp | 24 +-
pjlib/src/pjlib-test/exception.c | 6 +-
pjmedia/build/Jbtest.dat | 18 +-
pjmedia/build/os-auto.mak.in | 20 +-
pjmedia/include/pjmedia-codec/amr_helper.h | 8 +-
pjmedia/include/pjmedia-codec/g7221.h | 5 +-
pjmedia/include/pjmedia-videodev/config.h | 33 +-
pjmedia/include/pjmedia-videodev/opengl_dev.h | 9 +-
pjmedia/include/pjmedia-videodev/videodev.h | 19 +-
pjmedia/include/pjmedia/config.h | 23 +-
pjmedia/include/pjmedia/format.h | 10 +-
pjmedia/include/pjmedia/sound_port.h | 34 +-
pjmedia/src/pjmedia-audiodev/android_jni_dev.c | 26 +-
pjmedia/src/pjmedia-audiodev/bdimad_dev.c | 39 +-
pjmedia/src/pjmedia-audiodev/opensl_dev.c | 8 +-
pjmedia/src/pjmedia-audiodev/wmme_dev.c | 19 +-
pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c | 4 +-
pjmedia/src/pjmedia-codec/g7221.c | 44 +-
pjmedia/src/pjmedia-codec/ipp_codecs.c | 5 +-
pjmedia/src/pjmedia-codec/l16.c | 3 +-
pjmedia/src/pjmedia-codec/opencore_amr.c | 10 +-
pjmedia/src/pjmedia-codec/openh264.cpp | 17 +-
pjmedia/src/pjmedia-codec/passthrough.c | 5 +-
pjmedia/src/pjmedia-codec/silk.c | 7 +-
pjmedia/src/pjmedia-codec/speex_codec.c | 6 +-
pjmedia/src/pjmedia-videodev/android/PjCamera.java | 210 ++++
.../src/pjmedia-videodev/android/PjCameraInfo.java | 110 ++
pjmedia/src/pjmedia-videodev/android_dev.c | 1123 ++++++++++++++++++++
pjmedia/src/pjmedia-videodev/android_opengl.c | 626 +++++++++++
pjmedia/src/pjmedia-videodev/colorbar_dev.c | 89 +-
pjmedia/src/pjmedia-videodev/dshow_dev.c | 88 +-
pjmedia/src/pjmedia-videodev/ios_dev.m | 265 +++--
pjmedia/src/pjmedia-videodev/ios_opengl_dev.m | 245 ++---
pjmedia/src/pjmedia-videodev/opengl_dev.c | 98 +-
pjmedia/src/pjmedia-videodev/v4l2_dev.c | 93 +-
pjmedia/src/pjmedia-videodev/videodev.c | 39 +-
pjmedia/src/pjmedia/avi_player.c | 5 +-
pjmedia/src/pjmedia/converter_libyuv.c | 14 +-
pjmedia/src/pjmedia/echo_speex.c | 12 +-
pjmedia/src/pjmedia/g711.c | 3 +-
pjmedia/src/pjmedia/sdp_neg.c | 13 +-
pjmedia/src/pjmedia/sound_port.c | 29 +-
pjmedia/src/pjmedia/splitcomb.c | 4 +-
pjmedia/src/pjmedia/stream.c | 3 +-
pjmedia/src/pjmedia/stream_info.c | 28 +-
pjmedia/src/pjmedia/transport_ice.c | 6 +-
pjmedia/src/pjmedia/vid_codec_util.c | 20 +-
pjmedia/src/pjmedia/vid_port.c | 368 ++++++-
pjmedia/src/test/codec_vectors.c | 18 +-
pjnath/include/pjnath/stun_transaction.h | 13 +-
pjnath/src/pjnath/ice_strans.c | 7 +-
pjnath/src/pjnath/stun_session.c | 10 +-
pjnath/src/pjnath/stun_transaction.c | 13 +-
pjnath/src/pjturn-srv/allocation.c | 4 +-
pjsip-apps/src/pjsua/android/.classpath | 3 +-
pjsip-apps/src/pjsua/android/AndroidManifest.xml | 2 +
pjsip-apps/src/pjsua/android/jni/Android.mk | 26 +-
pjsip-apps/src/pjsua/android/jni/Application.mk | 2 +
pjsip-apps/src/pjsua/android/jni/pjsua.i | 27 +-
.../src/pjsua/android/jni/pjsua_app_callback.cpp | 62 +-
.../src/pjsua/android/jni/pjsua_app_callback.h | 3 +
.../src/pjsua/android/res/layout/activity_main.xml | 34 +-
.../android/src/org/pjsip/pjsua/MainActivity.java | 365 ++++---
.../src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj | 45 +-
.../xcshareddata/xcschemes/ipjsua.xcscheme | 88 ++
.../ipjsua.xcworkspace/contents.xcworkspacedata | 7 +
.../xcshareddata/ipjsua.xccheckout | 46 +
.../ipjsua/en.lproj/ipjsuaViewController_iPad.xib | 314 +++++-
.../src/pjsua/ios/ipjsua/ipjsuaAppDelegate.m | 10 +-
pjsip-apps/src/pjsua/pjsua_app_config.h | 7 +-
pjsip-apps/src/pjsystest/main_console.c | 4 +-
pjsip-apps/src/samples/pcaputil.c | 4 +-
pjsip-apps/src/samples/pjsip-perf.c | 8 +-
pjsip-apps/src/samples/siprtp.c | 7 +-
pjsip-apps/src/swig/java/Makefile | 5 +
.../src/swig/java/android/AndroidManifest.xml | 3 +
.../swig/java/android/res/layout/activity_call.xml | 5 +
.../src/org/pjsip/pjsua2/app/CallActivity.java | 274 +++--
.../src/org/pjsip/pjsua2/app/MainActivity.java | 929 ++++++++--------
.../android/src/org/pjsip/pjsua2/app/MyApp.java | 859 ++++++++-------
pjsip-apps/src/swig/java/sample.java | 5 +-
pjsip-apps/src/swig/pjsua2.i | 19 +
pjsip-apps/src/swig/symbols.i | 4 +-
pjsip-apps/src/swig/symbols.lst | 2 +-
pjsip/include/pjsip-ua/sip_inv.h | 4 +-
pjsip/include/pjsip/print_util.h | 8 +-
pjsip/include/pjsip/sip_config.h | 14 +-
pjsip/include/pjsip/sip_endpoint.h | 20 +-
pjsip/include/pjsip/sip_resolve.h | 57 +-
pjsip/include/pjsip/sip_transport_tls.h | 56 +-
pjsip/include/pjsip/sip_util.h | 6 +-
pjsip/include/pjsua-lib/pjsua.h | 153 ++-
pjsip/include/pjsua-lib/pjsua_internal.h | 7 +-
pjsip/include/pjsua2/account.hpp | 33 +-
pjsip/include/pjsua2/call.hpp | 53 +-
pjsip/include/pjsua2/media.hpp | 165 ++-
pjsip/include/pjsua2/siptypes.hpp | 110 +-
pjsip/src/pjsip-simple/evsub.c | 15 +-
pjsip/src/pjsip-ua/sip_100rel.c | 40 +-
pjsip/src/pjsip-ua/sip_inv.c | 125 ++-
pjsip/src/pjsip-ua/sip_reg.c | 15 +-
pjsip/src/pjsip-ua/sip_timer.c | 27 +-
pjsip/src/pjsip/sip_endpoint.c | 11 +-
pjsip/src/pjsip/sip_msg.c | 6 +-
pjsip/src/pjsip/sip_resolve.c | 37 +-
pjsip/src/pjsip/sip_transaction.c | 33 +-
pjsip/src/pjsip/sip_transport.c | 7 +-
pjsip/src/pjsip/sip_transport_loop.c | 6 +-
pjsip/src/pjsip/sip_transport_tcp.c | 16 +-
pjsip/src/pjsip/sip_transport_tls.c | 98 +-
pjsip/src/pjsip/sip_transport_udp.c | 6 +-
pjsip/src/pjsip/sip_uri.c | 26 +-
pjsip/src/pjsua-lib/pjsua_acc.c | 131 ++-
pjsip/src/pjsua-lib/pjsua_aud.c | 21 +-
pjsip/src/pjsua-lib/pjsua_call.c | 312 ++++--
pjsip/src/pjsua-lib/pjsua_core.c | 5 +-
pjsip/src/pjsua-lib/pjsua_dump.c | 8 +-
pjsip/src/pjsua-lib/pjsua_media.c | 53 +-
pjsip/src/pjsua-lib/pjsua_vid.c | 68 +-
pjsip/src/pjsua2/account.cpp | 14 +-
pjsip/src/pjsua2/call.cpp | 4 +-
pjsip/src/pjsua2/media.cpp | 94 +-
pjsip/src/pjsua2/siptypes.cpp | 4 +-
pjsip/src/test/regc_test.c | 44 +-
tests/pjsua/runall.py | 24 +-
.../scripts-sendto/260_multipart_err_no_sdp.py | 4 +-
third_party/bdsound/include/bdimad.h | 762 +++++++++----
third_party/build/gsm/Makefile | 2 +-
third_party/build/portaudio/Makefile | 3 +-
version.mak | 4 +-
154 files changed, 7898 insertions(+), 2438 deletions(-)
diff --cc debian/.git-dpm
index f7d39d5,0000000..67cc1b6
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
- f6f091a5e5f419d36ebcd08c32698a5856a27c18
- f6f091a5e5f419d36ebcd08c32698a5856a27c18
- 0f2fb3560bfd7eccacf6e240a6a344e1dc266b2f
++ba4f81c07541cae77808b589b687ac9f98c4968d
++ba4f81c07541cae77808b589b687ac9f98c4968d
++def680d5e127e3964d3b965931d9588a6b87170d
+def680d5e127e3964d3b965931d9588a6b87170d
+pjproject_2.4~dfsg.orig.tar.bz2
+5c8ab2ae101bafb132bf84a34159ac1371618b46
+4429619
diff --cc debian/patches/0001-Remove-pointless-linking-with-libasound.patch
index 0a07350,0000000..959aa73
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 043842736ad6538ac436c7c7e3159d0f25e7af94 Mon Sep 17 00:00:00 2001
++From d5a00611ee76e015fcb89b019cbecd4aab77d84b 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 ba0e6d2..53103b7 100755
++index 084ab0a..83d85a1 100755
+--- a/aconfigure
++++ b/aconfigure
- @@ -6100,8 +6100,6 @@ $as_echo "Checking sound device backend... null sound" >&6; }
++@@ -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 b7bf92e..da26c98 100644
++index 67cf24f..3b9f5e5 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 c9181fc,0000000..707980f
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 4fb5aa8025e519c66d8e6ebeab3fe4cf64b0c9b8 Mon Sep 17 00:00:00 2001
++From 3afb4b016a50df786ee1f18af2e0f29e413b664a 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 53103b7..33df882 100755
++index 83d85a1..ea868d2 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
- @@ -4211,7 +4212,7 @@ if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then :
++@@ -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
+
- @@ -7665,7 +7666,7 @@ 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="$LIBS -lcrypto"
- + libcrypto_present=1 && PJLIB_EXT="$PJLIB_EXT -lcrypto"
++- libcrypto_present=1 && LIBS="-lcrypto -ldl -lz $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
- @@ -7705,7 +7706,7 @@ fi
++@@ -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="$LIBS -lssl"
- + libssl_present=1 && PJLIB_EXT="$PJLIB_EXT -lssl"
++- 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 da26c98..6ac93b5 100644
++index 3b9f5e5..9d9bc26 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)
+
- @@ -1513,8 +1514,8 @@ AC_ARG_ENABLE(ssl,
++@@ -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="$LIBS -lcrypto"])
- - AC_CHECK_LIB(ssl,SSL_library_init,[libssl_present=1 && LIBS="$LIBS -lssl"])
- + AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && PJLIB_EXT="$PJLIB_EXT -lcrypto"])
- + AC_CHECK_LIB(ssl,SSL_library_init,[libssl_present=1 && PJLIB_EXT="$PJLIB_EXT -lssl"])
++- AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="-lcrypto -ldl -lz $LIBS"],,-ldl -lz)
++- 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 61b156d..9f192e4 100644
++index 8a986d7..a63808d 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 141da8e,0000000..3fa858f
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 472e4b78decbce53e53499d90f34939e58a2fdfd Mon Sep 17 00:00:00 2001
++From a78635de45e7ef35e45c86f3549c254674c8ac14 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 9f192e4..b151a7f 100644
++index a63808d..d886df5 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
+--- 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) \
+ $(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 e9b1158,0000000..80ce355
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 d0bad6effb8f5b14eafe410a18077c9fc292582f Mon Sep 17 00:00:00 2001
++From fae86f07a5971338af6788d98009e12324f8a509 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 e75d881,0000000..161c097
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 ca970e9849cd932fea5c3b27609b0dfba7d2c628 Mon Sep 17 00:00:00 2001
++From 4747bca13fdaa4945d5953d651b5f44efd9d9e13 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 ef22860,0000000..dd28487
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 f6f091a5e5f419d36ebcd08c32698a5856a27c18 Mon Sep 17 00:00:00 2001
++From ba4f81c07541cae77808b589b687ac9f98c4968d 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 b151a7f..d737572 100644
++index d886df5..d8c7a55 100644
+--- a/build.mak.in
++++ b/build.mak.in
- @@ -183,7 +183,6 @@ export APP_LDFLAGS := -L$(PJDIR)/pjlib/lib\
++@@ -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)
+
+ ###############################################################################
--
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