[Pkg-voip-commits] [opal] 02/04: Imported Debian patch 3.10.10~dfsg2-1
Victor Seva Lopez
maniac-guest at moszumanska.debian.org
Sun Aug 16 10:10:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
maniac-guest pushed a commit to branch master
in repository opal.
commit 6e6e624b76df413c08181a7cd8466d90526d6b8c
Merge: 6abd233 346d9af
Author: Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
Date: Mon Oct 27 05:51:57 2014 +0200
Imported Debian patch 3.10.10~dfsg2-1
ChangeLog-opal-v3_10_4.txt | 794 -
Makefile.in | 15 +-
configure | 386 +-
configure.ac | 58 +-
debian/changelog | 91 +
debian/control | 19 +-
debian/copyright | 74 +-
...ibopal3.10.4.install => libopal3.10.10.install} | 0
debian/patches/libav10.patch | 208 +
debian/patches/libav9.patch | 543 +
debian/patches/series | 3 +-
debian/patches/spandsp_autoconf_cppflags.patch | 86 -
debian/rules | 17 +-
include/codec/opalplugin.h | 14 +-
include/codec/opalplugin.hpp | 7 +-
include/codec/opalpluginmgr.h | 57 +-
include/codec/rfc2833.h | 9 +-
include/codec/vidcodec.h | 20 +-
include/h224/h224handler.h | 41 +-
include/h323/channels.h | 15 +-
include/h323/h323caps.h | 43 +-
include/h323/h323con.h | 90 +-
include/h323/h323ep.h | 12 +-
include/h323/h323pdu.h | 19 +-
include/iax2/callprocessor.h | 9 +-
include/iax2/iax2con.h | 23 +-
include/iax2/iax2medstrm.h | 14 +-
include/im/im.h | 7 +-
include/im/msrp.h | 7 +-
include/lids/capi_ep.h | 19 +-
include/lids/lidep.h | 12 +-
include/opal.h | 21 +-
include/opal/buildopts.h.in | 7 +-
include/opal/call.h | 9 +-
include/opal/connection.h | 62 +-
include/opal/console_mgr.h | 14 +-
include/opal/endpoint.h | 12 +-
include/opal/ivr.h | 12 +-
include/opal/localep.h | 133 +-
include/opal/manager.h | 14 +-
include/opal/mediafmt.h | 39 +-
include/opal/mediastrm.h | 62 +-
include/opal/opalmixer.h | 40 +-
include/opal/patch.h | 11 +-
include/opal/pcss.h | 33 +-
include/opal/pres_ent.h | 15 +-
include/opal/recording.h | 34 +-
include/opal/transports.h | 14 +-
include/rtp/jitter.h | 10 +-
include/rtp/metrics.h | 219 +-
include/rtp/pcapfile.h | 9 +-
include/rtp/rtp.h | 57 +-
include/sip/handlers.h | 9 +-
include/sip/sipcon.h | 19 +-
include/sip/sipep.h | 13 +-
include/sip/sippdu.h | 20 +-
include/sip/sippres.h | 18 +-
include/t38/t38proto.h | 9 +-
opal.dsw | 155 -
opal.m4 | 78 +-
opal_2003.sln | 74 -
opal_defs.mak.in | 8 +-
opal_samples_2003.sln | 152 -
opalce.vcp | 32102 ------
opalce.vcw | 29 -
plugins/Installer_2003.vdproj | 1340 -
plugins/LID/CM_HID/cm_hid_2008.vcproj | 2 +
plugins/LID/CM_HID/cm_hid_2010.vcxproj | 7 +-
plugins/LID/TigerJet/TJ_2008.vcproj | 2 +
plugins/LID/WinXP_HID/winxp_hid_2010.vcxproj | 9 +-
plugins/audio/EasyCodec/EasyCodecs.dsw | 65 -
plugins/audio/EasyCodec/EasyG722.dsp | 118 -
plugins/audio/EasyCodec/EasyG7231.dsp | 118 -
plugins/audio/EasyCodec/EasyG7231_2008.vcproj | 2 +
plugins/audio/EasyCodec/EasyG728.dsp | 118 -
plugins/audio/EasyCodec/EasyG728_2008.vcproj | 2 +
plugins/audio/EasyCodec/EasyG729A.dsp | 119 -
plugins/audio/EasyCodec/EasyG729A_2008.vcproj | 2 +
plugins/audio/G.722.1/G.722.1_2008.vcproj | 2 +-
plugins/audio/G.722.2/G.722.2_2008.vcproj | 2 +-
plugins/audio/G722/g722_2003.vcproj | 178 -
plugins/audio/G722/g722_2008.vcproj | 2 +
plugins/audio/G7231ACM/g7231acm.dsp | 115 -
plugins/audio/G726/G726.dsp | 147 -
plugins/audio/G726/G726.vcproj | 269 -
plugins/audio/G726/G726_2008.vcproj | 2 +
plugins/audio/GSM0610/gsm0610.dsp | 218 -
plugins/audio/GSM0610/gsm0610.vcproj | 525 -
plugins/audio/GSM0610/gsm0610_2008.vcproj | 4 +-
plugins/audio/IMA_ADPCM/IMA_ADPCM.dsp | 102 -
plugins/audio/IMA_ADPCM/IMA_ADPCM.vcproj | 163 -
plugins/audio/IMA_ADPCM/IMA_ADPCM_2008.vcproj | 2 +
plugins/audio/LPC_10/LPC_10.dsp | 604 -
plugins/audio/LPC_10/LPC_10.vcproj | 913 -
plugins/audio/LPC_10/LPC_10_2008.vcproj | 2 +
plugins/audio/SILK/SILK_2008.vcproj | 4 +-
plugins/audio/SILK/SILK_2010.vcxproj | 1 -
plugins/audio/SILK/SILK_SDK/Makefile | 2 +-
plugins/audio/Speex/Speex.dsp | 250 -
plugins/audio/Speex/Speex_2008.vcproj | 2 +
plugins/audio/VoiceAgeG729/VoiceAgeG729.dsp | 109 -
plugins/audio/VoiceAgeG729/VoiceAgeG729.vcproj | 162 -
.../audio/VoiceAgeG729/VoiceAgeG729_2008.vcproj | 2 +
plugins/audio/gsm-amr/Makefile.in | 6 +-
plugins/audio/gsm-amr/amrcodec.c | 15 +-
plugins/audio/gsm-amr/gsmamr.dsp | 166 -
plugins/audio/gsm-amr/gsmamr.vcproj | 280 -
plugins/audio/gsm-amr/gsmamr_2008.vcproj | 2 +
plugins/audio/iLBC/Makefile.in | 49 +
plugins/audio/iLBC/iLBC/FrameClassify.c | 109 +
plugins/audio/iLBC/iLBC/FrameClassify.h | 26 +
plugins/audio/iLBC/iLBC/LPCdecode.c | 151 +
plugins/audio/iLBC/iLBC/LPCdecode.h | 44 +
plugins/audio/iLBC/iLBC/LPCencode.c | 227 +
plugins/audio/iLBC/iLBC/LPCencode.h | 29 +
plugins/audio/iLBC/iLBC/StateConstructW.c | 75 +
plugins/audio/iLBC/iLBC/StateConstructW.h | 27 +
plugins/audio/iLBC/iLBC/StateSearchW.c | 193 +
plugins/audio/iLBC/iLBC/StateSearchW.h | 48 +
plugins/audio/iLBC/iLBC/anaFilter.c | 70 +
plugins/audio/iLBC/iLBC/anaFilter.h | 26 +
plugins/audio/iLBC/iLBC/constants.c | 729 +
plugins/audio/iLBC/iLBC/constants.h | 74 +
plugins/audio/iLBC/iLBC/createCB.c | 215 +
plugins/audio/iLBC/iLBC/createCB.h | 56 +
plugins/audio/iLBC/iLBC/doCPLC.c | 258 +
plugins/audio/iLBC/iLBC/doCPLC.h | 32 +
plugins/audio/iLBC/iLBC/enhancer.c | 664 +
plugins/audio/iLBC/iLBC/enhancer.h | 33 +
plugins/audio/iLBC/iLBC/extract-cfile.awk | 17 +
plugins/audio/iLBC/iLBC/filter.c | 167 +
plugins/audio/iLBC/iLBC/filter.h | 73 +
plugins/audio/iLBC/iLBC/gainquant.c | 106 +
plugins/audio/iLBC/iLBC/gainquant.h | 31 +
plugins/audio/iLBC/iLBC/getCBvec.c | 180 +
plugins/audio/iLBC/iLBC/getCBvec.h | 28 +
plugins/audio/iLBC/iLBC/helpfun.c | 307 +
plugins/audio/iLBC/iLBC/helpfun.h | 101 +
plugins/audio/iLBC/iLBC/hpInput.c | 59 +
plugins/audio/iLBC/iLBC/hpInput.h | 27 +
plugins/audio/iLBC/iLBC/hpOutput.c | 59 +
plugins/audio/iLBC/iLBC/hpOutput.h | 25 +
plugins/audio/iLBC/iLBC/iCBConstruct.c | 107 +
plugins/audio/iLBC/iLBC/iCBConstruct.h | 38 +
plugins/audio/iLBC/iLBC/iCBSearch.c | 478 +
plugins/audio/iLBC/iLBC/iCBSearch.h | 35 +
plugins/audio/iLBC/iLBC/iLBC_decode.c | 618 +
plugins/audio/iLBC/iLBC/iLBC_decode.h | 40 +
plugins/audio/iLBC/iLBC/iLBC_define.h | 204 +
plugins/audio/iLBC/iLBC/iLBC_encode.c | 513 +
plugins/audio/iLBC/iLBC/iLBC_encode.h | 37 +
plugins/audio/iLBC/iLBC/lsf.c | 263 +
plugins/audio/iLBC/iLBC/lsf.h | 30 +
plugins/audio/iLBC/iLBC/packing.c | 174 +
plugins/audio/iLBC/iLBC/packing.h | 67 +
plugins/audio/iLBC/iLBC/syntFilter.c | 107 +
plugins/audio/iLBC/iLBC/syntFilter.h | 27 +
plugins/audio/iLBC/ilbccodec.c | 633 +
.../Speex.vcproj => iLBC/ilbccodec_2005.vcproj} | 726 +-
.../ilbccodec_2008.vcproj} | 407 +-
plugins/audio/iLBC/ilbccodec_2010.vcxproj | 304 +
plugins/audio/iLBC/ilbccodec_2010.vcxproj.filters | 86 +
plugins/configure | 497 +-
plugins/configure.ac | 25 +-
plugins/plugin-config.h.in | 6 -
plugins/plugins_2003.sln | 253 -
plugins/plugins_2008.sln | 234 +-
plugins/plugins_2010.sln | 81 +-
plugins/video/H.261-vic/h261vic.cxx | 158 +-
plugins/video/H.261-vic/h261vic_2008.vcproj | 4 +-
plugins/video/H.263-1998/h263-1998.cxx | 188 +-
plugins/video/H.263-1998/h263-1998.h | 20 +-
plugins/video/H.263-1998/h263_2008.vcproj | 14 +-
plugins/video/H.263-1998/rfc2190.cxx | 120 +-
plugins/video/H.263-1998/rfc2190.h | 8 +-
plugins/video/H.263-1998/rfc2429.cxx | 34 +-
plugins/video/H.263-1998/rfc2429.h | 27 +-
plugins/video/H.264/gpl/ReadMe.txt | 32 +
plugins/video/H.264/gpl/h264_helper.cxx | 31 +-
.../H.264/gpl/x264plugin_helper.vcproj} | 93 +-
.../H.264/gpl/x264plugin_helper.vcxproj} | 94 +-
plugins/video/H.264/h264-x264.cxx | 244 +-
plugins/video/H.264/h264-x264_2008.vcproj | 15 +-
plugins/video/H.264/shared/h264frame.cxx | 176 +-
plugins/video/H.264/shared/h264frame.h | 57 +-
plugins/video/H.264/shared/x264wrap.cxx | 161 +-
plugins/video/H.264/shared/x264wrap.h | 6 +-
plugins/video/MPEG4-ffmpeg/mpeg4.cxx | 6 +-
plugins/video/MPEG4-ffmpeg/mpeg_2008.vcproj | 4 +-
plugins/video/common/dyna.cxx | 131 +-
plugins/video/common/dyna.h | 1 -
plugins/video/common/ffmpeg.h | 34 +-
plugins/video/common/platform.h | 3 -
revision.h.in | 8 +-
samples/c_api/c_api_2003.vcproj | 237 -
samples/callgen/callgen_2003.vcproj | 286 -
samples/callgen/callgen_2010.vcxproj | 2 +
samples/callgen/main.cxx | 14 +-
samples/codectest/codectest_2003.vcproj | 286 -
samples/codectest/codectest_2010.vcxproj | 2 +
samples/codectest/main.cxx | 78 +-
samples/dotnet/OpalDotNET.sln | 42 +
samples/dotnet/OpalDotNET/Opal.cs | 2155 +
samples/dotnet/OpalDotNET/OpalContext.cs | 2291 +
samples/dotnet/OpalDotNET/OpalDotNET.csproj | 65 +
.../dotnet/OpalDotNET/Properties/AssemblyInfo.cs | 36 +
.../dotnet/OpalDotNETMain/OpalDotNETMain.csproj | 63 +
samples/dotnet/OpalDotNETMain/Program.cs | 672 +
.../OpalDotNETMain/Properties/AssemblyInfo.cs | 36 +
samples/dotnet/ReadMe.txt | 9 +
samples/faxopal/FaxOPAL_2003.vcproj | 285 -
samples/faxopal/FaxOPAL_2010.vcxproj | 2 +
samples/faxopal/main.cxx | 43 +-
samples/faxopal/test.sh | 53 +-
samples/ivropal/IvrOPAL_2003.vcproj | 285 -
samples/ivropal/IvrOPAL_2010.vcxproj | 2 +
samples/ivropal/main.cxx | 10 +-
samples/ivropal/test.vxml | 15 +-
samples/jester/jester.dsp | 148 -
samples/jester/jester.dsw | 29 -
samples/jester/jester.vcproj | 284 -
samples/jester/jester_2010.vcxproj | 4 +-
samples/lidtest/lidtest_2003.vcproj | 206 -
samples/mfc/mfc.dsp | 156 -
samples/mfc/mfc.dsw | 29 -
samples/mfc/mfc.vcproj | 359 -
samples/opalcodecinfo/opalcodecinfo.dsp | 149 -
samples/opalcodecinfo/opalcodecinfo.dsw | 29 -
samples/opalcodecinfo/opalcodecinfo.vcproj | 226 -
samples/opalecho/opalecho_2010.vcxproj | 4 +-
samples/opalgw/opalgw.dsp | 202 -
samples/opalgw/opalgw.dsw | 29 -
samples/opalgw/opalgw.vcproj | 329 -
samples/opalgw/opalgw_2010.vcxproj | 4 +-
samples/opalmcu/OPAL_MCU_2003.vcproj | 285 -
samples/opalmcu/OPAL_MCU_2010.vcxproj | 2 +
samples/opalmcu/main.cxx | 10 +-
samples/openphone/OpenPhone.dsp | 150 -
samples/openphone/OpenPhone.dsw | 29 -
samples/openphone/OpenPhone.vcproj | 325 -
samples/openphone/OpenPhone.wxs | 8 +-
samples/openphone/OpenPhone_2008.sln | 14 +
samples/openphone/OpenPhone_2008.vcproj | 18 +-
samples/openphone/OpenPhone_2010.vcxproj | 9 +-
samples/openphone/main.cxx | 177 +-
samples/openphone/main.h | 30 +-
samples/openphone/openphone.wxg | 24 +-
samples/openphone/openphone.xrc | 8598 +-
samples/openphone/version.h | 12 +-
samples/playrtp/main.cxx | 76 +-
samples/playrtp/playrtp_2003.vcproj | 285 -
samples/playrtp/playrtp_2010.vcxproj | 2 +
samples/simple/main.cxx | 6 +-
samples/simple/simple.dsp | 148 -
samples/simple/simple.dsw | 29 -
samples/simple/simple.vcproj | 280 -
samples/simple/simpleDLL.vcproj | 280 -
samples/simple/simpleDLL_2008.vcproj | 325 +-
samples/simple/simpleDLL_2010.vcxproj | 2 +
samples/simple/simple_2008.vcproj | 271 +-
samples/simple/simple_2010.vcxproj | 2 +
src/Ruby/ruby_swig_wrapper.cxx | 80 +-
src/codec/opalpluginmgr.cxx | 153 +-
src/codec/opalwavfile.cxx | 9 +-
src/codec/rfc2833.cxx | 48 +-
src/h224/h224.cxx | 14 +-
src/h323/channels.cxx | 48 +-
src/h323/h323.cxx | 484 +-
src/h323/h323caps.cxx | 287 +-
src/h323/h323ep.cxx | 59 +-
src/h323/h323pdu.cxx | 86 +-
src/h323/h323rtp.cxx | 35 +-
src/iax2/callprocessor.cxx | 15 +-
src/iax2/iax2con.cxx | 16 +-
src/iax2/iax2medstrm.cxx | 14 +-
src/im/msrp.cxx | 8 +-
src/java/OPALJNI.java | 2 +
src/java/OpalMediaTiming.java | 3 +-
src/java/OpalParamGeneral.java | 8 +
src/java/java_swig_wrapper.cxx | 30 +-
src/lids/capi_ep.cxx | 114 +-
src/lids/lidep.cxx | 8 +-
src/opal/call.cxx | 105 +-
src/opal/connection.cxx | 92 +-
src/opal/console_mgr.cxx | 86 +-
src/opal/endpoint.cxx | 16 +-
src/opal/ivr.cxx | 11 +-
src/opal/localep.cxx | 63 +-
src/opal/manager.cxx | 46 +-
src/opal/mediafmt.cxx | 34 +-
src/opal/mediastrm.cxx | 193 +-
src/opal/opal_c.cxx | 42 +-
src/opal/opalmixer.cxx | 70 +-
src/opal/patch.cxx | 121 +-
src/opal/pcss.cxx | 50 +-
src/opal/pres_ent.cxx | 39 +-
src/opal/recording.cxx | 56 +-
src/opal/transcoders.cxx | 9 +-
src/opal/transports.cxx | 32 +-
src/rtp/jitter.cxx | 32 +-
src/rtp/metrics.cxx | 551 +-
src/rtp/pcapfile.cxx | 12 +-
src/rtp/rtp.cxx | 444 +-
src/sip/handlers.cxx | 181 +-
src/sip/sdp.cxx | 9 +-
src/sip/sipcon.cxx | 353 +-
src/sip/sipep.cxx | 137 +-
src/sip/sippdu.cxx | 132 +-
src/sip/sippres.cxx | 134 +-
src/t38/t38proto.cxx | 91 +-
src/win32/CopyDTF_2003.bat | 7 -
src/win32/opal.dtf | 33881 ------
src/win32/opal_2003.dtf | 41273 -------
src/win32/opal_2005.dtf | 2496 +-
src/win32/opal_2005_wm.dtf | 2624 +-
src/win32/opal_2005_wm6.dtf | 2624 +-
src/win32/opal_2008.dtf | 2579 +-
src/win32/opal_2010.dtf | 94326 ++++++++--------
src/win32/opal_dll.dsp | 294 -
src/win32/opal_dll.vcproj | 422 -
src/win32/opal_dll_2008.vcproj | 987 +-
src/win32/opal_lib.dsp | 3237 -
src/win32/opal_lib.vcproj | 3551 -
src/win32/opal_lib_2008.vcproj | 346 +-
src/win32/opal_lib_2010.vcxproj | 3 +
src/win32/opald.dtf | 38271 -------
src/win32/opald_2003.dtf | 46205 --------
src/win32/opald_2005.dtf | 2724 +-
src/win32/opald_2005_wm.dtf | 2835 +-
src/win32/opald_2005_wm6.dtf | 2835 +-
src/win32/opald_2008.dtf | 2788 +-
src/win32/opald_2010.dtf | 106699 +++++++++---------
src/win32/opaln.dtf | 29248 -----
src/win32/opaln_2003.dtf | 35310 ------
src/win32/opaln_2005.dtf | 2495 +-
src/win32/opaln_2005_wm.dtf | 2623 +-
src/win32/opaln_2005_wm6.dtf | 2623 +-
src/win32/opaln_2008.dtf | 2578 +-
src/win32/opaln_2010.dtf | 94071 +++++++--------
version.h | 2 +-
340 files changed, 190095 insertions(+), 449431 deletions(-)
diff --cc debian/changelog
index 4224422,0000000..734ca83
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,449 -1,0 +1,540 @@@
++opal (3.10.10~dfsg2-1) unstable; urgency=low
++
++ * Remove one non free document (RFC) from source package.
++ * Remove now useless DM-Upload-Allowed from debian/control.
++ * Print complete compilation lines during building.
++
++ -- Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr> Mon, 27 Oct 2014 05:51:57 +0200
++
++opal (3.10.10~dfsg-2.2) unstable; urgency=medium
++
++ * Non-maintainer upload.
++ * Add libav10.patch to fix FTBFS with Libav10 (Closes: #739439)
++
++ -- Reinhard Tartler <siretart at tauware.de> Sat, 03 May 2014 15:51:57 -0400
++
++opal (3.10.10~dfsg-2.1) unstable; urgency=low
++
++ * Non-maintainer upload.
++ * debian/patches/libav9.patch: Backport changes for libav 9 and link against
++ libavcodec and libavutil instead of loading it with dlopen. (Closes:
++ #720824)
++ * debian/control: Remove explicit dependency on libavcodec. This is now
++ generated by dpkg-shlibdeps.
++
++ -- Sebastian Ramacher <sramacher at debian.org> Fri, 13 Sep 2013 13:21:27 +0200
++
++opal (3.10.10~dfsg-2) unstable; urgency=low
++
++ * Upload to unstable
++
++ -- Mark Purcell <msp at debian.org> Sat, 02 Mar 2013 12:49:36 +1100
++
++opal (3.10.10~dfsg-1) experimental; urgency=low
++
++ [ Eugen Dedu ]
++ * New upstream release
++ * Do not remove iLBC audio codec anymore, since it is free now
++ * Depend on libavcodec-extra-53 too (Closes: #695691)
++
++ -- Mark Purcell <msp at debian.org> Tue, 27 Nov 2012 21:28:55 +1100
++
++opal (3.10.9~dfsg-1) experimental; urgency=low
++
++ [ Eugen Dedu ]
++ * New upstream release
++ - fix build on kFreeBSD
++ * NEW package libopal3.10.9 - match-soname
++ * Remove obsolete conflict with libopenmpi-dev (Closes: #694652)
++
++ -- Mark Purcell <msp at debian.org> Tue, 27 Nov 2012 21:28:55 +1100
++
++opal (3.10.7~dfsg-3) experimental; urgency=low
++
++ [ Eugen Dedu ]
++ * Make libopal package manually depend on libavcodec package, since opal
++ loads libavcodec functions during runtime.
++
++ [ Mark Purcell ]
++ * Fix "missing informations in debian/copyright"
++ - Added plugins/audio/GSM0610/COPYRIGHT (Closes: #532456)
++
++ -- Mark Purcell <msp at debian.org> Tue, 09 Oct 2012 22:48:43 +1100
++
++opal (3.10.7~dfsg-2) experimental; urgency=low
++
++ [ Eugen Dedu ]
++ * Enable H263/4 codecs
++
++ [ Mark Purcell ]
++ * Fixes "Segfault in std::less<unsigned int>::operator() from
++ /usr/lib/libopal.so.3.10.4" (Closes: #687079)
++ * Fixes "segfault of ekiga in libopal" (Closes: #685399)
++ * Switch to xz compression
++
++ -- Mark Purcell <msp at debian.org> Sat, 15 Sep 2012 13:20:59 +1000
++
++opal (3.10.7~dfsg-1) experimental; urgency=low
++
++ * New Upstream Release
++ - Fixes "Opal 3.10.4 fails to build" (Closes: #674683)
++ * NEW package libopal3.10.7 - match-soname
++
++ -- Mark Purcell <msp at debian.org> Sat, 01 Sep 2012 13:30:03 +1000
++
++opal (3.10.5~dfsg-1) experimental; urgency=low
++
++ * New Upstream Release
++ * NEW package libopal3.10.5 - match-soname
++
++ -- Mark Purcell <msp at debian.org> Sun, 27 May 2012 09:39:53 +1000
++
+opal (3.10.4~dfsg-3) unstable; urgency=low
+
+ * Drop unsupported CELT codec
+
+ -- Mark Purcell <msp at debian.org> Wed, 23 May 2012 07:42:55 +1000
+
+opal (3.10.4~dfsg-2) unstable; urgency=low
+
+ * Build-Depends libcapi20-dev [linux-any]
+
+ -- Mark Purcell <msp at debian.org> Sat, 10 Mar 2012 10:33:32 +1100
+
+opal (3.10.4~dfsg-1) unstable; urgency=low
+
+ * New Upstream Release
+ - NEW package libopal3.10.4 - soname change
+
+ [ Eugen Dedu ]
+ * Remove unnecessary libavcodec-dev from Build-Depends
+
+ [ Mark Purcell ]
+ * Drop symbol support - few rdepends and exporting lots of symbols (C++)
+ * disable-samples-ftbfs too not build samples that currently FTBFS
+ * Add libopal-doc.examples - samples
+
+ -- Mark Purcell <msp at debian.org> Thu, 08 Mar 2012 22:26:07 +1100
+
+opal (3.10.1~dfsg-1) experimental; urgency=low
+
+ * New upstream release: 3.10.1 (Luythen)
+ * Put myself back into Uploaders
+ * Bump debhelper compat to 8
+ * Fix debian/watch to allow double digit minor version
+ * Bump PTLib depends to 2.10 version (Luythen) as well
+ * Bump Debian source version to 3.0
+ * Enable samples to be built with --enable-samples instead of explicitly
+ building them in debian/rules
+ * Add libspandsp-dev (>= 0.0.6~pre17) to Build-Deps to allow T.38 to use it
+ * Add debian/clean for all files that need to be purged before rebuild
+ * Add debian/patches/plugins_clean_target.patch: Most of the plugins don't
+ have a clean target and thus don't allow rebuilds
+ * Update debian/rules to cope with latest samples compilation changes
+ upstream
+ * Remove Changelog from docs as upstream doesn't ship it
+ * Replace jquery.js with Debian's libjs-jquery version to make lintian happy
+ * Add symbols file for libopal3.10.1 (but don't fail builds while we're in
+ experimental)
+ * Add pkg-kde-tools to take advantage of pkgkde-symbolshelper which is
+ better suited for C++ libs - thanks to Modestas Vainius!
+ (this makes c++ symbol files somewhat less painful. But still different
+ g++ versions emit a bit different symbol sets so ftbfs'es happen)
+ * Add libavcodec-dev to enable H.263
+ * Register API documentation with doc-base
+ * Patch spandsp_autoconf_cppflags backported from upstream trunk
+ * Adjust DFSG-repack: Remove *.dll and *.exe from upstream source
+ * Fix Vcs-Browser URL
+ * Bump Standards-Version to 3.9.2
+
+ -- Kilian Krause <kilian at debian.org> Tue, 12 Jul 2011 10:28:19 +0200
+
+opal (3.8.4~dfsg-1) experimental; urgency=low
+
+ * New Upstream Release
+ * NEW package libopal3.8.4 - soname bump
+
+ -- Mark Purcell <msp at debian.org> Wed, 02 Mar 2011 06:08:40 +1100
+
+opal (3.8.3~dfsg-1) experimental; urgency=low
+
+ * New Upstream Release
+ * NEW package libopal3.8.3 - soname bump
+
+ -- Mark Purcell <msp at debian.org> Sat, 29 Jan 2011 20:18:35 +1100
+
+opal (3.8.2~dfsg-1) experimental; urgency=low
+
+ * New Upstream Release
+ * Refresh simpleopal.1
+
+ -- Mark Purcell <msp at debian.org> Sun, 25 Jul 2010 18:53:53 +1000
+
+opal (3.8.1~dfsg-1) experimental; urgency=low
+
+ * New upstream release
+ - NEW packages libopal[3.8.1,-dbg] - soname bump
+ * Merge from branches/opal3.6
+
+ -- Mark Purcell <msp at debian.org> Sun, 30 May 2010 17:29:57 +1000
+
+opal (3.6.8~dfsg-2) unstable; urgency=high
+
+ * Fix RC bug "implicit conflict against libopal3.6.6-dbg"
+ - Urgency high - RC bug
+ - Switch to common package: libopal-dbg (Closes: #585860)
+ - Conflicts:/ Replaces: libopal3.6.8-dbg, libopal3.6.6-dbg
+ * Update Standards-Version: 3.8.4
+ * source/format -> 3.0 (quilt)
+
+ -- Mark Purcell <msp at debian.org> Tue, 15 Jun 2010 00:25:54 +1000
+
+opal (3.6.8~dfsg-1) unstable; urgency=low
+
+ * New upstream release (Closes: #572384, #583420)
+ - NEW packages libopal3.6.8[-dbg] - soname bump
+
+ [ Eugen Dedu ]
+ * Remove Build-Conflict with its own runtime
+ * add back celt building
+
+ [ Mark Purcell ]
+ * Fix "opal should build-depend on libsrtp-dev, and libopal-dev should
+ depend on libsrtp0-dev" Build Depends added (Closes: #575195)
+ * Drop libptX.X.X-plugins - included in libptX.X.X library binary
+
+ -- Mark Purcell <msp at debian.org> Sat, 29 May 2010 10:42:18 +1000
+
+opal (3.6.6~dfsg-6) unstable; urgency=low
+
+ * Include *.mak in /usr/include/opal/
+ * simpleopal Depends: back to libpt2.6.5-plugins
+ - "simpleopal: Depends on unavailable libpt2.6.6-plugins" (Closes: #579765)
+
+ -- Mark Purcell <msp at debian.org> Sat, 01 May 2010 07:37:48 +1000
+
+opal (3.6.6~dfsg-5) unstable; urgency=low
+
+ * Constrain debian/watch to track 3.6 series (Lalande release)
+ * Move to svn://svn.debian.org/pkg-voip/opal/branches/opal-3.6/
+ * Switch to debhelper 7
+ * Drop unused dpatch, cdbs
+ * Do not exclude simpleopal from dh_strip
+
+ -- Mark Purcell <msp at debian.org> Mon, 26 Apr 2010 11:55:39 +1000
+
+opal (3.6.6~dfsg-4) unstable; urgency=low
+
+ [ Eugen Dedu ]
+ * Disable celt codec, since celt is changing its API and upstream
+ source does not compile with the new 0.7.0 celt release (Closes: #556832)
+ * Remove some conflicts with non-official snapshot packages.
+ * Remove unuseful libavcodec-dev from Build-Depends (it does not bring
+ any new encoder and hurts non-official packages).
+
+ [ Mark Purcell ]
+ * Build-Conflicts: libcelt-dev
+
+ -- Mark Purcell <msp at debian.org> Mon, 01 Feb 2010 17:30:21 +0100
+
+opal (3.6.6~dfsg-3) unstable; urgency=low
+
+ * Add Build-Conflicts: libx264-dev (fails DFSG)
+ - Fixes "uninstallable on i386, was built with libx264" (Closes: #550516)
+ * Remove simpleopal debug file, will be resurrected if really needed
+ (Closes: #550168)
+
+ -- Mark Purcell <msp at debian.org> Mon, 12 Oct 2009 07:51:01 +1100
+
+opal (3.6.6~dfsg-2) unstable; urgency=low
+
+ * Add missing Build-Depends: libcapi20-dev, libavcodec-dev
+
+ -- Mark Purcell <msp at debian.org> Sat, 10 Oct 2009 09:57:50 +1100
+
+opal (3.6.6~dfsg-1) unstable; urgency=low
+
+ [ Eugen Dedu ]
+ * New upstream release
+ - fix "SEGV in SIP_PDU::Write" (Closes: #538734)
+ * Remove simpleopal.dpatch, integrated upstream.
+ * simpleopal should depend on libpt plugins (Closes: #542220)
+
+ -- Mark Purcell <msp at debian.org> Sat, 03 Oct 2009 18:12:29 +1000
+
+opal (3.6.4~dfsg-1) unstable; urgency=low
+
+ * New Upstream Release
+ * Fix "Rate controller skips too many frames", stolen from upstream.
+
+ -- Mark Purcell <msp at debian.org> Thu, 09 Jul 2009 08:12:53 +1000
+
+opal (3.6.3~dfsg-2) unstable; urgency=low
+
+ [ Eugen Dedu ]
+ * Fix ptlib dependency, which lead to build failure (Closes: #533631)
+
+ -- Mark Purcell <msp at debian.org> Sat, 06 Jun 2009 17:43:25 +1000
+
+opal (3.6.3~dfsg-1) unstable; urgency=low
+
+ * New Upstream Release
+ - soname bump - NEW package libopal3.6.3
+ - libpt transition
+ * Switch get-orig-source target to sf.net
+
+ [ Kilian Krause ]
+ * Remove -N from wget args in get-orig-source target as -O is already
+ used.
+
+ -- Mark Purcell <msp at debian.org> Sat, 06 Jun 2009 17:30:45 +1000
+
+opal (3.6.1~dfsg-1) unstable; urgency=low
+
+ [ Eugen Dedu ]
+ * debian/rules: Honour DEB_BUILD_OPTIONS parameter for parallel builds.
+ * Build-Depends on libcelt-dev.
+
+ [ Mark Purcell ]
+ * New upstream release
+ * Fix "simpleopal example dies with segfault" (Closes: #510988)
+ * Build-Depends: libpt-dev (>= 2.6.1)
+ * NEW packages; libopal-dev, libopal2.6.1, libopal-doc, libopal2.6.1-dbg
+ * debian/compat -> 7
+ * Use dh_install; Add [libopal-dev,simpleopal,libopal3.6.1].install
+ * Update to cdbs - correctly strips -dbg, parallel builds, et al
+ - cleanup debian/rules cruft
+ * Add Suggests: pkg-config
+ * Upload to unstable (libpt transition)
+
+ -- Mark Purcell <msp at debian.org> Mon, 27 Apr 2009 19:45:35 +1000
+
+opal (3.4.2~dfsg-2) experimental; urgency=low
+
+ [ Eugen Dedu ]
+ * Use Debian's speex library.
+
+ [ Mark Purcell ]
+ * Integrate historic debian/changelog from trunk
+ * Update debian/watch to check sf.net
+ * Fix hyphen-used-as-minus-sign debian/simpleopal.1
+
+ -- Mark Purcell <msp at debian.org> Sat, 15 Nov 2008 11:36:28 +1100
+
+opal (3.4.2~dfsg-1) experimental; urgency=low
+
+ [ Eugen Dedu ]
+ * New release version 3.4.2, with update and simplification of debian files
+ * Add a minimal man page for simpleopal.
+
+ -- Mark Purcell <msp at debian.org> Thu, 06 Nov 2008 21:44:30 +1100
+
+opal (2.2.11~dfsg1-5) UNRELEASED; urgency=low
+
+ * Add description for remove_ilbc.dpatch.
+ * Remove config.log at clean time.
+ * Remove duplicated word (the the) in the description of libopal-dev.
+
+ -- Patrick Matthäi <patrick.matthaei at web.de> Wed, 8 Oct 2008 21:21:56 +0200
+
+opal (3.3.0+svn20940.dfsg-1) voip; urgency=low
+
+ [ Eugen Dedu ]
+ * Build from svn snapshot REV 20940, refresh libname patch and rules
+ * Rename package to -beta1
+ * Build-Depends on libgsm1-dev in order to use Debian's library
+ * Remove h263-ffmpeg video codec, as suggested by upstream
+ * Remove, if any, plugins for non-free codecs (H263-1998, H264, MPEG4)
+
+ [ Mark Purcell ]
+ * Switch to svn export
+ * svn REV checkout is controlled from debian/changelog version
+ * Update Description: to explict state this svn snapshot
+
+ -- Mark Purcell <msp at debian.org> Thu, 11 Sep 2008 22:33:41 +1000
+
+opal (3.3.0+svn20930.dfsg-1) experimental; urgency=low
+
+ * First upload to debian.
+ [ Mark Purcell ]
+
+ * Ver 3.3.0 was tagged at REV=20681 thus this is 3.3.0+svnXXXX
+
+ -- Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr> Sun, 16 Aug 2008 00:00:00 +0200
+
+opal-snapshot (0-20080418-1) voip; urgency=low
+
+ * Built from SVN snapshots. No package support, please refer to
+ irc.gimp.net channel #ekiga for support. Do not complain about
+ these debs at Debian BTS!
+
+ -- Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr> Sun, 18 Apr 2008 00:00:00 +0200
+
+opal (2.2.11~dfsg1-4) unstable; urgency=low
+
+ [ Kilian Krause ]
+ * Fix regexp generating UPVRESION for backports.
+ * Drop notrace build entirely to fixup ABI issues (Closes: #447452)
+
+ [ Faidon Liambotis ]
+ * Fix bug where shlibs were very strict on binNMUed versions.
+ * Bump Standards-Version to 3.7.3, no changes needed.
+ * Remove doxygen from Build-Depends-Indep since it's present in
+ Build-Depends.
+ * Drop Build-Conflicts on pre-sarge linux-kernel-headers.
+ * Remove versioned dependency on pre-etch dpkg-dev.
+ * Removed versioned dependency on g++ >= 2.95.
+ * Remove debian/backports/sarge since it's an obsolete distribution.
+ * Remove Jose Carlos Garcia Sogo and Santiago Garcia Mantinan from
+ Uploaders and add myself.
+ * Depend on newly introduced libspeexdsp-dev. (Closes: #474272)
+ * Fix configure to never try to use the shipped speex version, even if it
+ (wrongly) thinks it's newer.
+
+ [ Victor Seva ]
+ * Add patch from Rober Millan to solve FTBFS on parallel build.
+ (Closes: #459742)
+
+ -- Faidon Liambotis <paravoid at debian.org> Sat, 05 Apr 2008 10:59:43 +0300
+
+opal (2.2.11~dfsg1-3) unstable; urgency=high
+
+ * Add ~ suffix after upstream version to shlibs generation.
+ (Closes: #448285)
+
+ -- Kilian Krause <kilian at debian.org> Mon, 29 Oct 2007 10:43:48 +0100
+
+opal (2.2.11~dfsg1-2) unstable; urgency=low
+
+ * Fix build problem in binutils on alpha by using "LDFLAGS+=-Wl,--no-relax".
+ Thanks goes to Steve Langasek for finding this and Serge Belyshev for the
+ tested patch.
+
+ -- Kilian Krause <kilian at debian.org> Tue, 23 Oct 2007 12:02:11 +0200
+
+opal (2.2.11~dfsg1-1) unstable; urgency=low
+
+ * New upstream release. (gcc-4.2 clean. Yeah!)
+ Requires PWLib 1.10.10 - bump build-depends accordingly.
+
+ [ Kilian Krause ]
+ * Don't suggest development headers with library. (Closes: #378064)
+ * Update Source-Version to binary:Version to allow clean binNMUs.
+ * Update debian/watch.
+ * Fix remaining debian-rules-ignores-make-clean errors
+ * Don't set DH_COMPAT in rules.
+ * Fix dh_strip call using libopal-ptrace rather than $(PACKAGE)-ptrace
+ (Closes: #442975)
+ * Conflict with our own binary library packages to fix false negative build
+ checks (Closes: #440928)
+ * Remove check-ilbc stamp in clean target
+ * Add Homepage field as added in dpkg-dev 1.14.6.
+
+ [ Faidon Liambotis ]
+ * Adapt shlibs to depend on the upstream's version number and not the Debian
+ version number, since we don't extend the ABI. This also imitates
+ debhelper's behavior.
+
+ -- Kilian Krause <kilian at debian.org> Sat, 22 Sep 2007 12:08:48 +0200
+
+opal (2.2.8~dfsg1-2) unstable; urgency=low
+
+ * Add missing conflicts (Closes: #433152, #433155)
+
+ -- Kilian Krause <kilian at debian.org> Mon, 16 Jul 2007 13:49:32 +0200
+
+opal (2.2.8~dfsg1-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #418485)
+ * Build opt, opt+ptrace and debug version like PWLib. Bump to pwlib 1.10.7 therefore.
+ * Change package name to comply with SOVER.
+ * Cleanup rules to fix double compile problems with leftover files.
+ (Closes: #424373)
+
+ -- Kilian Krause <kilian at debian.org> Tue, 3 Jul 2007 21:45:23 +0200
+
+opal (2.2.3.dfsg-3) unstable; urgency=high
+
+ * Conflict with openmpi-dev to make sure we don't have a filename clash
+ (Closes: #404004). Setting high urgency due to RC-bug.
+
+ -- Kilian Krause <kilian at debian.org> Wed, 27 Dec 2006 15:56:46 +0100
+
+opal (2.2.3.dfsg-2) unstable; urgency=high
+
+ * Correct the versioned dependency to the lib we're building right now to
+ overcome problems like #392522. Setting urgency=high, for we're closing an
+ RC-bug.
+
+ -- Kilian Krause <kilian at debian.org> Sun, 22 Oct 2006 11:04:26 +0200
+
+opal (2.2.3.dfsg-1) unstable; urgency=low
+
+ * Rename configure target to config.status.
+ * New upstream release.
+
+ -- Kilian Krause <kilian at debian.org> Mon, 9 Oct 2006 13:47:30 +0200
+
+opal (2.2.2.dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Kilian Krause <kilian at debian.org> Fri, 9 Jun 2006 19:46:19 +0000
+
+opal (2.2.1.dfsg-2) unstable; urgency=low
+
+ [ Kilian Krause ]
+ * debian/rules: Use CURDIR rather than PWD to make sure we can build with
+ sudo.
+
+ [ Mark Purcell ]
+ * Update debian/watch for numerics & dfsg mangle
+
+ -- Kilian Krause <kilian at debian.org> Sun, 7 May 2006 12:58:43 +0200
+
+opal (2.2.1.dfsg-1) unstable; urgency=low
+
+ [ Kilian Krause ]
+ * debian/control: No need to have debug symbols depend on -dev.
+
+ [ Jose Carlos Garcia Sogo ]
+ * debian/copyright: state different copyrights and licenses for:
+ + src/codec/speex: BSD like license
+ + src/codec/g726: special unrestricted license from Sun
+ + src/codec/gsm: list copyright holders and license terms
+ + src/codec/iLBC: removed from upstream source. Non DFSG-compliant
+ license. (GIPS Royalty Free License)
+
+ * debian/rules:
+ + check that iLBC code has been removed. It also includes an RFC.
+
+ * debian/patches:
+ + remove_ilbc: new. Removes any reference to iLBC code in Makefile.in
+
+ -- Kilian Krause <kilian at debian.org> Sun, 16 Apr 2006 17:06:06 +0000
+
+opal (2.2.1-1) unstable; urgency=low
+
+ * New upstream release (Phobos_release1 tag) to hotfix retransmission of
+ messages which made Ekiga get stuck
+
+ -- Kilian Krause <kilian at debian.org> Tue, 14 Mar 2006 12:46:42 +0100
+
+opal (2.2.0-1) unstable; urgency=low
+
+ * New upstream release (Phobos_release tag).
+
+ -- Kilian Krause <kilian at debian.org> Tue, 14 Mar 2006 00:14:58 +0000
+
+opal (2.1.3-2) unstable; urgency=low
+
+ * Workaround too short SONAME until the fix from CVS HEAD hits next release.
+
+ -- Kilian Krause <kilian at debian.org> Tue, 14 Feb 2006 00:04:32 +0100
+
+opal (2.1.3-1) unstable; urgency=low
+
+ * Initial release. Taken from Phobos-devel3, named according to final Phobos
+ stable release version.
+
+ -- Kilian Krause <kilian at debian.org> Mon, 13 Feb 2006 21:38:04 +0000
diff --cc debian/control
index 1c2c04a,0000000..c6276e3
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,90 -1,0 +1,87 @@@
+Source: opal
+Section: libs
+Priority: optional
+Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
+Uploaders: Mark Purcell <msp at debian.org>, Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>, Kilian Krause <kilian at debian.org>, Tzafrir Cohen <tzafrir at debian.org>
+Build-Depends: debhelper (>= 8), doxygen, autotools-dev, pkg-config,
- libpt-dev (>= 2.10.4~),
- libsrtp-dev [alpha amd64 armel hppa i386 mips mipsel powerpc s390],
++ libpt-dev (>= 2.10.10~), libavcodec-dev, libx264-dev,
+ libtheora-dev, libgsm1-dev, libspeex-dev, libspeexdsp-dev,
++ libsrtp-dev [alpha amd64 armel hppa i386 mips mipsel powerpc s390],
+ libcapi20-dev [linux-any], libspandsp-dev (>= 0.0.6~pre17)
- Build-Conflicts: libopal-dev, libx264-dev,
- libopal3.6.8, libopal3.10.4
++Build-Conflicts: libopal-dev
+Standards-Version: 3.9.2
+Homepage: http://www.opalvoip.org/
+Vcs-Svn: svn://svn.debian.org/pkg-voip/opal/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/opal/
- DM-Upload-Allowed: yes
+
- Package: libopal3.10.4
++Package: libopal3.10.10
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libspeex1, libspeexdsp1
+Description: Open Phone Abstraction Library - successor of OpenH323
+ This package contains the shared version of the OPAL library.
+ .
+ The OPAL project aims to create a full featured, interoperable, Open Source
+ implementation of the H.323 and SIP protocols that can be used freely by
+ everybody. These protocols are most used for Voice over IP (VoIP)
+ conferencing.
+ .
+ This package contains the shared version of the OPAL library, together
- with several free audio codecs and theora and H261 video codecs.
++ with several audio and video codecs.
+
+Package: libopal-dev
+Section: libdevel
+Architecture: any
- Conflicts: openmpi-dev
- Depends: ${misc:Depends}, libopal3.10.4 (= ${binary:Version}), libpt-dev (>= 2.10.4~), libspeexdsp-dev,
++Depends: ${misc:Depends}, libopal3.10.10 (= ${binary:Version}), libpt-dev (>= 2.10.10~), libspeexdsp-dev,
+ libsrtp0-dev [alpha amd64 armel hppa i386 mips mipsel powerpc s390]
+Suggests: pkg-config
+Recommends: libopal-doc
+Description: OPAL library header files
+ This package contains the headers and a static version of the OPAL library.
+ .
+ The OPAL project aims to create a full featured, interoperable, Open Source
+ implementation of the H.323 and SIP protocols that can be used freely by
+ everybody. These protocols are most used for Voice over IP (VoIP)
+ conferencing.
+
+Package: simpleopal
+Section: comm
+Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, libopal3.10.4 (= ${binary:Version})
++Depends: ${shlibs:Depends}, ${misc:Depends}, libopal3.10.10 (= ${binary:Version})
+Description: Simple example from the OPAL project
+ This package contains a small H323 and SIP client given as an example. You
+ can find its code on the doc package.
+ .
+ The OPAL project aims to create a full featured, interoperable, Open Source
+ implementation of the H.323 and SIP protocols that can be used freely by
+ everybody. These protocols are most used for Voice over IP (VoIP)
+ conferencing.
+
+Package: libopal-dbg
+Section: debug
+Priority: extra
- Depends: ${misc:Depends}, libopal3.10.4 (= ${binary:Version})
++Depends: ${misc:Depends}, libopal3.10.10 (= ${binary:Version})
+Conflicts: libopal3.6.8-dbg
+Replaces: libopal3.6.8-dbg
+Architecture: any
+Description: OPAL library debug symbols
+ This package contains the shared and static debug symbols of the
+ OPAL library.
+ .
+ The OPAL project aims to create a full featured, interoperable, Open Source
+ implementation of the H.323 and SIP protocols that can be used freely by
+ everybody. These protocols are most used for Voice over IP (VoIP)
+ conferencing.
+
+Package: libopal-doc
+Section: doc
+Priority: extra
+Depends: ${misc:Depends}
+Architecture: all
+Description: OPAL library documentation files
+ This package contains the documentation and samples to program with
+ the OPAL library.
+ .
+ The OPAL project aims to create a full featured, interoperable, Open Source
+ implementation of the H.323 and SIP protocols that can be used freely by
+ everybody. These protocols are most used for Voice over IP (VoIP)
+ conferencing.
diff --cc debian/copyright
index dee352d,0000000..5722c35
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,508 -1,0 +1,574 @@@
+This is the Debian GNU/Linux packaged version of OPAL.
+
+The author of this software is Equivalence Pty. Ltd.
+Some parts of the code have different authors, see below.
+
+Original packaging for Debian by
+ Kilian Krause <kk at verfaction.de>
+ (derived from openh323)
+
+The sources where downloaded from:
+ http://www.voxgratia.org/downloads.html
+
+This software is released under the terms of the MPL (Mozilla Public license), though
+there are some parts that are covered by other licenses and copyright (see below)
+
+ MOZILLA PUBLIC LICENSE
+ Version 1.0
+ ----------------
+
+1. Definitions.
+
+ 1.1. ``Contributor'' means each entity that creates or contributes to
+ the creation of Modifications.
+
+ 1.2. ``Contributor Version'' means the combination of the Original
+ Code, prior Modifications used by a Contributor, and the Modifications
+ made by that particular Contributor.
+
+ 1.3. ``Covered Code'' means the Original Code or Modifications or the
+ combination of the Original Code and Modifications, in each case
+ including portions thereof.
+
+ 1.4. ``Electronic Distribution Mechanism'' means a mechanism generally
+ accepted in the software development community for the electronic
+ transfer of data.
+
+ 1.5. ``Executable'' means Covered Code in any form other than Source
+ Code.
+
+ 1.6. ``Initial Developer'' means the individual or entity identified as
+ the Initial Developer in the Source Code notice required by Exhibit A.
+
+ 1.7. ``Larger Work'' means a work which combines Covered Code or
+ portions thereof with code not governed by the terms of this License.
+
+ 1.8. ``License'' means this document.
+
+ 1.9. ``Modifications'' means any addition to or deletion from the
+ substance or structure of either the Original Code or any previous
+ Modifications. When Covered Code is released as a series of files, a
+ Modification is:
+
+ A. Any addition to or deletion from the contents of a file
+ containing Original Code or previous Modifications.
+
+ B. Any new file that contains any part of the Original Code or
+ previous Modifications.
+
+ 1.10. ``Original Code'' means Source Code of computer software code
+ which is described in the Source Code notice required by Exhibit A as
+ Original Code, and which, at the time of its release under this License
+ is not already Covered Code governed by this License.
+
+ 1.11. ``Source Code'' means the preferred form of the Covered Code for
+ making modifications to it, including all modules it contains, plus any
+ associated interface definition files, scripts used to control
+ compilation and installation of an Executable, or a list of source code
+ differential comparisons against either the Original Code or another
+ well known, available Covered Code of the Contributor's choice. The
+ Source Code can be in a compressed or archival form, provided the
+ appropriate decompression or de-archiving software is widely available
+ for no charge.
+
+ 1.12. ``You'' means an individual or a legal entity exercising rights
+ under, and complying with all of the terms of, this License or a future
+ version of this License issued under Section 6.1. For legal entities,
+ ``You'' includes any entity which controls, is controlled by, or is
+ under common control with You. For purposes of this definition,
+ ``control'' means (a) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (b) ownership of fifty percent (50%) or more of the
+ outstanding shares or beneficial ownership of such entity.
+
+2. Source Code License.
+
+ 2.1. The Initial Developer Grant.
+ The Initial Developer hereby grants You a world-wide, royalty-free,
+ non-exclusive license, subject to third party intellectual property
+ claims:
+
+ (a) to use, reproduce, modify, display, perform, sublicense and
+ distribute the Original Code (or portions thereof) with or without
+ Modifications, or as part of a Larger Work; and
+
+ (b) under patents now or hereafter owned or controlled by Initial
+ Developer, to make, have made, use and sell (``Utilize'') the
+ Original Code (or portions thereof), but solely to the extent that
+ any such patent is reasonably necessary to enable You to Utilize
+ the Original Code (or portions thereof) and not to any greater
+ extent that may be necessary to Utilize further Modifications or
+ combinations.
+
+ 2.2. Contributor Grant.
+ Each Contributor hereby grants You a world-wide, royalty-free,
+ non-exclusive license, subject to third party intellectual property
+ claims:
+
+ (a) to use, reproduce, modify, display, perform, sublicense and
+ distribute the Modifications created by such Contributor (or
+ portions thereof) either on an unmodified basis, with other
+ Modifications, as Covered Code or as part of a Larger Work; and
+
+ (b) under patents now or hereafter owned or controlled by
+ Contributor, to Utilize the Contributor Version (or portions
+ thereof), but solely to the extent that any such patent is
+ reasonably necessary to enable You to Utilize the Contributor
+ Version (or portions thereof), and not to any greater extent that
+ may be necessary to Utilize further Modifications or combinations.
+
+3. Distribution Obligations.
+
+ 3.1. Application of License.
+ The Modifications which You create or to which You contribute are
+ governed by the terms of this License, including without limitation
+ Section 2.2. The Source Code version of Covered Code may be distributed
+ only under the terms of this License or a future version of this
+ License released under Section 6.1, and You must include a copy of this
+ License with every copy of the Source Code You distribute. You may not
+ offer or impose any terms on any Source Code version that alters or
+ restricts the applicable version of this License or the recipients'
+ rights hereunder. However, You may include an additional document
+ offering the additional rights described in Section 3.5.
+
+ 3.2. Availability of Source Code.
+ Any Modification which You create or to which You contribute must be
+ made available in Source Code form under the terms of this License
+ either on the same media as an Executable version or via an accepted
+ Electronic Distribution Mechanism to anyone to whom you made an
+ Executable version available; and if made available via Electronic
+ Distribution Mechanism, must remain available for at least twelve (12)
+ months after the date it initially became available, or at least six
+ (6) months after a subsequent version of that particular Modification
+ has been made available to such recipients. You are responsible for
+ ensuring that the Source Code version remains available even if the
+ Electronic Distribution Mechanism is maintained by a third party.
+
+ 3.3. Description of Modifications.
+ You must cause all Covered Code to which you contribute to contain a
+ file documenting the changes You made to create that Covered Code and
+ the date of any change. You must include a prominent statement that the
+ Modification is derived, directly or indirectly, from Original Code
+ provided by the Initial Developer and including the name of the Initial
+ Developer in (a) the Source Code, and (b) in any notice in an
+ Executable version or related documentation in which You describe the
+ origin or ownership of the Covered Code.
+
+ 3.4. Intellectual Property Matters
+
+ (a) Third Party Claims.
+ If You have knowledge that a party claims an intellectual property
+ right in particular functionality or code (or its utilization
+ under this License), you must include a text file with the source
+ code distribution titled ``LEGAL'' which describes the claim and
+ the party making the claim in sufficient detail that a recipient
+ will know whom to contact. If you obtain such knowledge after You
+ make Your Modification available as described in Section 3.2, You
+ shall promptly modify the LEGAL file in all copies You make
+ available thereafter and shall take other steps (such as notifying
+ appropriate mailing lists or newsgroups) reasonably calculated to
+ inform those who received the Covered Code that new knowledge has
+ been obtained.
+
+ (b) Contributor APIs.
+ If Your Modification is an application programming interface and
+ You own or control patents which are reasonably necessary to
+ implement that API, you must also include this information in the
+ LEGAL file.
+
+ 3.5. Required Notices.
+ You must duplicate the notice in Exhibit A in each file of the Source
+ Code, and this License in any documentation for the Source Code, where
+ You describe recipients' rights relating to Covered Code. If You
+ created one or more Modification(s), You may add your name as a
+ Contributor to the notice described in Exhibit A. If it is not possible
+ to put such notice in a particular Source Code file due to its
+ structure, then you must include such notice in a location (such as a
+ relevant directory file) where a user would be likely to look for such
+ a notice. You may choose to offer, and to charge a fee for, warranty,
+ support, indemnity or liability obligations to one or more recipients
+ of Covered Code. However, You may do so only on Your own behalf, and
+ not on behalf of the Initial Developer or any Contributor. You must
+ make it absolutely clear than any such warranty, support, indemnity or
+ liability obligation is offered by You alone, and You hereby agree to
+ indemnify the Initial Developer and every Contributor for any liability
+ incurred by the Initial Developer or such Contributor as a result of
+ warranty, support, indemnity or liability terms You offer.
+
+ 3.6. Distribution of Executable Versions.
+ You may distribute Covered Code in Executable form only if the
+ requirements of Section 3.1-3.5 have been met for that Covered Code,
+ and if You include a notice stating that the Source Code version of the
+ Covered Code is available under the terms of this License, including a
+ description of how and where You have fulfilled the obligations of
+ Section 3.2. The notice must be conspicuously included in any notice in
+ an Executable version, related documentation or collateral in which You
+ describe recipients' rights relating to the Covered Code. You may
+ distribute the Executable version of Covered Code under a license of
+ Your choice, which may contain terms different from this License,
+ provided that You are in compliance with the terms of this License and
+ that the license for the Executable version does not attempt to limit
+ or alter the recipient's rights in the Source Code version from the
+ rights set forth in this License. If You distribute the Executable
+ version under a different license You must make it absolutely clear
+ that any terms which differ from this License are offered by You alone,
+ not by the Initial Developer or any Contributor. You hereby agree to
+ indemnify the Initial Developer and every Contributor for any liability
+ incurred by the Initial Developer or such Contributor as a result of
+ any such terms You offer.
+
+ 3.7. Larger Works.
+ You may create a Larger Work by combining Covered Code with other code
+ not governed by the terms of this License and distribute the Larger
+ Work as a single product. In such a case, You must make sure the
+ requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+ If it is impossible for You to comply with any of the terms of this
+ License with respect to some or all of the Covered Code due to statute
+ or regulation then You must: (a) comply with the terms of this License
+ to the maximum extent possible; and (b) describe the limitations and
+ the code they affect. Such description must be included in the LEGAL
+ file described in Section 3.4 and must be included with all
+ distributions of the Source Code. Except to the extent prohibited by
+ statute or regulation, such description must be sufficiently detailed
+ for a recipient of ordinary skill to be able to understand it.
+
+5. Application of this License.
+
+ This License applies to code to which the Initial Developer has
+ attached the notice in Exhibit A, and to related Covered Code.
+
+6. Versions of the License.
+
+ 6.1. New Versions.
+ Netscape Communications Corporation (``Netscape'') may publish revised
+ and/or new versions of the License from time to time. Each version will
+ be given a distinguishing version number.
+
+ 6.2. Effect of New Versions.
+ Once Covered Code has been published under a particular version of the
+ License, You may always continue to use it under the terms of that
+ version. You may also choose to use such Covered Code under the terms
+ of any subsequent version of the License published by Netscape. No one
+ other than Netscape has the right to modify the terms applicable to
+ Covered Code created under this License.
+
+ 6.3. Derivative Works.
+ If you create or use a modified version of this License (which you may
+ only do in order to apply it to code which is not already Covered Code
+ governed by this License), you must (a) rename Your license so that the
+ phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or
+ any confusingly similar phrase do not appear anywhere in your license
+ and (b) otherwise make it clear that your version of the license
+ contains terms which differ from the Mozilla Public License and
+ Netscape Public License. (Filling in the name of the Initial Developer,
+ Original Code or Contributor in the notice described in Exhibit A shall
+ not of themselves be deemed to be modifications of this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+ COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS,
+ WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+ DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+ THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+ IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+ YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+ COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+ OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+ ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+ This License and the rights granted hereunder will terminate
+ automatically if You fail to comply with terms herein and fail to cure
+ such breach within 30 days of becoming aware of the breach. All
+ sublicenses to the Covered Code which are properly granted shall
+ survive any termination of this License. Provisions which, by their
+ nature, must remain in effect beyond the termination of this License
+ shall survive.
+
+9. LIMITATION OF LIABILITY.
+
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+ (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL
+ DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+ OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER
+ PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF
+ GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND
+ ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE
+ BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+ LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+ RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+ PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+ EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT
+ EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+ The Covered Code is a ``commercial item,'' as that term is defined in
+ 48 C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer
+ software'' and ``commercial computer software documentation,'' as such
+ terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+ C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+ all U.S. Government End Users acquire Covered Code with only those
+ rights set forth herein.
+
+11. MISCELLANEOUS.
+
+ This License represents the complete agreement concerning subject
+ matter hereof. If any provision of this License is held to be
+ unenforceable, such provision shall be reformed only to the extent
+ necessary to make it enforceable. This License shall be governed by
+ California law provisions (except to the extent applicable law, if any,
+ provides otherwise), excluding its conflict-of-law provisions. With
+ respect to disputes in which at least one party is a citizen of, or an
+ entity chartered or registered to do business in, the United States of
+ America: (a) unless otherwise agreed in writing, all disputes relating
+ to this License (excepting any dispute relating to intellectual
+ property rights) shall be subject to final and binding arbitration,
+ with the losing party paying all costs of arbitration; (b) any
+ arbitration relating to this Agreement shall be held in Santa Clara
+ County, California, under the auspices of JAMS/EndDispute; and (c) any
+ litigation relating to this Agreement shall be subject to the
+ jurisdiction of the Federal Courts of the Northern District of
+ California, with venue lying in Santa Clara County, California, with
+ the losing party responsible for costs, including without limitation,
+ court costs and reasonable attorneys fees and expenses. The application
+ of the United Nations Convention on Contracts for the International
+ Sale of Goods is expressly excluded. Any law or regulation which
+ provides that the language of a contract shall be construed against the
+ drafter shall not apply to this License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+ Except in cases where another Contributor has failed to comply with
+ Section 3.4, You are responsible for damages arising, directly or
+ indirectly, out of Your utilization of rights under this License, based
+ on the number of copies of Covered Code you made available, the
+ revenues you received from utilizing such rights, and other relevant
+ factors. You agree to work with affected parties to distribute
+ responsibility on an equitable basis.
+
+EXHIBIT A.
+
+ ``The contents of this file are subject to the Mozilla Public License
+ Version 1.0 (the "License"); you may not use this file except in
+ compliance with the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+
+ Software distributed under the License is distributed on an "AS IS"
+ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ License for the specific language governing rights and limitations
+ under the License.
+ The Original Code is ______________________________________.
+ The Initial Developer of the Original Code is
+ ________________________. Portions created by
+ ______________________ are Copyright (C) ______
+ _______________________. All Rights Reserved.
+ Contributor(s): ______________________________________.''
+
+
+ + src/codec/gsm
+ ----------------
+Copyright 1992, 1993, 1994 by Jutta Degener and Carsten Bormann,
+Technische Universitaet Berlin
+
+Any use of this software is permitted provided that this notice is not
+removed and that neither the authors nor the Technische Universitaet Berlin
+are deemed to have made any representations as to the suitability of this
+software for any purpose nor are held responsible for any defects of
+this software. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+
+As a matter of courtesy, the authors request to be informed about uses
+this software has found, about bugs in this software, and about any
+improvements that may be of general interest.
+
+Berlin, 28.11.1994
+Jutta Degener
+Carsten Bormann
+
+
+ + src/codec/speex
+ ------------------
+
+Copyright:
+ Jean-Marc Valin <jean-marc.valin at hermes.usherb.ca>
+ All the code except the following
+
+ David Rowe <david at voicetronix.com.au> via VoiceTronix
+ lsp.c lsp.h
+ Also ideas and feedback
+
+ John Francis Edwards:
+ wave_out.[ch], some #ifdefs for windows port and MSVC project files
+
+ Atsuhiko Yamanaka <ymnk at jcraft.com>:
+ Patch to speexenc.c to add Vorbis comment format
+
+ Radim Kolar <hsn at cybermail.net>:
+ Patch to speexenc.c for supporting more input formats
+
+Licence:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the name of the Xiph.org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+ + src/codec/g726
+ ----------------
+
+ This source code is a product of Sun Microsystems, Inc. and is provided
+ for unrestricted use. Users may copy or modify this source code without
+ charge.
+
+ SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
+ THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+
+ Sun source code is provided with no support and without any obligation on
+ the part of Sun Microsystems, Inc. to assist in its use, correction,
+ modification or enhancement.
+
+ SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
+ OR ANY PART THEREOF.
+
+ In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ or profits or other special, indirect and consequential damages, even if
+ Sun has been advised of the possibility of such damages.
+
+ Sun Microsystems, Inc.
+ 2550 Garcia Avenue
+ Mountain View, California 94043
+
+
+ + src/codec/celt
+ ----------------
+
+ This codec uses BSD license, as shown in the celtcodec.c:
+
+static struct PluginCodec_information licenseInfo = {
+ // Fri Dec 13 2008, 23:37:31 CET =
+ 1229729851,
+
+ "Stefan Knoblich, axsentis GmbH", // source code author
+ "0.1", // source code version
+ "s.knoblich at axsentis.de", // source code email
+ "http://oss.axsentis.de/", // source code URL
+ "Copyright (C) 2008 axsentis GmbH", // source code copyright
+ "BSD license", // source code license
+ PluginCodec_License_BSD, // source code license
+ "CELT (ultra-low delay audio codec)", // codec description
+ "Jean-Marc Valin, Xiph Foundation.", // codec author
+ "", // codec version
+ "jean-marc.valin at hermes.usherb.ca", // codec email
+ "http://www.celt-codec.org", // codec URL
+ "(C) 2008 Xiph.Org Foundation, All Rights Reserved", // codec copyright information
+ "Xiph BSD license", // codec license
+ PluginCodec_License_BSD // codec license code
+};
+
+
+ + src/codec/iLBC
+ ----------------
- Removed from sources, as it is not distributable due to its license.
++From http://www.webrtc.org/ilbc-freeware:
+
- iLBC Speech Coder ANSI-C Source Code
++Global IP Solutions, the creator of iLBC, was acquired by Google in January 2011. Google continues to support the iLBC effort and is offering it as part of it's WebRTC open source effort. iLBC is now available under the same license as the WebRTC project. On this page, you will find material taken from the old ilbcfreeware.org page.
+
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
++From http://www.webrtc.org/license-rights/license:
+
++Copyright (c) 2011, The WebRTC project authors. All rights reserved.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions are
++met:
++
++ * Redistributions of source code must retain the above copyright
++ notice, this list of conditions and the following disclaimer.
++
++ * Redistributions in binary form must reproduce the above copyright
++ notice, this list of conditions and the following disclaimer in
++ the documentation and/or other materials provided with the
++ distribution.
++
++ * Neither the name of Google nor the names of its contributors may
++ be used to endorse or promote products derived from this software
++ without specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++
++
++ + plugins/audio/GSM0610
++ -----------------------
++Copyright 1992, 1993, 1994 by Jutta Degener and Carsten Bormann,
++Technische Universitaet Berlin
++
++Any use of this software is permitted provided that this notice is not
++removed and that neither the authors nor the Technische Universitaet Berlin
++are deemed to have made any representations as to the suitability of this
++software for any purpose nor are held responsible for any defects of
++this software. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
++
++As a matter of courtesy, the authors request to be informed about uses
++this software has found, about bugs in this software, and about any
++improvements that may be of general interest.
++
++Berlin, 28.11.1994
++Jutta Degener
++Carsten Bormann
++
++
++| Since the original terms of 15 years ago maybe do not make our
++| intentions completely clear given today's refined usage of the legal
++| terms, we append this additional permission:
++|
++| Permission to use, copy, modify, and distribute this software
++| for any purpose with or without fee is hereby granted,
++| provided that this notice is not removed and that neither
++| the authors nor the Technische Universitaet Berlin are
++| deemed to have made any representations as to the suitability
++| of this software for any purpose nor are held responsible
++| for any defects of this software. THERE IS ABSOLUTELY NO
++| WARRANTY FOR THIS SOFTWARE.
++|
++| Berkeley/Bremen, 05.04.2009
++| Jutta Degener
++| Carsten Bormann
diff --cc debian/libopal3.10.10.install
index e8639ac,0000000..e8639ac
mode 100644,000000..100644
--- a/debian/libopal3.10.10.install
+++ b/debian/libopal3.10.10.install
diff --cc debian/patches/libav10.patch
index 0000000,0000000..3e02704
new file mode 100644
--- /dev/null
+++ b/debian/patches/libav10.patch
@@@ -1,0 -1,0 +1,208 @@@
++Description: Fix compilation against libav10
++Author: Reinhard Tartler <siretart at tauware.de>
++Bug-Debian: http://bugs.debian.org/739439
++
++--- a/plugins/video/H.263-1998/h263-1998.cxx
+++++ b/plugins/video/H.263-1998/h263-1998.cxx
++@@ -94,7 +94,7 @@ static struct StdSizes {
++ { CIF16_WIDTH, CIF16_HEIGHT, PLUGINCODEC_CIF16_MPI },
++ };
++
++-static FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_H263P);
+++static FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_H263P);
++
++
++ /////////////////////////////////////////////////////////////////////////////
++@@ -203,7 +203,7 @@ H263_Base_EncoderContext::~H263_Base_Enc
++ PTRACE(4, m_prefix, "Encoder closed");
++ }
++
++-bool H263_Base_EncoderContext::Init(CodecID codecId)
+++bool H263_Base_EncoderContext::Init(AVCodecID codecId)
++ {
++ PTRACE(5, m_prefix, "Opening encoder");
++
++@@ -589,7 +589,7 @@ void H263_RFC2190_EncoderContext::RTPCal
++
++ bool H263_RFC2190_EncoderContext::Init()
++ {
++- if (!H263_Base_EncoderContext::Init(CODEC_ID_H263))
+++ if (!H263_Base_EncoderContext::Init(AV_CODEC_ID_H263))
++ return false;
++
++ #if LIBAVCODEC_RTP_MODE
++@@ -632,7 +632,7 @@ H263_RFC2429_EncoderContext::~H263_RFC24
++
++ bool H263_RFC2429_EncoderContext::Init()
++ {
++- return H263_Base_EncoderContext::Init(CODEC_ID_H263P);
+++ return H263_Base_EncoderContext::Init(AV_CODEC_ID_H263P);
++ }
++
++
++@@ -656,7 +656,7 @@ H263_Base_DecoderContext::H263_Base_Deco
++ if (!FFMPEGLibraryInstance.Load())
++ return;
++
++- if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_H263)) == NULL) {
+++ if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_H263)) == NULL) {
++ PTRACE(1, m_prefix, "Codec not found for decoder");
++ return;
++ }
++--- a/plugins/video/H.264/h264-x264.cxx
+++++ b/plugins/video/H.264/h264-x264.cxx
++@@ -105,7 +105,7 @@ static struct PluginCodec_information Li
++
++ ///////////////////////////////////////////////////////////////////////////////
++
++-FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_H264);
+++FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_H264);
++
++ PLUGINCODEC_CONTROL_LOG_FUNCTION_DEF
++
++@@ -1065,17 +1065,17 @@ class MyDecoder : public PluginCodec<MY_
++ allows you to fail the create operation (return false), which cannot
++ be done in the normal C++ constructor. */
++
++- if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_H264)) == NULL)
+++ if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_H264)) == NULL)
++ return false;
++
++ if ((m_context = FFMPEGLibraryInstance.AvcodecAllocContext(m_codec)) == NULL)
++ return false;
++
++ m_context->workaround_bugs = FF_BUG_AUTODETECT;
++- m_context->idct_algo = FF_IDCT_H264;
+++ m_context->idct_algo = FF_IDCT_AUTO;
++ m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
++ m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE;
++- m_context->flags2 = CODEC_FLAG2_SKIP_RD |
+++ m_context->flags2 =
++ #ifdef CODEC_FLAG2_DROP_FRAME_TIMECODE
++ CODEC_FLAG2_DROP_FRAME_TIMECODE |
++ #endif
++--- a/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+++++ b/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
++@@ -205,7 +205,7 @@ const static struct mpeg4_resolution {
++ { 0 }
++ };
++
++-FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_MPEG4);
+++FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_MPEG4);
++
++
++ static bool mpeg4IsIframe (BYTE * frameBuffer, unsigned int frameLen )
++@@ -688,7 +688,7 @@ void MPEG4EncoderContext::ResizeEncoding
++
++ bool MPEG4EncoderContext::OpenCodec()
++ {
++- if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(CODEC_ID_MPEG4)) == NULL){
+++ if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(AV_CODEC_ID_MPEG4)) == NULL){
++ PTRACE(1, "MPEG4", "Encoder not found");
++ return false;
++ }
++@@ -1390,7 +1390,7 @@ void MPEG4DecoderContext::ResizeDecoding
++
++ bool MPEG4DecoderContext::OpenCodec()
++ {
++- if ((m_avcodec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_MPEG4)) == NULL) {
+++ if ((m_avcodec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_MPEG4)) == NULL) {
++ PTRACE(1, "MPEG4", "Decoder not found for encoder");
++ return false;
++ }
++--- a/plugins/video/H.263-1998/h263-1998.h
+++++ b/plugins/video/H.263-1998/h263-1998.h
++@@ -115,7 +115,7 @@ class H263_Base_EncoderContext
++ virtual ~H263_Base_EncoderContext();
++
++ virtual bool Init() = 0;
++- virtual bool Init(CodecID codecId);
+++ virtual bool Init(AVCodecID codecId);
++
++ virtual bool SetOptions(const char * const * options);
++ virtual void SetOption(const char * option, const char * value);
++--- a/plugins/video/common/dyna.cxx
+++++ b/plugins/video/common/dyna.cxx
++@@ -217,14 +217,14 @@ static void logCallbackFFMPEG(void * avc
++ #endif
++
++
++-FFMPEGLibrary::FFMPEGLibrary(CodecID codec)
+++FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec)
++ {
++ m_codec = codec;
++- if (m_codec==CODEC_ID_H264)
+++ if (m_codec==AV_CODEC_ID_H264)
++ snprintf( m_codecString, sizeof(m_codecString), "H264");
++- if (m_codec==CODEC_ID_H263P)
+++ if (m_codec==AV_CODEC_ID_H263P)
++ snprintf( m_codecString, sizeof(m_codecString), "H263+");
++- if (m_codec==CODEC_ID_MPEG4)
+++ if (m_codec==AV_CODEC_ID_MPEG4)
++ snprintf( m_codecString, sizeof(m_codecString), "MPEG4");
++ m_isLoadedOK = false;
++ }
++@@ -268,12 +268,12 @@ bool FFMPEGLibrary::Load()
++ return true;
++ }
++
++-AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id)
+++AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id)
++ {
++ return avcodec_find_encoder(id);
++ }
++
++-AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id)
+++AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id)
++ {
++ WaitAndSignal m(processLock);
++
++@@ -308,13 +308,18 @@ int FFMPEGLibrary::AvcodecClose(AVCodecC
++ return avcodec_close(ctx);
++ }
++
+++#undef FFMAX
+++#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
++ int FFMPEGLibrary::AvcodecEncodeVideo(AVCodecContext *ctx, BYTE *buf, int buf_size, const AVFrame *pict)
++ {
+++ AVPacket pkt = { 0 };
+++ int ret, got_output;
++ int res;
++
++- res = avcodec_encode_video(ctx, buf, buf_size, pict);
+++ ret = avcodec_encode_video2(ctx, &pkt, pict, &got_output);
++
++- PTRACE(6, m_codecString, "DYNA\tEncoded into " << res << " bytes, max " << buf_size);
+++ PTRACE(6, m_codecString, "DYNA\tEncoded into " << ret << " bytes, max " << buf_size);
+++ memcpy(buf, pkt.data, FFMAX(pkt.size, buf_size));
++ return res;
++ }
++
++--- a/plugins/video/common/dyna.h
+++++ b/plugins/video/common/dyna.h
++@@ -88,13 +88,13 @@ class DynaLink
++ class FFMPEGLibrary
++ {
++ public:
++- FFMPEGLibrary(CodecID codec);
+++ FFMPEGLibrary(AVCodecID codec);
++ ~FFMPEGLibrary();
++
++ bool Load();
++
++- AVCodec *AvcodecFindEncoder(enum CodecID id);
++- AVCodec *AvcodecFindDecoder(enum CodecID id);
+++ AVCodec *AvcodecFindEncoder(enum AVCodecID id);
+++ AVCodec *AvcodecFindDecoder(enum AVCodecID id);
++ AVCodecContext *AvcodecAllocContext(AVCodec*);
++ AVFrame *AvcodecAllocFrame(void);
++ int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec);
++@@ -117,7 +117,7 @@ class FFMPEGLibrary
++ DynaLink m_libAvcodec;
++ DynaLink m_libAvutil;
++
++- CodecID m_codec;
+++ AVCodecID m_codec;
++ char m_codecString[32];
++
++ bool m_isLoadedOK;
diff --cc debian/patches/libav9.patch
index 0000000,0000000..f91a8c0
new file mode 100644
--- /dev/null
+++ b/debian/patches/libav9.patch
@@@ -1,0 -1,0 +1,543 @@@
++Description: Backport changes for the libav 9 API
++ Also replace loading of libavcodec and libavutil via dlopen by linking against
++ it.
++Author: Sebastian Ramacher <sramacher at debian.org>
++Bug-Debian: http://bugs.debian.org/720824
++Last-Update: 2013-09-12
++
++--- a/plugins/video/H.263-1998/h263-1998.cxx
+++++ b/plugins/video/H.263-1998/h263-1998.cxx
++@@ -216,7 +216,7 @@
++ return false;
++ }
++
++- m_context = FFMPEGLibraryInstance.AvcodecAllocContext();
+++ m_context = FFMPEGLibraryInstance.AvcodecAllocContext(m_codec);
++ if (m_context == NULL) {
++ PTRACE(1, m_prefix, "Failed to allocate context for encoder");
++ return false;
++@@ -312,6 +312,7 @@
++ return;
++ }
++
+++#ifdef CODEC_FLAG_H263P_UMV
++ if (STRCMPI(option, H263_ANNEX_D) == 0) {
++ // Annex D: Unrestructed Motion Vectors
++ // Level 2+
++@@ -322,6 +323,7 @@
++ m_context->flags &= ~CODEC_FLAG_H263P_UMV;
++ return;
++ }
+++#endif
++
++ #if 0 // DO NOT ENABLE THIS FLAG. FFMPEG IS NOT THREAD_SAFE WHEN THIS FLAG IS SET
++ if (STRCMPI(option, H263_ANNEX_F) == 0) {
++@@ -356,6 +358,7 @@
++ return;
++ }
++
+++#ifdef CODEC_FLAG_H263P_SLICE_STRUCT
++ if (STRCMPI(option, H263_ANNEX_K) == 0) {
++ // Annex K: Slice Structure
++ // does not work with eyeBeam
++@@ -365,7 +368,9 @@
++ m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
++ return;
++ }
+++#endif
++
+++#ifdef CODEC_FLAG_H263P_AIV
++ if (STRCMPI(option, H263_ANNEX_S) == 0) {
++ // Annex S: Alternative INTER VLC mode
++ // does not work with eyeBeam
++@@ -375,6 +380,7 @@
++ m_context->flags &= ~CODEC_FLAG_H263P_AIV;
++ return;
++ }
+++#endif
++
++ if (STRCMPI(option, PLUGINCODEC_MEDIA_PACKETIZATION) == 0 ||
++ STRCMPI(option, PLUGINCODEC_MEDIA_PACKETIZATIONS) == 0) {
++@@ -450,15 +456,6 @@
++ PTRACE(5, m_prefix, "qmax set to " << m_context->qmax);
++ PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size);
++
++- #define CODEC_TRACER_FLAG(tracer, flag) \
++- PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled"));
++- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV);
++- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC);
++- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED);
++- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT)
++- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER);
++- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV);
++-
++ return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
++ }
++
++@@ -521,7 +518,7 @@
++
++ // Need to copy to local buffer to guarantee 16 byte alignment
++ memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2);
++- m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
+++ m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE;
++
++ /*
++ m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE;
++@@ -603,13 +600,19 @@
++ m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack;
++ m_context->opaque = this; // used to separate out packets from different encode threads
++
+++#ifdef CODEC_FLAG_H263P_UMV
++ m_context->flags &= ~CODEC_FLAG_H263P_UMV;
+++#endif
++ m_context->flags &= ~CODEC_FLAG_4MV;
++ #if LIBAVCODEC_RTP_MODE
++ m_context->flags &= ~CODEC_FLAG_H263P_AIC;
++ #endif
+++#ifdef CODEC_FLAG_H263P_AIV
++ m_context->flags &= ~CODEC_FLAG_H263P_AIV;
+++#endif
+++#ifdef CODEC_FLAG_H263P_SLICE_STRUCT
++ m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
+++#endif
++
++ return true;
++ }
++@@ -658,7 +661,7 @@
++ return;
++ }
++
++- m_context = FFMPEGLibraryInstance.AvcodecAllocContext();
+++ m_context = FFMPEGLibraryInstance.AvcodecAllocContext(m_codec);
++ if (m_context == NULL) {
++ PTRACE(1, m_prefix, "Failed to allocate context for decoder");
++ return;
++--- a/plugins/video/H.264/h264-x264.cxx
+++++ b/plugins/video/H.264/h264-x264.cxx
++@@ -48,6 +48,7 @@
++ #include "shared/h264frame.h"
++ #include "shared/x264wrap.h"
++
+++#include <cstdio>
++
++ #define MY_CODEC x264 // Name of codec (use C variable characters)
++ #define MY_CODEC_LOG "x264"
++@@ -1067,18 +1068,17 @@
++ if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_H264)) == NULL)
++ return false;
++
++- if ((m_context = FFMPEGLibraryInstance.AvcodecAllocContext()) == NULL)
+++ if ((m_context = FFMPEGLibraryInstance.AvcodecAllocContext(m_codec)) == NULL)
++ return false;
++
++ m_context->workaround_bugs = FF_BUG_AUTODETECT;
++- m_context->error_recognition = FF_ER_AGGRESSIVE;
++ m_context->idct_algo = FF_IDCT_H264;
++ m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
++ m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE;
++- m_context->flags2 = CODEC_FLAG2_BRDO |
++- CODEC_FLAG2_MEMC_ONLY |
+++ m_context->flags2 = CODEC_FLAG2_SKIP_RD |
+++#ifdef CODEC_FLAG2_DROP_FRAME_TIMECODE
++ CODEC_FLAG2_DROP_FRAME_TIMECODE |
++- CODEC_FLAG2_SKIP_RD |
+++#endif
++ CODEC_FLAG2_CHUNKS;
++
++ if ((m_picture = FFMPEGLibraryInstance.AvcodecAllocFrame()) == NULL)
++--- a/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+++++ b/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
++@@ -589,17 +589,14 @@
++ m_avpicture->quality = m_videoQMin;
++
++ #ifdef USE_ORIG
++- m_avcontext->flags |= CODEC_FLAG_PART; // data partitioning
++ m_avcontext->flags |= CODEC_FLAG_4MV; // 4 motion vectors
++ #else
++ m_avcontext->max_b_frames=0; /*don't use b frames*/
++ m_avcontext->flags|=CODEC_FLAG_AC_PRED;
++- m_avcontext->flags|=CODEC_FLAG_H263P_UMV;
++ /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */
++ m_avcontext->flags|=CODEC_FLAG_4MV;
++ m_avcontext->flags|=CODEC_FLAG_GMC;
++ m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER;
++- m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
++ #endif
++ m_avcontext->opaque = this; // for use in RTP callback
++ }
++@@ -691,7 +688,12 @@
++
++ bool MPEG4EncoderContext::OpenCodec()
++ {
++- m_avcontext = FFMPEGLibraryInstance.AvcodecAllocContext();
+++ if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(CODEC_ID_MPEG4)) == NULL){
+++ PTRACE(1, "MPEG4", "Encoder not found");
+++ return false;
+++ }
+++
+++ m_avcontext = FFMPEGLibraryInstance.AvcodecAllocContext(m_avcodec);
++ if (m_avcontext == NULL) {
++ PTRACE(1, "MPEG4", "Encoder failed to allocate context for encoder");
++ return false;
++@@ -703,11 +705,6 @@
++ return false;
++ }
++
++- if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(CODEC_ID_MPEG4)) == NULL){
++- PTRACE(1, "MPEG4", "Encoder not found");
++- return false;
++- }
++-
++ #if PLUGINCODEC_TRACING
++ // debugging flags
++ if (PTRACE_CHECK(4)) {
++@@ -804,7 +801,7 @@
++ // Should the next frame be an I-Frame?
++ if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0))
++ {
++- m_avpicture->pict_type = FF_I_TYPE;
+++ m_avpicture->pict_type = AV_PICTURE_TYPE_I;
++ }
++ else // No IFrame requested, let avcodec decide what to do
++ {
++@@ -1325,7 +1322,6 @@
++
++ void MPEG4DecoderContext::SetStaticDecodingParams() {
++ m_avcontext->flags |= CODEC_FLAG_4MV;
++- m_avcontext->flags |= CODEC_FLAG_PART;
++ m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations
++ }
++
++@@ -1399,7 +1395,7 @@
++ return false;
++ }
++
++- m_avcontext = FFMPEGLibraryInstance.AvcodecAllocContext();
+++ m_avcontext = FFMPEGLibraryInstance.AvcodecAllocContext(m_avcodec);
++ if (m_avcontext == NULL) {
++ PTRACE(1, "MPEG4", "Decoder failed to allocate context");
++ return false;
++--- a/plugins/video/common/dyna.cxx
+++++ b/plugins/video/common/dyna.cxx
++@@ -38,6 +38,13 @@
++ * Matthias Schneider (ma30002000 at yahoo.de)
++ */
++ #include "dyna.h"
+++#include <cstdio>
+++#include <cstdarg>
+++
+++extern "C" {
+++#include <libavcodec/avcodec.h>
+++#include <libavutil/mem.h>
+++}
++
++ bool DynaLink::Open(const char *name)
++ {
++@@ -228,101 +235,15 @@
++ m_libAvutil.Close();
++ }
++
++-#define CHECK_AVUTIL(name, func) \
++- (seperateLibAvutil ? \
++- m_libAvutil.GetFunction(name, (DynaLink::Function &)func) : \
++- m_libAvcodec.GetFunction(name, (DynaLink::Function &)func) \
++- ) \
++-
++-
++ bool FFMPEGLibrary::Load()
++ {
++ WaitAndSignal m(processLock);
++ if (IsLoaded())
++ return true;
++
++- bool seperateLibAvutil = false;
++-
++-#ifdef LIBAVCODEC_LIB_NAME
++- if (m_libAvcodec.Open(LIBAVCODEC_LIB_NAME))
++- seperateLibAvutil = true;
++- else
++-#endif
++- if (m_libAvcodec.Open("libavcodec"))
++- seperateLibAvutil = false;
++- else if (m_libAvcodec.Open("avcodec-" AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR)))
++- seperateLibAvutil = true;
++- else {
++- PTRACE(1, m_codecString, "Failed to load FFMPEG libavcodec library");
++- return false;
++- }
++-
++- if (seperateLibAvutil &&
++- !(
++-#ifdef LIBAVUTIL_LIB_NAME
++- m_libAvutil.Open(LIBAVUTIL_LIB_NAME) ||
++-#endif
++- m_libAvutil.Open("libavutil") ||
++- m_libAvutil.Open("avutil-" AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR))
++- ) ) {
++- PTRACE(1, m_codecString, "Failed to load FFMPEG libavutil library");
++- return false;
++- }
++-
++- strcpy(m_libAvcodec.m_codecString, m_codecString);
++- strcpy(m_libAvutil.m_codecString, m_codecString);
++-
++- if (!m_libAvcodec.GetFunction("avcodec_init", (DynaLink::Function &)Favcodec_init))
++- return false;
++-
++- if (!m_libAvcodec.GetFunction("av_init_packet", (DynaLink::Function &)Fav_init_packet))
++- return false;
++-
++- if (!m_libAvcodec.GetFunction("avcodec_register_all", (DynaLink::Function &)Favcodec_register_all))
++- return false;
++-
++- if (!m_libAvcodec.GetFunction("avcodec_find_encoder", (DynaLink::Function &)Favcodec_find_encoder))
++- return false;
++-
++- if (!m_libAvcodec.GetFunction("avcodec_find_decoder", (DynaLink::Function &)Favcodec_find_decoder))
++- return false;
++-
++- if (!m_libAvcodec.GetFunction("avcodec_alloc_context", (DynaLink::Function &)Favcodec_alloc_context))
++- return false;
++-
++- if (!m_libAvcodec.GetFunction("avcodec_alloc_frame", (DynaLink::Function &)Favcodec_alloc_frame))
++- return false;
++-
++- if (!m_libAvcodec.GetFunction("avcodec_open", (DynaLink::Function &)Favcodec_open))
++- return false;
++-
++- if (!m_libAvcodec.GetFunction("avcodec_close", (DynaLink::Function &)Favcodec_close))
++- return false;
++-
++- if (!m_libAvcodec.GetFunction("avcodec_encode_video", (DynaLink::Function &)Favcodec_encode_video))
++- return false;
++-
++- if (!m_libAvcodec.GetFunction("avcodec_decode_video2", (DynaLink::Function &)Favcodec_decode_video))
++- return false;
++-
++- if (!m_libAvcodec.GetFunction("avcodec_set_dimensions", (DynaLink::Function &)Favcodec_set_dimensions))
++- return false;
++-
++- if (!CHECK_AVUTIL("av_free", Favcodec_free))
++- return false;
++-
++- if(!m_libAvcodec.GetFunction("avcodec_version", (DynaLink::Function &)Favcodec_version))
++- return false;
++-
++- if (!CHECK_AVUTIL("av_log_set_level", FAv_log_set_level))
++- return false;
++-
++- if (!CHECK_AVUTIL("av_log_set_callback", FAv_log_set_callback))
++- return false;
++-
++ // must be called before using avcodec lib
++
++- unsigned libVer = Favcodec_version();
+++ unsigned libVer = avcodec_version();
++ if (libVer != LIBAVCODEC_VERSION_INT) {
++ PTRACE(2, m_codecString, "Warning: compiled against libavcodec headers from version "
++ << LIBAVCODEC_VERSION_MAJOR << '.' << LIBAVCODEC_VERSION_MINOR << '.' << LIBAVCODEC_VERSION_MICRO
++@@ -334,8 +255,7 @@
++ << (libVer >> 16) << ((libVer>>8) & 0xff) << (libVer & 0xff));
++ }
++
++- Favcodec_init();
++- Favcodec_register_all ();
+++ avcodec_register_all();
++
++ #if PLUGINCODEC_TRACING
++ AvLogSetLevel(AV_LOG_DEBUG);
++@@ -350,49 +270,49 @@
++
++ AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id)
++ {
++- return Favcodec_find_encoder(id);
+++ return avcodec_find_encoder(id);
++ }
++
++ AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id)
++ {
++ WaitAndSignal m(processLock);
++
++- return Favcodec_find_decoder(id);
+++ return avcodec_find_decoder(id);
++ }
++
++-AVCodecContext *FFMPEGLibrary::AvcodecAllocContext(void)
+++AVCodecContext *FFMPEGLibrary::AvcodecAllocContext(AVCodec *codec)
++ {
++ WaitAndSignal m(processLock);
++
++- return Favcodec_alloc_context();
+++ return avcodec_alloc_context3(codec);
++ }
++
++ AVFrame *FFMPEGLibrary::AvcodecAllocFrame(void)
++ {
++ WaitAndSignal m(processLock);
++
++- return Favcodec_alloc_frame();
+++ return avcodec_alloc_frame();
++ }
++
++ int FFMPEGLibrary::AvcodecOpen(AVCodecContext *ctx, AVCodec *codec)
++ {
++ WaitAndSignal m(processLock);
++
++- return Favcodec_open(ctx, codec);
+++ return avcodec_open2(ctx, codec, NULL);
++ }
++
++ int FFMPEGLibrary::AvcodecClose(AVCodecContext *ctx)
++ {
++ WaitAndSignal m(processLock);
++
++- return Favcodec_close(ctx);
+++ return avcodec_close(ctx);
++ }
++
++ int FFMPEGLibrary::AvcodecEncodeVideo(AVCodecContext *ctx, BYTE *buf, int buf_size, const AVFrame *pict)
++ {
++ int res;
++
++- res = Favcodec_encode_video(ctx, buf, buf_size, pict);
+++ res = avcodec_encode_video(ctx, buf, buf_size, pict);
++
++ PTRACE(6, m_codecString, "DYNA\tEncoded into " << res << " bytes, max " << buf_size);
++ return res;
++@@ -401,35 +321,35 @@
++ int FFMPEGLibrary::AvcodecDecodeVideo(AVCodecContext *ctx, AVFrame *pict, int *got_picture_ptr, BYTE *buf, int buf_size)
++ {
++ AVPacket avpkt;
++- Fav_init_packet(&avpkt);
+++ av_init_packet(&avpkt);
++ avpkt.data = buf;
++ avpkt.size = buf_size;
++
++- return Favcodec_decode_video(ctx, pict, got_picture_ptr, &avpkt);
+++ return avcodec_decode_video2(ctx, pict, got_picture_ptr, &avpkt);
++ }
++
++ void FFMPEGLibrary::AvcodecFree(void * ptr)
++ {
++ WaitAndSignal m(processLock);
++
++- Favcodec_free(ptr);
+++ av_free(ptr);
++ }
++
++ void FFMPEGLibrary::AvSetDimensions(AVCodecContext *s, int width, int height)
++ {
++ WaitAndSignal m(processLock);
++
++- Favcodec_set_dimensions(s, width, height);
+++ avcodec_set_dimensions(s, width, height);
++ }
++
++ void FFMPEGLibrary::AvLogSetLevel(int level)
++ {
++- FAv_log_set_level(level);
+++ av_log_set_level(level);
++ }
++
++ void FFMPEGLibrary::AvLogSetCallback(void (*callback)(void*, int, const char*, va_list))
++ {
++- FAv_log_set_callback(callback);
+++ av_log_set_callback(callback);
++ }
++
++ bool FFMPEGLibrary::IsLoaded()
++--- a/plugins/video/common/dyna.h
+++++ b/plugins/video/common/dyna.h
++@@ -95,7 +95,7 @@
++
++ AVCodec *AvcodecFindEncoder(enum CodecID id);
++ AVCodec *AvcodecFindDecoder(enum CodecID id);
++- AVCodecContext *AvcodecAllocContext(void);
+++ AVCodecContext *AvcodecAllocContext(AVCodec*);
++ AVFrame *AvcodecAllocFrame(void);
++ int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec);
++ int AvcodecClose(AVCodecContext *ctx);
++@@ -120,26 +120,6 @@
++ CodecID m_codec;
++ char m_codecString[32];
++
++- void (*Favcodec_init)(void);
++- void (*Fav_init_packet)(AVPacket *pkt);
++-
++- void (*Favcodec_register_all)(void);
++- AVCodec *(*Favcodec_find_encoder)(enum CodecID id);
++- AVCodec *(*Favcodec_find_decoder)(enum CodecID id);
++- AVCodecContext *(*Favcodec_alloc_context)(void);
++- AVFrame *(*Favcodec_alloc_frame)(void);
++- int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec);
++- int (*Favcodec_close)(AVCodecContext *ctx);
++- int (*Favcodec_encode_video)(AVCodecContext *ctx, BYTE *buf, int buf_size, const AVFrame *pict);
++- int (*Favcodec_decode_video)(AVCodecContext *ctx, AVFrame *pict, int *got_picture_ptr, AVPacket *avpkt);
++- unsigned (*Favcodec_version)(void);
++- void (*Favcodec_set_dimensions)(AVCodecContext *ctx, int width, int height);
++-
++- void (*Favcodec_free)(void *);
++-
++- void (*FAv_log_set_level)(int level);
++- void (*FAv_log_set_callback)(void (*callback)(void*, int, const char*, va_list));
++-
++ bool m_isLoadedOK;
++ };
++
++--- a/plugins/video/common/ffmpeg.h
+++++ b/plugins/video/common/ffmpeg.h
++@@ -45,11 +45,13 @@
++
++ #include "platform.h"
++
++-#include "libavcodec/avcodec.h"
+++extern "C" {
+++#include <libavcodec/avcodec.h>
++ // AVPacket was declared in avformat.h before April 2009
++ #if LIBAVCODEC_VERSION_INT <= AV_VERSION_INT(52, 25, 0)
++-#include "libavformat/avformat.h"
+++#include <libavformat/avformat.h>
++ #endif
+++}
++
++ #ifndef LIBAVCODEC_VERSION_INT
++ #error Libavcodec include is not correct
++--- a/plugins/video/H.263-1998/Makefile.in
+++++ b/plugins/video/H.263-1998/Makefile.in
++@@ -34,8 +34,8 @@
++ $(COMMONDIR)/mpi.cxx \
++ $(COMMONDIR)/dyna.cxx
++
++-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
++-LIBS += @DL_LIBS@
+++CFLAGS += @LIBAVCODEC_CFLAGS@ @LIBAVUTIL_CFLAGS@ -I$(COMMONDIR)
+++LIBS += @DL_LIBS@ @LIBAVCODEC_LIBS@ @LIBAVUTIL_LIBS@
++
++ HAVE_LIBAVCODEC_RTP_MODE=@HAVE_LIBAVCODEC_RTP_MODE@
++ ifeq ($(HAVE_LIBAVCODEC_RTP_MODE),yes)
++--- a/plugins/video/H.264/Makefile.in
+++++ b/plugins/video/H.264/Makefile.in
++@@ -34,8 +34,8 @@
++ $(SHAREDDIR)/x264wrap.cxx \
++ $(COMMONDIR)/dyna.cxx \
++
++-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"@VC_PLUGIN_DIR@"'
++-LIBS += @DL_LIBS@
+++CFLAGS += @LIBAVCODEC_CFLAGS@ @LIBAVUTIL_CFLAGS@ -I$(COMMONDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"@VC_PLUGIN_DIR@"'
+++LIBS += @DL_LIBS@ @LIBAVCODEC_LIBS@ @LIBAVUTIL_LIBS@
++
++ IS_H264_LICENSED:=@IS_H264_LICENSED@
++ ifeq ($(IS_H264_LICENSED),yes)
++--- a/plugins/video/MPEG4-ffmpeg/Makefile.in
+++++ b/plugins/video/MPEG4-ffmpeg/Makefile.in
++@@ -30,8 +30,8 @@
++ SRCDIR := .
++ SRCS := mpeg4.cxx $(COMMONDIR)/dyna.cxx
++
++-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
++-LIBS += @DL_LIBS@
+++CFLAGS += @LIBAVCODEC_CFLAGS@ @LIBAVUTIL_CFLAGS@ -I$(COMMONDIR)
+++LIBS += @DL_LIBS@ @LIBAVCODEC_LIBS@ @LIBAVUTIL_LIBS@
++
++ # Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include <libavcodec/...h>
++ # Also add libavutil, so ffmpeg headers can #include "log.h".
diff --cc debian/patches/series
index 135b03f,0000000..94f0b29
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
+disable-samples-ftbfs.diff
+plugins_clean_target.patch
- #spandsp_autoconf_cppflags.patch
++libav9.patch
++libav10.patch
diff --cc debian/rules
index 4254f90,0000000..0cdda97
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,74 -1,0 +1,71 @@@
+#!/usr/bin/make -f
+
+#export DH_VERBOSE:=1
+
+DEBVERSION := $(shell head -n 1 debian/changelog \
+ | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
- UPVERSION := $(shell echo $(DEBVERSION) | sed 's/~dfsg-.//')
++UPVERSION := $(shell echo $(DEBVERSION) | sed 's/~dfsg2-.//')
+
- FILENAME := opal_$(UPVERSION)~dfsg.orig.tar.gz
++FILENAME := opal_$(UPVERSION)~dfsg2.orig.tar.xz
+UPFILENAME := opal_$(UPVERSION).orig.tar.gz
- URL := http://transact.dl.sourceforge.net/sourceforge/opalvoip/opal-$(UPVERSION).tar.bz2
++URL := http://aarnet.dl.sourceforge.net/sourceforge/opalvoip/opal-$(UPVERSION).tar.bz2
+
+# hack to get samples/simple compiled with new build system
+# no := here for we need evaluation at runtime!
+OPAL_LIBDIR=$(shell sed -n -e "/^OPAL_LIBDIR/s,^.*/,$(CURDIR)/,p" opal_defs.mak)
+
+%:
+ dh $@ --parallel --with autotools_dev
+
+
+override_dh_auto_configure:
- if [ -d plugins/audio/iLBC ];then \
- echo "DFSG ERROR: iLBC code must be removed from upstream sources" ; false ; \
- fi
+ dh_auto_configure -- --enable-samples --enable-spandsp
+
+override_dh_auto_build:
+ sed -e 's#^Libs: #Libs: -L$(OPAL_LIBDIR) #' opal.pc >samples/opal.pc
- dh_auto_build -- PKG_CONFIG_PATH=$(CURDIR)/samples opt docs
++ dh_auto_build -- PKG_CONFIG_PATH=$(CURDIR)/samples VERBOSE=1 opt docs
+
+#override_dh_auto_test:
+# if (samples/simple/obj*/simpleopal --help >/dev/null);then \
+# echo shared simpleopal incorrectly compiled static; false;\
+# else \
+# echo shared simpleopal correctly compiled non-static; \
+# fi
+# LD_LIBRARY_PATH=$(OPAL_LIBDIR) samples/simple/obj*/simpleopal --help >/dev/null
+
+override_dh_link:
+ # replace jquery.js with Debian's version
+ rm -f debian/libopal-doc/usr/share/doc/libopal-doc/html/jquery.js
+ dh_link
+
+override_dh_clean:
+ dh_clean -- PKG_CONFIG_PATH=$(CURDIR)/samples
+ rm -rf html
+ rm -f samples/opal.pc
+ rm -rf samples/simple/obj_*
+
+override_dh_strip:
+ dh_strip -a --dbg-package=libopal-dbg
+
+print-version:
+ @@echo "Debian version: $(DEBVERSION)"
+ @@echo "Upstream version: $(UPVERSION)"
+ @@#echo "svn REV: $(REV)"
+
+get-orig-source:
+ @@dh_testdir
+ @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+ @@#this is for stable versions
+ @@echo Downloading $(UPFILENAME) from $(URL) ...
+ @@wget -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
- @@echo 'Repacking as DFSG-free (removing iLBC, DLLs and EXEs)...'
++ @@echo 'Repacking as DFSG-free (removing DLLs and EXEs)...'
+ @@mkdir -p ../tarballs/opal-$(UPVERSION).tmp/
+ @@cd ../tarballs/opal-$(UPVERSION).tmp ; tar xfj ../$(UPFILENAME)
- @@rm -rf ../tarballs/opal-$(UPVERSION).tmp/opal*/plugins/audio/iLBC
+ @@rm -f ../tarballs/opal-$(UPVERSION).tmp/opal*/plugins/LID/CM_HID/CM_HID.dll
+ @@rm -f ../tarballs/opal-$(UPVERSION).tmp/opal*/plugins/LID/TigerJet/TjIpSys.dll
+ @@rm -f ../tarballs/opal-$(UPVERSION).tmp/opal*/*.exe
++ @@rm -f ../tarballs/opal-$(UPVERSION).tmp/opal*/plugins/audio/iLBC/iLBC/draft-ietf-avt-ilbc-codec-05.txt
+ @@echo Writing archive ../tarballs/$(FILENAME) ...
- @@cd ../tarballs/opal-$(UPVERSION).tmp ; tar cfz ../$(FILENAME) *
++ @@cd ../tarballs/opal-$(UPVERSION).tmp ; tar cfJ ../$(FILENAME) *
+ @@echo Cleaning up...
+ @@$(RM) -rf ../tarballs/opal-$(UPVERSION).tmp/ ../tarballs/$(UPFILENAME)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/opal.git
More information about the Pkg-voip-commits
mailing list