tags 758017 + patch tags 758017 + pending thanks Dear maintainer,
I've prepared an NMU for linphone (versioned as 3.6.1-2.4) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards.
diff -Nru linphone-3.6.1/debian/changelog linphone-3.6.1/debian/changelog --- linphone-3.6.1/debian/changelog 2014-05-14 05:26:02.000000000 -0400 +++ linphone-3.6.1/debian/changelog 2014-08-13 07:05:31.000000000 -0400 @@ -1,3 +1,10 @@ +linphone (3.6.1-2.4) experimental; urgency=medium + + * Non-maintainer upload. + * Add libav11.patch fix compilation against libav11 + + -- Reinhard Tartler <siret...@tauware.de> Wed, 13 Aug 2014 07:05:12 -0400 + linphone (3.6.1-2.3) unstable; urgency=medium * Non-maintainer upload. diff -Nru linphone-3.6.1/debian/patches/libav11.patch linphone-3.6.1/debian/patches/libav11.patch --- linphone-3.6.1/debian/patches/libav11.patch 1969-12-31 19:00:00.000000000 -0500 +++ linphone-3.6.1/debian/patches/libav11.patch 2014-08-13 07:05:04.000000000 -0400 @@ -0,0 +1,12 @@ +--- a/mediastreamer2/src/utils/ffmpeg-priv.h ++++ b/mediastreamer2/src/utils/ffmpeg-priv.h +@@ -69,9 +69,6 @@ static inline int avcodec_decode_video2( + return avcodec_decode_video(avctx,picture, got_picture_ptr,avpkt->data,avpkt->size); + } + #endif +-#if (LIBAVCODEC_VERSION_MAJOR >= 56) +-#include <libavcodec/old_codec_ids.h> +-#endif + #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0) + #define CodecID AVCodecID + #endif diff -Nru linphone-3.6.1/debian/patches/series linphone-3.6.1/debian/patches/series --- linphone-3.6.1/debian/patches/series 2014-03-26 19:50:03.000000000 -0400 +++ linphone-3.6.1/debian/patches/series 2014-08-13 07:03:32.000000000 -0400 @@ -6,3 +6,4 @@ #add-zrtp-to-ortp-dependencies.patch #kfreebsd.patch libav10.patch +libav11.patch
