[Pkg-voip-commits] [pjproject] 32/45: Unfuzz patch, and drop ones resolved upstream.
Jonas Smedegaard
dr at jones.dk
Tue Jun 7 22:01:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch master
in repository pjproject.
commit 5e876fa97c0034b766e3819118dd7437271e88fc
Merge: 9f7f235 163e66a
Author: Jonas Smedegaard <dr at jones.dk>
Date: Tue Jun 7 16:31:32 2016 +0200
Unfuzz patch, and drop ones resolved upstream.
README.txt | 9 +-
aconfigure | 358 +-
aconfigure.ac | 273 +-
build/vs/pjproject-vs14-common-defaults.props | 34 +
build/vs/pjproject-vs14-debug-defaults.props | 21 +
.../vs/pjproject-vs14-debug-dynamic-defaults.props | 16 +
.../vs/pjproject-vs14-debug-static-defaults.props | 16 +
build/vs/pjproject-vs14-release-defaults.props | 18 +
.../pjproject-vs14-release-dynamic-defaults.props | 16 +
.../pjproject-vs14-release-static-defaults.props | 16 +
.../vs/pjproject-vs14-win32-common-defaults.props | 25 +
.../vs/pjproject-vs14-win32-release-defaults.props | 12 +
.../vs/pjproject-vs14-win64-common-defaults.props | 25 +
.../vs/pjproject-vs14-win64-release-defaults.props | 12 +
configure-android | 2 +-
debian/.git-dpm | 6 +-
debian/changelog | 1 +
...1-Remove-pointless-linking-with-libasound.patch | 25 +-
...uce-number-of-libraries-linked-with-pjlib.patch | 8 +-
...e-number-of-libraries-linked-with-pjmedia.patch | 14 +-
.../0004-Enable-building-python-bindings.patch | 2 +-
.../0005-CODEC_ID_-changed-to-AV_CODEC_ID_.patch | 36 -
...-libs-dependency-for-pj-utils-and-pjnath.patch} | 2 +-
... 0006-Reduce-linkage-of-unused-libraries.patch} | 26 +-
...7-add-v5-suffix-to-soname-of-libpjsua2-2.patch} | 2 +-
.../0008-Replace-deprecated-FFmpeg-API.patch | 212 -
debian/patches/series | 8 +-
pjlib-util/build/pjlib_util.vcxproj | 427 +
pjlib-util/build/pjlib_util.vcxproj.filters | 182 +
pjlib-util/build/pjlib_util_test.vcxproj | 428 +
pjlib-util/build/pjlib_util_test.vcxproj.filters | 51 +
pjlib-util/src/pjlib-util-test/http_client.c | 50 +-
pjlib-util/src/pjlib-util/cli_telnet.c | 9 +-
pjlib-util/src/pjlib-util/dns.c | 13 +-
pjlib-util/src/pjlib-util/dns_dump.c | 9 +-
pjlib-util/src/pjlib-util/pcap.c | 10 +-
pjlib-util/src/pjlib-util/resolver.c | 28 +-
pjlib-util/src/pjlib-util/srv_resolver.c | 44 +-
pjlib-util/src/pjlib-util/stun_simple.c | 10 +-
pjlib-util/src/pjlib-util/stun_simple_client.c | 3 +-
pjlib-util/src/pjlib-util/xml.c | 20 +-
pjlib/build/pjlib.vcxproj | 687 +
pjlib/build/pjlib.vcxproj.filters | 425 +
pjlib/build/pjlib_test.vcxproj | 432 +
pjlib/build/pjlib_test.vcxproj.filters | 129 +
pjlib/include/pj/compat/os_auto.h.in | 5 +-
pjlib/include/pj/compat/socket.h | 4 +-
pjlib/include/pj/config.h | 6 +-
pjlib/include/pj/config_site_sample.h | 2 +
pjlib/include/pj/ioqueue.h | 35 +-
pjlib/include/pj/log.h | 5 +-
pjlib/include/pj/ssl_sock.h | 41 +-
pjlib/include/pj/string_i.h | 6 +-
pjlib/src/pj/addr_resolv_sock.c | 16 +-
pjlib/src/pj/errno.c | 12 +-
pjlib/src/pj/guid_android.c | 117 +
pjlib/src/pj/ioqueue_common_abs.c | 61 +-
pjlib/src/pj/ioqueue_epoll.c | 91 +-
pjlib/src/pj/ioqueue_select.c | 101 +-
pjlib/src/pj/os_core_unix.c | 6 +-
pjlib/src/pj/pool_caching.c | 4 +-
pjlib/src/pj/ssl_sock_common.c | 28 +-
pjlib/src/pj/ssl_sock_ossl.c | 103 +-
pjlib/src/pjlib-test/echo_clt.c | 6 +-
pjlib/src/pjlib-test/errno.c | 6 +-
pjlib/src/pjlib-test/ioq_perf.c | 4 +-
pjlib/src/pjlib-test/ioq_udp.c | 14 +-
pjlib/src/pjlib-test/pool.c | 12 +-
pjlib/src/pjlib-test/pool_perf.c | 8 +-
pjlib/src/pjlib-test/sock.c | 8 +-
pjlib/src/pjlib-test/ssl_sock.c | 10 +-
pjlib/src/pjlib-test/timer.c | 11 +-
pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c | 10 +-
pjmedia/build/Makefile | 24 +-
pjmedia/build/os-auto.mak.in | 45 +-
pjmedia/build/pjmedia.vcproj | 340 +-
pjmedia/build/pjmedia.vcxproj | 436 +
pjmedia/build/pjmedia.vcxproj.filters | 398 +
pjmedia/build/pjmedia_audiodev.vcxproj | 401 +
pjmedia/build/pjmedia_audiodev.vcxproj.filters | 65 +
pjmedia/build/pjmedia_codec.vcxproj | 387 +
pjmedia/build/pjmedia_codec.vcxproj.filters | 143 +
pjmedia/build/pjmedia_test.vcxproj | 434 +
pjmedia/build/pjmedia_test.vcxproj.filters | 66 +
pjmedia/build/pjmedia_videodev.vcxproj | 359 +
pjmedia/build/pjmedia_videodev.vcxproj.filters | 56 +
pjmedia/include/pjmedia-audiodev/audiodev.h | 628 +-
pjmedia/include/pjmedia-audiodev/config.h | 25 +-
pjmedia/include/pjmedia-codec.h | 3 +-
pjmedia/include/pjmedia-codec/config.h | 56 +-
pjmedia/include/pjmedia-codec/config_auto.h.in | 7 +-
pjmedia/include/pjmedia-codec/opus.h | 155 +
pjmedia/include/pjmedia-codec/types.h | 3 +-
pjmedia/include/pjmedia-videodev/config.h | 25 +-
pjmedia/include/pjmedia-videodev/videodev.h | 727 +-
.../{pjmedia-audiodev => pjmedia}/audiodev.h | 145 +-
pjmedia/include/pjmedia/config.h | 40 +-
pjmedia/include/pjmedia/echo.h | 55 +-
pjmedia/include/pjmedia/endpoint.h | 65 +-
pjmedia/include/pjmedia/sound.h | 30 +-
pjmedia/include/pjmedia/stream.h | 5 +-
pjmedia/include/pjmedia/types.h | 20 +-
.../{pjmedia-videodev => pjmedia}/videodev.h | 139 +-
pjmedia/src/pjmedia-audiodev/android_jni_dev.c | 4 +-
pjmedia/src/pjmedia-audiodev/audiodev.c | 705 +-
pjmedia/src/pjmedia-audiodev/coreaudio_dev.m | 15 +-
pjmedia/src/pjmedia-audiodev/opensl_dev.c | 4 +-
pjmedia/src/pjmedia-codec/audio_codecs.c | 9 +-
pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c | 23 +-
pjmedia/src/pjmedia-codec/ilbc.c | 72 +-
pjmedia/src/pjmedia-codec/opus.c | 1070 +
pjmedia/src/pjmedia-videodev/android_dev.c | 21 +-
pjmedia/src/pjmedia-videodev/ffmpeg_dev.c | 33 +-
pjmedia/src/pjmedia-videodev/ios_dev.m | 6 +-
pjmedia/src/pjmedia-videodev/videodev.c | 759 +-
.../src/{pjmedia-audiodev => pjmedia}/audiodev.c | 441 +-
pjmedia/src/pjmedia/converter.c | 8 +-
pjmedia/src/pjmedia/converter_libswscale.c | 7 +-
pjmedia/src/pjmedia/echo_common.c | 23 +-
pjmedia/src/pjmedia/echo_internal.h | 17 +-
pjmedia/src/pjmedia/echo_webrtc.c | 371 +
pjmedia/src/pjmedia/endpoint.c | 68 +-
pjmedia/src/pjmedia/ffmpeg_util.c | 70 +-
pjmedia/src/pjmedia/ffmpeg_util.h | 12 +-
pjmedia/src/pjmedia/resample_libsamplerate.c | 4 +-
pjmedia/src/pjmedia/sdp.c | 43 +-
pjmedia/src/pjmedia/sdp_neg.c | 12 +-
pjmedia/src/pjmedia/session.c | 4 +-
pjmedia/src/pjmedia/sound_legacy.c | 19 +-
pjmedia/src/pjmedia/stream.c | 46 +-
pjmedia/src/pjmedia/stream_info.c | 51 +-
pjmedia/src/pjmedia/tonegen.c | 8 +-
pjmedia/src/pjmedia/transport_srtp.c | 33 +-
pjmedia/src/pjmedia/vid_stream.c | 11 +-
.../src/{pjmedia-videodev => pjmedia}/videodev.c | 248 +-
pjmedia/src/pjmedia/wav_player.c | 6 +-
pjmedia/src/test/codec_vectors.c | 30 +-
pjmedia/src/test/mips_test.c | 6 +-
pjnath/build/pjnath.vcxproj | 401 +
pjnath/build/pjnath.vcxproj.filters | 119 +
pjnath/build/pjnath_test.vcxproj | 394 +
pjnath/build/pjnath_test.vcxproj.filters | 54 +
pjnath/include/pjnath.h | 11 +-
pjnath/include/pjnath/ice_strans.h | 10 +-
pjnath/src/pjnath-test/server.c | 4 +-
pjnath/src/pjnath-test/stun.c | 18 +-
pjnath/src/pjnath/ice_session.c | 36 +-
pjnath/src/pjnath/ice_strans.c | 60 +-
pjnath/src/pjnath/nat_detect.c | 13 +-
pjnath/src/pjnath/stun_msg_dump.c | 8 +-
pjnath/src/pjnath/stun_session.c | 12 +-
pjnath/src/pjnath/stun_sock.c | 6 +-
pjnath/src/pjnath/turn_session.c | 10 +-
pjproject-vs14.sln | 835 +
pjproject-vs8.sln | 100 -
pjsip-apps/build/Samples-vc.mak | 6 +-
pjsip-apps/build/libpjproject.vcxproj | 451 +
pjsip-apps/build/pjsua.vcxproj | 381 +
pjsip-apps/build/pjsua.vcxproj.filters | 48 +
pjsip-apps/build/pjsystest.vcxproj | 138 +
pjsip-apps/build/pjsystest.vcxproj.filters | 41 +
pjsip-apps/build/python_pjsua.vcxproj | 164 +
pjsip-apps/build/python_pjsua.vcxproj.filters | 32 +
pjsip-apps/build/sample_debug.vcxproj | 381 +
pjsip-apps/build/sample_debug.vcxproj.filters | 22 +
pjsip-apps/build/samples.vcxproj | 383 +
pjsip-apps/build/samples.vcxproj.filters | 133 +
pjsip-apps/src/pjsua/android/jni/Android.mk | 3 +-
.../src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj | 2 +
.../src/pjsua/ios/ipjsua/ipjsuaAppDelegate.m | 13 +-
pjsip-apps/src/pjsua/pjsua_app.c | 49 +-
pjsip-apps/src/pjsua/pjsua_app_cli.c | 62 +-
pjsip-apps/src/pjsua/pjsua_app_common.c | 27 +-
pjsip-apps/src/pjsua/pjsua_app_config.c | 22 +-
pjsip-apps/src/pjsua/pjsua_app_legacy.c | 51 +-
pjsip-apps/src/python/setup.py | 10 +-
pjsip-apps/src/samples/clidemo.c | 5 +-
pjsip-apps/src/samples/encdec.c | 11 +-
pjsip-apps/src/samples/footprint.c | 4 +-
pjsip-apps/src/samples/httpdemo.c | 10 +-
pjsip-apps/src/samples/mix.c | 8 +-
pjsip-apps/src/samples/pcaputil.c | 4 +-
pjsip-apps/src/samples/pjsip-perf.c | 18 +-
pjsip-apps/src/samples/pjsua2_demo.cpp | 33 +-
pjsip-apps/src/samples/proxy.h | 18 +-
pjsip-apps/src/samples/simpleua.c | 27 +-
pjsip-apps/src/samples/sipecho.c | 13 +-
pjsip-apps/src/samples/siprtp.c | 28 +-
pjsip-apps/src/samples/stateful_proxy.c | 14 +-
pjsip-apps/src/samples/streamutil.c | 9 +-
pjsip-apps/src/samples/vid_streamutil.c | 9 +-
pjsip-apps/src/swig/java/Makefile | 1 +
pjsip-apps/src/swig/pjsua2.i | 1 +
pjsip-apps/src/swig/python/setup.py | 13 +-
pjsip-apps/src/swig/symbols.i | 4 +
pjsip-apps/src/swig/symbols.lst | 3 +-
pjsip/build/pjsip_core.vcxproj | 403 +
pjsip/build/pjsip_core.vcxproj.filters | 228 +
pjsip/build/pjsip_simple.vcxproj | 369 +
pjsip/build/pjsip_simple.vcxproj.filters | 86 +
pjsip/build/pjsip_test.vcxproj | 405 +
pjsip/build/pjsip_test.vcxproj.filters | 87 +
pjsip/build/pjsip_ua.vcxproj | 359 +
pjsip/build/pjsip_ua.vcxproj.filters | 56 +
pjsip/build/pjsua2_lib.vcxproj | 367 +
pjsip/build/pjsua2_lib.vcxproj.filters | 80 +
pjsip/build/pjsua_lib.vcxproj | 357 +
pjsip/build/pjsua_lib.vcxproj.filters | 50 +
pjsip/include/pjsip-ua/sip_replaces.h | 4 +-
pjsip/include/pjsip/print_util.h | 19 +-
pjsip/include/pjsip/sip_config.h | 4 +-
pjsip/include/pjsip/sip_dialog.h | 61 +-
pjsip/include/pjsip/sip_transport.h | 5 +-
pjsip/include/pjsip/sip_transport_udp.h | 96 +-
pjsip/include/pjsua-lib/pjsua.h | 145 +-
pjsip/include/pjsua-lib/pjsua_internal.h | 21 +-
pjsip/include/pjsua2/call.hpp | 40 +-
pjsip/include/pjsua2/endpoint.hpp | 53 +-
pjsip/include/pjsua2/media.hpp | 76 +-
pjsip/src/pjsip-simple/evsub.c | 135 +-
pjsip/src/pjsip-simple/publishc.c | 12 +-
pjsip/src/pjsip-ua/sip_100rel.c | 4 +-
pjsip/src/pjsip/sip_auth_client.c | 4 +-
pjsip/src/pjsip/sip_auth_msg.c | 5 +-
pjsip/src/pjsip/sip_dialog.c | 103 +-
pjsip/src/pjsip/sip_msg.c | 26 +-
pjsip/src/pjsip/sip_multipart.c | 8 +-
pjsip/src/pjsip/sip_parser.c | 57 +-
pjsip/src/pjsip/sip_resolve.c | 8 +-
pjsip/src/pjsip/sip_tel_uri.c | 3 +-
pjsip/src/pjsip/sip_transaction.c | 118 +-
pjsip/src/pjsip/sip_transport.c | 170 +-
pjsip/src/pjsip/sip_transport_tcp.c | 38 +-
pjsip/src/pjsip/sip_transport_tls.c | 45 +-
pjsip/src/pjsip/sip_transport_udp.c | 162 +-
pjsip/src/pjsip/sip_ua_layer.c | 14 +-
pjsip/src/pjsua-lib/pjsua_acc.c | 74 +-
pjsip/src/pjsua-lib/pjsua_aud.c | 83 +-
pjsip/src/pjsua-lib/pjsua_call.c | 99 +-
pjsip/src/pjsua-lib/pjsua_core.c | 210 +-
pjsip/src/pjsua-lib/pjsua_dump.c | 6 +-
pjsip/src/pjsua-lib/pjsua_media.c | 125 +-
pjsip/src/pjsua-lib/pjsua_pres.c | 22 +-
pjsip/src/pjsua-lib/pjsua_vid.c | 3 +-
pjsip/src/pjsua2/call.cpp | 15 +-
pjsip/src/pjsua2/endpoint.cpp | 136 +-
pjsip/src/pjsua2/media.cpp | 94 +-
pjsip/src/pjsua2/siptypes.cpp | 25 +-
pjsip/src/test/dns_test.c | 20 +-
pjsip/src/test/inv_offer_answer_test.c | 7 +-
pjsip/src/test/transport_tcp_test.c | 6 +-
pjsip/src/test/transport_test.c | 7 +-
pjsip/src/test/tsx_uas_test.c | 6 +-
pjsip/src/test/uri_test.c | 6 +-
third_party/README.txt | 3 +-
.../build/baseclasses/libbaseclasses.vcxproj | 407 +
.../baseclasses/libbaseclasses.vcxproj.filters | 92 +
third_party/build/g7221/libg7221codec.vcxproj | 367 +
.../build/g7221/libg7221codec.vcxproj.filters | 89 +
third_party/build/gsm/libgsmcodec.vcxproj | 383 +
third_party/build/gsm/libgsmcodec.vcxproj.filters | 92 +
third_party/build/ilbc/libilbccodec.vcxproj | 381 +
.../build/ilbc/libilbccodec.vcxproj.filters | 158 +
third_party/build/milenage/libmilenage.vcxproj | 350 +
.../build/milenage/libmilenage.vcxproj.filters | 29 +
third_party/build/os-auto.mak.in | 2 +-
third_party/build/portaudio/Makefile | 80 -
third_party/build/portaudio/libportaudio.vcp | 3985 ----
third_party/build/portaudio/libportaudio.vcproj | 5724 -----
third_party/build/portaudio/os-auto.mak.in | 79 -
third_party/build/portaudio/os-linux.mak | 34 -
third_party/build/portaudio/src/pa_allocation.c | 1 -
third_party/build/portaudio/src/pa_allocation.h | 1 -
third_party/build/portaudio/src/pa_converters.c | 1 -
third_party/build/portaudio/src/pa_converters.h | 1 -
third_party/build/portaudio/src/pa_cpuload.c | 1 -
third_party/build/portaudio/src/pa_cpuload.h | 1 -
third_party/build/portaudio/src/pa_debugprint.c | 1 -
third_party/build/portaudio/src/pa_debugprint.h | 1 -
third_party/build/portaudio/src/pa_dither.c | 1 -
third_party/build/portaudio/src/pa_dither.h | 1 -
third_party/build/portaudio/src/pa_endianness.h | 1 -
third_party/build/portaudio/src/pa_front.c | 1 -
third_party/build/portaudio/src/pa_hostapi.h | 1 -
third_party/build/portaudio/src/pa_linux_alsa.c | 1 -
third_party/build/portaudio/src/pa_linux_alsa.h | 1 -
third_party/build/portaudio/src/pa_mac_core.c | 1 -
third_party/build/portaudio/src/pa_mac_core.h | 1 -
.../build/portaudio/src/pa_mac_core_blocking.c | 1 -
.../build/portaudio/src/pa_mac_core_blocking.h | 1 -
.../build/portaudio/src/pa_mac_core_internal.h | 1 -
third_party/build/portaudio/src/pa_mac_core_old.c | 1 -
.../build/portaudio/src/pa_mac_core_utilities.c | 1 -
.../build/portaudio/src/pa_mac_core_utilities.h | 1 -
third_party/build/portaudio/src/pa_mac_hostapis.c | 2 -
third_party/build/portaudio/src/pa_process.c | 1 -
third_party/build/portaudio/src/pa_process.h | 1 -
third_party/build/portaudio/src/pa_ringbuffer.c | 1 -
third_party/build/portaudio/src/pa_ringbuffer.h | 1 -
third_party/build/portaudio/src/pa_skeleton.c | 1 -
third_party/build/portaudio/src/pa_stream.c | 1 -
third_party/build/portaudio/src/pa_stream.h | 1 -
third_party/build/portaudio/src/pa_trace.c | 1 -
third_party/build/portaudio/src/pa_trace.h | 1 -
third_party/build/portaudio/src/pa_types.h | 1 -
third_party/build/portaudio/src/pa_unix_hostapis.c | 1 -
third_party/build/portaudio/src/pa_unix_oss.c | 1 -
third_party/build/portaudio/src/pa_unix_util.c | 1 -
third_party/build/portaudio/src/pa_unix_util.h | 1 -
third_party/build/portaudio/src/pa_util.h | 1 -
third_party/build/portaudio/src/pa_win_hostapis.c | 1 -
third_party/build/portaudio/src/pa_win_util.c | 1 -
.../build/portaudio/src/pa_win_waveformat.c | 1 -
.../build/portaudio/src/pa_win_waveformat.h | 1 -
third_party/build/portaudio/src/pa_win_wmme.c | 1 -
third_party/build/portaudio/src/pa_win_wmme.h | 1 -
third_party/build/portaudio/src/portaudio.h | 1 -
third_party/build/resample/Makefile | 8 +-
third_party/build/resample/libresample.vcxproj | 352 +
.../build/resample/libresample.vcxproj.filters | 35 +
third_party/build/speex/config.h | 1 +
third_party/build/speex/libspeex.vcxproj | 681 +
third_party/build/speex/libspeex.vcxproj.filters | 245 +
third_party/build/srtp/Makefile | 2 +-
.../{srtp/pjlib/srtp_err.c => build/srtp/config.h} | 33 +-
third_party/build/srtp/libsrtp.vcproj | 336 +-
third_party/build/srtp/libsrtp.vcxproj | 389 +
third_party/build/srtp/libsrtp.vcxproj.filters | 203 +
third_party/build/srtp/srtp_config.h | 18 +-
third_party/gsm/COPYRIGHT | 16 -
third_party/gsm/ChangeLog | 92 -
third_party/gsm/INSTALL | 99 -
third_party/gsm/MACHINES | 11 -
third_party/gsm/MANIFEST | 59 -
third_party/gsm/Makefile | 494 -
third_party/gsm/README | 37 -
third_party/gsm/add-test/add_test.c | 353 -
third_party/gsm/add-test/add_test.dta | 683 -
third_party/gsm/inc/config.h | 37 -
third_party/gsm/inc/gsm.h | 71 -
third_party/gsm/inc/private.h | 269 -
third_party/gsm/inc/proto.h | 65 -
third_party/gsm/inc/toast.h | 109 -
third_party/gsm/inc/unproto.h | 23 -
third_party/gsm/man/bitter.1 | 70 -
third_party/gsm/man/gsm.3 | 105 -
third_party/gsm/man/gsm_explode.3 | 47 -
third_party/gsm/man/gsm_option.3 | 183 -
third_party/gsm/man/gsm_print.3 | 52 -
third_party/gsm/man/toast.1 | 156 -
third_party/gsm/src/add.c | 236 -
third_party/gsm/src/code.c | 97 -
third_party/gsm/src/debug.c | 76 -
third_party/gsm/src/decode.c | 64 -
third_party/gsm/src/gsm_create.c | 45 -
third_party/gsm/src/gsm_decode.c | 361 -
third_party/gsm/src/gsm_destroy.c | 26 -
third_party/gsm/src/gsm_encode.c | 451 -
third_party/gsm/src/gsm_explode.c | 417 -
third_party/gsm/src/gsm_implode.c | 521 -
third_party/gsm/src/gsm_option.c | 69 -
third_party/gsm/src/gsm_print.c | 167 -
third_party/gsm/src/long_term.c | 950 -
third_party/gsm/src/lpc.c | 342 -
third_party/gsm/src/preprocess.c | 114 -
third_party/gsm/src/rpe.c | 489 -
third_party/gsm/src/short_term.c | 430 -
third_party/gsm/src/table.c | 63 -
third_party/gsm/src/toast.c | 800 -
third_party/gsm/src/toast_alaw.c | 334 -
third_party/gsm/src/toast_audio.c | 113 -
third_party/gsm/src/toast_lin.c | 24 -
third_party/gsm/src/toast_ulaw.c | 621 -
third_party/gsm/tls/bitter.c | 66 -
third_party/gsm/tls/bitter.dta | 90 -
third_party/gsm/tls/ginger.c | 54 -
third_party/gsm/tls/sour.c | 91 -
third_party/gsm/tls/sour1.dta | 88 -
third_party/gsm/tls/sour2.dta | 90 -
third_party/gsm/tls/sweet.c | 66 -
third_party/gsm/tls/taste.c | 139 -
third_party/gsm/tls/taste.h | 20 -
third_party/gsm/tst/cod2lin.c | 104 -
third_party/gsm/tst/cod2txt.c | 94 -
third_party/gsm/tst/gsm2cod.c | 93 -
third_party/gsm/tst/lin2cod.c | 105 -
third_party/gsm/tst/lin2txt.c | 94 -
third_party/gsm/tst/run | 34 -
third_party/portaudio/Doxyfile | 239 -
third_party/portaudio/LICENSE.txt | 81 -
third_party/portaudio/Makefile.in | 223 -
third_party/portaudio/README.txt | 98 -
third_party/portaudio/SConstruct | 197 -
third_party/portaudio/aclocal.m4 | 6627 ------
third_party/portaudio/build/dev-cpp/Makefile-dll | 78 -
.../portaudio/build/dev-cpp/Makefile-static | 75 -
.../portaudio/build/dev-cpp/portaudio-dll.dev | 209 -
.../portaudio/build/dev-cpp/portaudio-static.dev | 209 -
third_party/portaudio/build/dev-cpp/readme.txt | 23 -
third_party/portaudio/build/msvc/portaudio.def | 43 -
third_party/portaudio/build/msvc/portaudio.dsp | 269 -
third_party/portaudio/build/msvc/portaudio.dsw | 29 -
third_party/portaudio/build/msvc/portaudio.sln | 26 -
third_party/portaudio/build/msvc/portaudio.vcproj | 1512 --
third_party/portaudio/build/msvc/readme.txt | 109 -
.../portaudio/build/scons/SConscript_common | 30 -
third_party/portaudio/build/scons/SConscript_opts | 91 -
third_party/portaudio/config.guess | 1388 --
third_party/portaudio/config.sub | 1489 --
third_party/portaudio/configure | 23096 -------------------
third_party/portaudio/configure.in | 417 -
third_party/portaudio/depcomp | 530 -
third_party/portaudio/fixdir.bat | 19 -
third_party/portaudio/fixfile.bat | 7 -
third_party/portaudio/include/pa_asio.h | 143 -
third_party/portaudio/include/pa_jack.h | 76 -
third_party/portaudio/include/pa_linux_alsa.h | 99 -
third_party/portaudio/include/pa_mac_core.h | 176 -
third_party/portaudio/include/pa_win_ds.h | 101 -
third_party/portaudio/include/pa_win_waveformat.h | 199 -
third_party/portaudio/include/pa_win_wmme.h | 186 -
third_party/portaudio/include/portaudio.h | 1134 -
third_party/portaudio/index.html | 105 -
third_party/portaudio/install-sh | 251 -
third_party/portaudio/ltmain.sh | 6971 ------
third_party/portaudio/missing | 360 -
third_party/portaudio/pablio/README.txt | 45 -
third_party/portaudio/pablio/pablio.c | 314 -
third_party/portaudio/pablio/pablio.def | 35 -
third_party/portaudio/pablio/pablio.h | 116 -
third_party/portaudio/pablio/test_rw.c | 105 -
third_party/portaudio/pablio/test_rw_echo.c | 129 -
third_party/portaudio/pablio/test_w_saw.c | 114 -
third_party/portaudio/pablio/test_w_saw8.c | 112 -
third_party/portaudio/portaudio-2.0.pc.in | 12 -
third_party/portaudio/src/SConscript | 219 -
third_party/portaudio/src/common/pa_allocation.c | 243 -
third_party/portaudio/src/common/pa_allocation.h | 104 -
third_party/portaudio/src/common/pa_converters.c | 1935 --
third_party/portaudio/src/common/pa_converters.h | 263 -
third_party/portaudio/src/common/pa_cpuload.c | 105 -
third_party/portaudio/src/common/pa_cpuload.h | 72 -
third_party/portaudio/src/common/pa_debugprint.c | 110 -
third_party/portaudio/src/common/pa_debugprint.h | 149 -
third_party/portaudio/src/common/pa_dither.c | 218 -
third_party/portaudio/src/common/pa_dither.h | 106 -
third_party/portaudio/src/common/pa_endianness.h | 145 -
third_party/portaudio/src/common/pa_front.c | 1765 --
third_party/portaudio/src/common/pa_hostapi.h | 259 -
.../portaudio/src/common/pa_memorybarrier.h | 127 -
third_party/portaudio/src/common/pa_process.c | 1772 --
third_party/portaudio/src/common/pa_process.h | 750 -
third_party/portaudio/src/common/pa_ringbuffer.c | 227 -
third_party/portaudio/src/common/pa_ringbuffer.h | 233 -
third_party/portaudio/src/common/pa_skeleton.c | 818 -
third_party/portaudio/src/common/pa_stream.c | 150 -
third_party/portaudio/src/common/pa_stream.h | 205 -
third_party/portaudio/src/common/pa_trace.c | 97 -
third_party/portaudio/src/common/pa_trace.h | 101 -
third_party/portaudio/src/common/pa_types.h | 107 -
third_party/portaudio/src/common/pa_util.h | 162 -
.../portaudio/src/hostapi/alsa/pa_linux_alsa.c | 3679 ---
.../portaudio/src/hostapi/asihpi/pa_linux_asihpi.c | 2942 ---
.../portaudio/src/hostapi/asio/ASIO-README.txt | 140 -
.../src/hostapi/asio/Callback_adaptation_.pdf | Bin 50527 -> 0 bytes
third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf | Bin 50778 -> 0 bytes
.../src/hostapi/asio/iasiothiscallresolver.cpp | 563 -
.../src/hostapi/asio/iasiothiscallresolver.h | 197 -
third_party/portaudio/src/hostapi/asio/pa_asio.cpp | 4065 ----
.../portaudio/src/hostapi/coreaudio/notes.txt | 196 -
.../portaudio/src/hostapi/coreaudio/pa_mac_core.c | 2343 --
.../src/hostapi/coreaudio/pa_mac_core_blocking.c | 592 -
.../src/hostapi/coreaudio/pa_mac_core_blocking.h | 136 -
.../src/hostapi/coreaudio/pa_mac_core_internal.h | 165 -
.../src/hostapi/coreaudio/pa_mac_core_old.c | 913 -
.../src/hostapi/coreaudio/pa_mac_core_utilities.c | 733 -
.../src/hostapi/coreaudio/pa_mac_core_utilities.h | 218 -
.../portaudio/src/hostapi/dsound/pa_win_ds.c | 2533 --
.../src/hostapi/dsound/pa_win_ds_dynlink.c | 180 -
.../src/hostapi/dsound/pa_win_ds_dynlink.h | 95 -
third_party/portaudio/src/hostapi/jack/pa_jack.c | 1761 --
.../portaudio/src/hostapi/oss/low_latency_tip.txt | Bin 3111 -> 0 bytes
.../portaudio/src/hostapi/oss/pa_unix_oss.c | 1991 --
third_party/portaudio/src/hostapi/oss/recplay.c | 114 -
.../portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp | 1912 --
.../portaudio/src/hostapi/wdmks/pa_win_wdmks.c | 3304 ---
third_party/portaudio/src/hostapi/wdmks/readme.txt | 82 -
.../portaudio/src/hostapi/wmme/pa_win_wmme.c | 4007 ----
.../portaudio/src/os/unix/pa_unix_hostapis.c | 105 -
third_party/portaudio/src/os/unix/pa_unix_util.c | 693 -
third_party/portaudio/src/os/unix/pa_unix_util.h | 224 -
third_party/portaudio/src/os/win/pa_win_hostapis.c | 100 -
third_party/portaudio/src/os/win/pa_win_util.c | 151 -
.../portaudio/src/os/win/pa_win_waveformat.c | 154 -
.../portaudio/src/os/win/pa_win_wdmks_utils.c | 260 -
.../portaudio/src/os/win/pa_win_wdmks_utils.h | 65 -
.../portaudio/src/os/win/pa_x86_plain_converters.c | 1219 -
.../portaudio/src/os/win/pa_x86_plain_converters.h | 60 -
third_party/portaudio/testcvs/changeme.txt | 10 -
third_party/resample/COPYING | 463 -
third_party/resample/README.resample | 154 -
third_party/resample/include/resamplesubs.h | 32 -
third_party/resample/src/largefilter.h | 16391 -------------
third_party/resample/src/libresample_dll.c | 12 -
third_party/resample/src/resample.h | 67 -
third_party/resample/src/resamplesubs.c | 377 -
third_party/resample/src/smallfilter.h | 4617 ----
third_party/resample/src/stddefs.h | 29 -
third_party/speex/AUTHORS | 18 -
third_party/speex/COPYING | 35 -
third_party/speex/include/speex/speex.h | 424 -
third_party/speex/include/speex/speex_bits.h | 174 -
third_party/speex/include/speex/speex_buffer.h | 68 -
third_party/speex/include/speex/speex_callbacks.h | 134 -
.../speex/include/speex/speex_config_types.h.in | 11 -
third_party/speex/include/speex/speex_echo.h | 170 -
third_party/speex/include/speex/speex_header.h | 94 -
third_party/speex/include/speex/speex_jitter.h | 197 -
third_party/speex/include/speex/speex_preprocess.h | 219 -
third_party/speex/include/speex/speex_resampler.h | 340 -
third_party/speex/include/speex/speex_stereo.h | 91 -
third_party/speex/include/speex/speex_types.h | 126 -
third_party/speex/libspeex/_kiss_fft_guts.h | 160 -
third_party/speex/libspeex/arch.h | 239 -
third_party/speex/libspeex/bits.c | 372 -
third_party/speex/libspeex/buffer.c | 176 -
third_party/speex/libspeex/cb_search.c | 612 -
third_party/speex/libspeex/cb_search.h | 103 -
third_party/speex/libspeex/cb_search_arm4.h | 137 -
third_party/speex/libspeex/cb_search_bfin.h | 112 -
third_party/speex/libspeex/cb_search_sse.h | 84 -
third_party/speex/libspeex/echo_diagnostic.m | 72 -
third_party/speex/libspeex/exc_10_16_table.c | 50 -
third_party/speex/libspeex/exc_10_32_table.c | 66 -
third_party/speex/libspeex/exc_20_32_table.c | 66 -
third_party/speex/libspeex/exc_5_256_table.c | 290 -
third_party/speex/libspeex/exc_5_64_table.c | 98 -
third_party/speex/libspeex/exc_8_128_table.c | 162 -
third_party/speex/libspeex/fftwrap.c | 397 -
third_party/speex/libspeex/fftwrap.h | 58 -
third_party/speex/libspeex/filterbank.c | 227 -
third_party/speex/libspeex/filterbank.h | 66 -
third_party/speex/libspeex/filters.c | 821 -
third_party/speex/libspeex/filters.h | 90 -
third_party/speex/libspeex/filters_arm4.h | 96 -
third_party/speex/libspeex/filters_bfin.h | 515 -
third_party/speex/libspeex/filters_sse.h | 336 -
third_party/speex/libspeex/fixed_arm4.h | 148 -
third_party/speex/libspeex/fixed_arm5e.h | 178 -
third_party/speex/libspeex/fixed_bfin.h | 173 -
third_party/speex/libspeex/fixed_debug.h | 487 -
third_party/speex/libspeex/fixed_generic.h | 106 -
third_party/speex/libspeex/gain_table.c | 160 -
third_party/speex/libspeex/gain_table_lbr.c | 64 -
third_party/speex/libspeex/hexc_10_32_table.c | 66 -
third_party/speex/libspeex/hexc_table.c | 162 -
third_party/speex/libspeex/high_lsp_tables.c | 163 -
third_party/speex/libspeex/jitter.c | 843 -
third_party/speex/libspeex/kiss_fft.c | 523 -
third_party/speex/libspeex/kiss_fft.h | 108 -
third_party/speex/libspeex/kiss_fftr.c | 297 -
third_party/speex/libspeex/kiss_fftr.h | 51 -
third_party/speex/libspeex/lpc.c | 201 -
third_party/speex/libspeex/lpc.h | 53 -
third_party/speex/libspeex/lpc_bfin.h | 131 -
third_party/speex/libspeex/lsp.c | 656 -
third_party/speex/libspeex/lsp.h | 64 -
third_party/speex/libspeex/lsp_bfin.h | 89 -
third_party/speex/libspeex/lsp_tables_nb.c | 360 -
third_party/speex/libspeex/ltp.c | 839 -
third_party/speex/libspeex/ltp.h | 141 -
third_party/speex/libspeex/ltp_arm4.h | 187 -
third_party/speex/libspeex/ltp_bfin.h | 419 -
third_party/speex/libspeex/ltp_sse.h | 92 -
third_party/speex/libspeex/math_approx.h | 332 -
third_party/speex/libspeex/mdf.c | 1177 -
third_party/speex/libspeex/misc_bfin.h | 54 -
third_party/speex/libspeex/modes.c | 366 -
third_party/speex/libspeex/modes.h | 161 -
third_party/speex/libspeex/modes_wb.c | 300 -
third_party/speex/libspeex/nb_celp.c | 1903 --
third_party/speex/libspeex/nb_celp.h | 203 -
third_party/speex/libspeex/os_support.h | 169 -
third_party/speex/libspeex/preprocess.c | 1219 -
third_party/speex/libspeex/pseudofloat.h | 379 -
third_party/speex/libspeex/quant_lsp.c | 385 -
third_party/speex/libspeex/quant_lsp.h | 74 -
third_party/speex/libspeex/quant_lsp_bfin.h | 165 -
third_party/speex/libspeex/resample.c | 1131 -
third_party/speex/libspeex/resample_sse.h | 128 -
third_party/speex/libspeex/sb_celp.c | 1488 --
third_party/speex/libspeex/sb_celp.h | 155 -
third_party/speex/libspeex/scal.c | 289 -
third_party/speex/libspeex/smallft.c | 1261 -
third_party/speex/libspeex/smallft.h | 46 -
third_party/speex/libspeex/speex.c | 250 -
third_party/speex/libspeex/speex_callbacks.c | 144 -
third_party/speex/libspeex/speex_header.c | 200 -
third_party/speex/libspeex/stack_alloc.h | 115 -
third_party/speex/libspeex/stereo.c | 296 -
third_party/speex/libspeex/testdenoise.c | 44 -
third_party/speex/libspeex/testecho.c | 53 -
third_party/speex/libspeex/testenc.c | 146 -
third_party/speex/libspeex/testenc_uwb.c | 137 -
third_party/speex/libspeex/testenc_wb.c | 140 -
third_party/speex/libspeex/testjitter.c | 75 -
third_party/speex/libspeex/testresample.c | 86 -
third_party/speex/libspeex/vbr.c | 275 -
third_party/speex/libspeex/vbr.h | 70 -
third_party/speex/libspeex/vorbis_psy.c | 508 -
third_party/speex/libspeex/vorbis_psy.h | 97 -
third_party/speex/libspeex/vq.c | 147 -
third_party/speex/libspeex/vq.h | 54 -
third_party/speex/libspeex/vq_arm4.h | 115 -
third_party/speex/libspeex/vq_bfin.h | 107 -
third_party/speex/libspeex/vq_sse.h | 120 -
third_party/speex/libspeex/window.c | 102 -
third_party/speex/symbian/config.h | 59 -
third_party/speex/win32/config.h | 19 -
third_party/srtp/CHANGES | 223 -
third_party/srtp/LICENSE | 35 -
third_party/srtp/Makefile.in | 232 -
third_party/srtp/README | 174 -
third_party/srtp/TODO | 66 -
third_party/srtp/VERSION | 1 -
third_party/srtp/config.guess | 1447 --
third_party/srtp/config.h_win32vc7 | 170 -
third_party/srtp/config.hw | 192 -
third_party/srtp/config.sub | 1555 --
third_party/srtp/config_in.h | 170 -
third_party/srtp/configure | 8603 -------
third_party/srtp/configure.in | 206 -
third_party/srtp/crypto/Makefile | 130 -
third_party/srtp/crypto/Makefile.in | 130 -
third_party/srtp/crypto/VERSION | 1 -
third_party/srtp/crypto/ae_xfm/xfm.c | 573 -
third_party/srtp/crypto/cipher/aes.c | 1951 --
third_party/srtp/crypto/cipher/aes_cbc.c | 444 -
third_party/srtp/crypto/cipher/aes_icm.c | 511 -
third_party/srtp/crypto/cipher/cipher.c | 409 -
third_party/srtp/crypto/cipher/null_cipher.c | 152 -
third_party/srtp/crypto/hash/auth.c | 173 -
third_party/srtp/crypto/hash/hmac.c | 267 -
third_party/srtp/crypto/hash/null_auth.c | 160 -
third_party/srtp/crypto/hash/sha1.c | 404 -
third_party/srtp/crypto/include/aes.h | 84 -
third_party/srtp/crypto/include/aes_cbc.h | 50 -
third_party/srtp/crypto/include/aes_icm.h | 56 -
third_party/srtp/crypto/include/alloc.h | 57 -
third_party/srtp/crypto/include/auth.h | 159 -
third_party/srtp/crypto/include/cipher.h | 218 -
third_party/srtp/crypto/include/crypto.h | 43 -
third_party/srtp/crypto/include/crypto_kernel.h | 258 -
third_party/srtp/crypto/include/crypto_math.h | 273 -
third_party/srtp/crypto/include/crypto_types.h | 206 -
third_party/srtp/crypto/include/cryptoalg.h | 133 -
third_party/srtp/crypto/include/datatypes.h | 427 -
third_party/srtp/crypto/include/err.h | 174 -
third_party/srtp/crypto/include/gf2_8.h | 79 -
third_party/srtp/crypto/include/hmac.h | 78 -
third_party/srtp/crypto/include/integers.h | 147 -
third_party/srtp/crypto/include/kernel_compat.h | 84 -
third_party/srtp/crypto/include/key.h | 82 -
third_party/srtp/crypto/include/null_auth.h | 68 -
third_party/srtp/crypto/include/null_cipher.h | 80 -
third_party/srtp/crypto/include/prng.h | 54 -
third_party/srtp/crypto/include/rand_source.h | 91 -
third_party/srtp/crypto/include/rdb.h | 94 -
third_party/srtp/crypto/include/rdbx.h | 146 -
third_party/srtp/crypto/include/sha1.h | 108 -
third_party/srtp/crypto/include/stat.h | 69 -
third_party/srtp/crypto/include/xfm.h | 139 -
third_party/srtp/crypto/kernel/alloc.c | 119 -
third_party/srtp/crypto/kernel/crypto_kernel.c | 523 -
third_party/srtp/crypto/kernel/err.c | 148 -
third_party/srtp/crypto/kernel/key.c | 115 -
third_party/srtp/crypto/math/datatypes.c | 599 -
third_party/srtp/crypto/math/gf2_8.c | 83 -
third_party/srtp/crypto/math/math.c | 962 -
third_party/srtp/crypto/math/stat.c | 367 -
third_party/srtp/crypto/replay/rdb.c | 137 -
third_party/srtp/crypto/replay/rdbx.c | 289 -
third_party/srtp/crypto/replay/ut_sim.c | 105 -
third_party/srtp/crypto/rng/ctr_prng.c | 108 -
third_party/srtp/crypto/rng/prng.c | 180 -
third_party/srtp/crypto/rng/rand_linux_kernel.c | 65 -
third_party/srtp/crypto/rng/rand_source.c | 175 -
third_party/srtp/crypto/test/aes_calc.c | 111 -
third_party/srtp/crypto/test/auth_driver.c | 200 -
third_party/srtp/crypto/test/cipher_driver.c | 491 -
third_party/srtp/crypto/test/datatypes_driver.c | 237 -
third_party/srtp/crypto/test/env.c | 99 -
third_party/srtp/crypto/test/kernel_driver.c | 126 -
third_party/srtp/crypto/test/rand_gen.c | 140 -
third_party/srtp/crypto/test/sha1_driver.c | 533 -
third_party/srtp/crypto/test/stat_driver.c | 101 -
third_party/srtp/include/getopt_s.h | 60 -
third_party/srtp/include/rtp.h | 127 -
third_party/srtp/include/rtp_priv.h | 74 -
third_party/srtp/include/srtp.h | 933 -
third_party/srtp/include/srtp_priv.h | 255 -
third_party/srtp/include/ut_sim.h | 80 -
third_party/srtp/install-sh | 251 -
third_party/srtp/srtp.def | 92 -
third_party/srtp/srtp.vcproj | 588 -
third_party/srtp/srtp/srtp.c | 1913 --
third_party/srtp/srtp7.sln | 21 -
third_party/srtp/srtp7.vcproj | 298 -
third_party/srtp/tables/aes_tables.c | 346 -
third_party/srtp/test/dtls_srtp_driver.c | 245 -
third_party/srtp/test/getopt_s.c | 112 -
third_party/srtp/test/lfsr.c | 310 -
third_party/srtp/test/rdbx_driver.c | 306 -
third_party/srtp/test/replay_driver.c | 209 -
third_party/srtp/test/roc_driver.c | 165 -
third_party/srtp/test/rtp.c | 167 -
third_party/srtp/test/rtpw.c | 519 -
third_party/srtp/test/rtpw_test.sh | 77 -
third_party/srtp/test/srtp_driver.c | 1491 --
third_party/srtp/timing | 1 -
third_party/srtp/undos.sh | 10 -
third_party/srtp/update.sh | 15 -
version.mak | 6 +-
723 files changed, 23425 insertions(+), 208558 deletions(-)
diff --cc debian/.git-dpm
index 3af1430,0000000..b4fc2a7
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
- 24cd21cda01347fb146bbc7c41bdbdc89db85439
- 24cd21cda01347fb146bbc7c41bdbdc89db85439
- 8bc494943161dfa21ff5d95e9ec78efd4f35e408
++163e66a1ce3475d66354f9a20bec250245661d7e
++163e66a1ce3475d66354f9a20bec250245661d7e
++a57d967590e57e514fda69bd46378facce9f78be
+a57d967590e57e514fda69bd46378facce9f78be
+pjproject_2.5.1~dfsg.orig.tar.bz2
+2f0670aabe0d8cd84244137f3c8cab2ef7615025
+3477547
diff --cc debian/changelog
index 58badf9,0000000..ee9cec5
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,151 -1,0 +1,152 @@@
+pjproject (2.4.5~dfsg-5) UNRELEASED; urgency=medium
+
+ [ Jonas Smedegaard ]
+ * Update copyright info:
+ + Normalize and sort copyright holders.
+ + Fix use double-space as copyright-holder delimiter.
+ + Extend coverage for main author to include recent year.
+ + Use License-Grant and License-Reference fields for GPL license.
+ Thanks to Ben Finney.
+ + Merge Files sections with identical license-grant.
+ + Generalize comment about additional ignored licenses.
+ + Fix add additional GPL-granting copyright holders.
+ + Use separate Files section for each public-domain (non-)grant.
+ + Use License-Grant and License-Reference fields for Apache license.
+ + Strip convenience code copies gsm portaudio resample speex srtp
+ when repackaging upstream source.
+ + Stop track files or licenses of non-redistributed convenience code
+ copies.
+ * Add copyright-check script.
+ * Update patches to not mess with autogenerated files.
+ * Bump debhelper compatibility level to 10.
+ Adjust rules to use dh_autoreconf.
+ Tighten build-dependency on debhelper.
+ * Drop import script (gbp import-orig clashes with git-dpm patches).
+ Document in README.source how to import new upstream source.
++ * Unfuzz patch, and drop ones resolved upstream.
+
+ -- Jonas Smedegaard <dr at jones.dk> Tue, 07 Jun 2016 14:23:43 +0200
+
+pjproject (2.4.5~dfsg-4) unstable; urgency=medium
+
+ * Fix avoid build-depending on libv4l-dev on the Hurd:
+ + Adapt symbols.
+ + Resolve libpjproject-dev dependencies related to linked libraries
+ during build.
+ + Build-depend on d-shlibs.
+ * Modernize Vcs-* field URLs:
+ + Use https protocol.
+ + Use cgit viewer.
+ * Build-depend unversioned on debhelper: Needed version satisfied even
+ in oldstable.
+ * Add lintian override regarding debhelper 9.
+ * Declare compliance with Debian Policy 3.9.7.
+ * Update symbols file (affects only optional symbols).
+ * Fix stop have libpjproject-dev depend on libx264-dev: Seems unused.
+
+ -- Jonas Smedegaard <dr at jones.dk> Fri, 01 Apr 2016 15:03:42 +0200
+
+pjproject (2.4.5~dfsg-3) unstable; urgency=medium
+
+ * Update symbois.
+
+ -- Jonas Smedegaard <dr at jones.dk> Fri, 25 Mar 2016 19:22:31 +0100
+
+pjproject (2.4.5~dfsg-2) unstable; urgency=medium
+
+ * Move packaging to Debian VoIP team (with Tzafrir's consent).
+ Add myself as uploader.
+ * Use pkgkde-symbolshelper. Build-depend on pkg-kde-tools.
+
+ -- Jonas Smedegaard <dr at jones.dk> Fri, 25 Mar 2016 17:09:28 +0100
+
+pjproject (2.4.5~dfsg-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ upstream ]
+ * New release(s).
+ + Use the OpenSSL RNG if available, instead of via SRTP.
+ Closes: Bug#793972.
+ + Support compilation with OpenSSL without OpenSSLv3 support.
+ Closes: Bug#805082. Thanks to Peter Green.
+
+ [ Tzafrir Cohen ]
+ * Fix add Files section for bar-descriptor.xml to debian/copyright.
+ Closes: #793051. Thanks to Thorsten Alteholz.
+ * Move arch-dependent headers to a triplet subdir.
+ Closes: #793097. Thanks to Jakub Wilk.
+ * Bump soname for libpjsua2: Add C++ transitional v5 suffix.
+ Closes: Bug#793094. Thanks to Jakub Wilk and Simon McVittie.
+ * Replace deprecated FFmpeg API.
+ Closes: Bug#803855, #801535. Thanks to Andreas Cadhalpun.
+ * Copy -dev build deps to deps of -dev package.
+ Closes: #795825, #801535. Thanks to Julien Cristau, Simon McVittie
+ and Andreas Beckmann.
+
+ [ Jeremy Lainé ]
+ * Reduce library linkage.
+ Closes: Bug#793141. Thanks to James Cloos.
+
+ [ Jonas Smedegaard ]
+ * Fix typo in long descriptions.
+ * Build-depend on virtual libsrtp-dev (not libsrtp0-dev) to ease
+ pending transition.
+ * Fix have libpjproject-dev depend on libpjsua2-2v5 (not libpjsua2-2).
+ * Fix add version mangling hint to watch file.
+ * Fix strip debian revision from symbols files.
+
+ -- Jonas Smedegaard <dr at jones.dk> Mon, 21 Mar 2016 11:42:57 +0100
+
+pjproject (2.4~dfsg-1) unstable; urgency=low
+
+ * New upstream release: now an upstream version (Closes: #725326).
+ - Update symbols for version 2.3, 2.4
+ - We use upstream source. No need for the README
+ - rules: config_site moved
+ - CODEC_ID_* changed to AV_CODEC_ID_*
+ - Extra library: pjsua2 (libpjsua2-2. Package libpjsua2 is pjsua).
+ * -dev package: depend explicitly on libsrtp0-dev due to -lsrtp in
+ the pkg-config file.
+ * rules: run 'make dep' at build time.
+ * rules: 'build' not cnfused by directory 'build'
+ * Enable opencore-amr codec support
+ * Do enable IPv6 support in config_site (Closes: #787964).
+ * README.source: we use git-dpm
+ * Do enable video
+ * compat level 9
+ * multi-arch support
+ - control: packages pre-depend on multi-arch
+ * Remove offending build flags from pkgconfig file (lintian).
+ * A disabled tests target
+ * extra files to remove after tests
+ * Reduce number of libraries linked with pjlib-util
+ * copyright: Fix syntax (gsm)
+ * Remove video libs dependency for pj-utils and pjnath
+ * package python-pjproject (Closes: #768578)
+ - Depend on python-dev
+ * Standards version 3.9.6 (no change needed)
+ * copyright: Don't use '[]' wildcards
+
+ -- Tzafrir Cohen <tzafrir at debian.org> Sun, 28 Jun 2015 23:53:29 +0300
+
+pjproject (2.1.0.0.ast20130823-1) unstable; urgency=low
+
+ [ Jeremy Lainé ]
+ * Fix dh_auto_clean on an unconfigured source tree (Closes: #722013).
+ * Fix syntax error in machine-readable debian/copyright.
+ * Update Standards-Version to 3.9.4 (no changes).
+
+ [ Tzafrir Cohen ]
+ * Further copyright fixes.
+ * New upstream git snapshot:
+ pkgconfig_nodestdir.patch, soname.patch dropped: merged upstream.
+ * fix_gcc_warn.patch: remove some build warnings.
+
+ -- Tzafrir Cohen <tzafrir at debian.org> Thu, 12 Sep 2013 16:53:51 +0300
+
+pjproject (2.1.0~ast20130801-1) unstable; urgency=low
+
+ * Initial release. (Closes: #708122)
+
+ -- Tzafrir Cohen <tzafrir at debian.org> Wed, 07 Aug 2013 22:20:07 +0300
diff --cc debian/patches/0001-Remove-pointless-linking-with-libasound.patch
index c2f02fa,0000000..2051756
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,27 -1,0 +1,30 @@@
- From 14ef4deafe2cae51e2100a4897665c489476bafb Mon Sep 17 00:00:00 2001
++From 428ccbd291634ba43265c6ef66cc362876cae064 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 | 1 -
- 1 file changed, 1 deletion(-)
++ aconfigure.ac | 4 +---
++ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/aconfigure.ac b/aconfigure.ac
- index 179dfac..e86e27c 100644
++index 846a782..0f0e201 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)])
++@@ -663,9 +663,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 4ea154f,0000000..63b79cc
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 c19ac09a2637e0f32186d37a272c204c237f7070 Mon Sep 17 00:00:00 2001
++From 07bd3e90c8832e955b9779b3183ef8349e66661d 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 e86e27c..72446dd 100644
++index 0f0e201..214284d 100644
+--- a/aconfigure.ac
++++ b/aconfigure.ac
- @@ -114,7 +114,8 @@ AC_CHECK_LIB(winmm,puts)
++@@ -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)
+
- @@ -1532,8 +1533,8 @@ AC_ARG_ENABLE(ssl,
++@@ -1618,8 +1619,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
+--- 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 f860dcd,0000000..64388f4
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 8ef6c96798adeab34a7b25aed593af66cba056c4 Mon Sep 17 00:00:00 2001
++From b37e87152e7de654d452e290aa3142325ca1dab3 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
+--- 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 702efdc..340bfc4 100644
++index 53faa2d..f7ad4cd 100644
+--- a/pjmedia/build/Makefile
++++ b/pjmedia/build/Makefile
- @@ -84,6 +84,7 @@ export PJMEDIA_LDFLAGS += $(PJMEDIA_VIDEODEV_LDLIB) \
- $(PJLIB_LDLIB) \
++@@ -82,6 +82,7 @@ export PJMEDIA_CXXFLAGS += $(_CXXFLAGS)
++ export PJMEDIA_LDFLAGS += $(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)
++@@ -97,6 +98,7 @@ export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
+ export PJMEDIA_AUDIODEV_CXXFLAGS += $(_CXXFLAGS)
- export PJMEDIA_AUDIODEV_LDFLAGS += $(PJLIB_LDLIB) \
++ 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 4288eb1,0000000..e70dc50
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 7e0432730b897797d9cbef2e272670a7b76d44a6 Mon Sep 17 00:00:00 2001
++From 0fd2c8bedfaa6f3f9ba2f8e78987c85a1ab243c3 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 c76a662,0000000..b4a037d
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 02756cc4c005bb5ef889c8057a62d6344ef3e0b1 Mon Sep 17 00:00:00 2001
++From c87b5207300ae325f8af1e4dbe4d12a17e0f2b2b 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
+--- 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/0006-Reduce-linkage-of-unused-libraries.patch
index b4a719a,0000000..89dd9c4
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 baade10faadee85cfd996e776dc05225f35c3599 Mon Sep 17 00:00:00 2001
++From b6c5de5dc60cef9462e9776b8bd23814e5eaa932 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 72446dd..db287a1 100644
++index 214284d..c097d86 100644
+--- a/aconfigure.ac
++++ b/aconfigure.ac
- @@ -115,6 +115,11 @@ AC_CHECK_LIB(socket,puts)
++@@ -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)
- @@ -951,7 +956,9 @@ AC_ARG_ENABLE(sdl,
++@@ -959,7 +964,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
-
++@@ -1098,7 +1105,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
+ ]
+ )
- @@ -1109,7 +1120,10 @@ AC_ARG_ENABLE(v4l2,
++@@ -1119,7 +1130,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"
++
+ ]
+ )
+ ])
- @@ -1611,7 +1625,7 @@ AC_ARG_ENABLE(opencore_amr,
++@@ -1697,7 +1711,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)
- @@ -1625,7 +1639,7 @@ AC_ARG_ENABLE(opencore_amr,
++@@ -1711,7 +1725,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
+--- 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 340bfc4..83d852a 100644
++index f7ad4cd..4d24cf9 100644
+--- a/pjmedia/build/Makefile
++++ b/pjmedia/build/Makefile
- @@ -85,6 +85,7 @@ export PJMEDIA_LDFLAGS += $(PJMEDIA_VIDEODEV_LDLIB) \
++@@ -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 0221ea7,0000000..04eb35b
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 24cd21cda01347fb146bbc7c41bdbdc89db85439 Mon Sep 17 00:00:00 2001
++From 163e66a1ce3475d66354f9a20bec250245661d7e 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
+--- 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
+
+ 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
+
+ ###############################################################################
diff --cc debian/patches/series
index 1062c55,0000000..94b3174
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,9 -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-Reduce-linkage-of-unused-libraries.patch
- 0008-Replace-deprecated-FFmpeg-API.patch
- 0009-add-v5-suffix-to-soname-of-libpjsua2-2.patch
++0005-Remove-video-libs-dependency-for-pj-utils-and-pjnath.patch
++0006-Reduce-linkage-of-unused-libraries.patch
++0007-add-v5-suffix-to-soname-of-libpjsua2-2.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