tags 720668 + pending
thanks
Dear maintainer,
I've prepared an NMU for linphone (versioned as 3.6.1-2.1) and
uploaded it to DELAYED/02. Please feel free to tell me if I
should delay it longer.
Cheers
Luk
diff -Nru linphone-3.6.1/debian/changelog linphone-3.6.1/debian/changelog
--- linphone-3.6.1/debian/changelog 2013-08-03 23:45:08.000000000 +0200
+++ linphone-3.6.1/debian/changelog 2013-09-11 19:09:52.000000000 +0200
@@ -1,3 +1,10 @@
+linphone (3.6.1-2.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Apply Sebastian Ramacher's patch to fix FTBFS (Closes: #720668).
+
+ -- Luk Claes <l...@debian.org> Wed, 11 Sep 2013 19:08:43 +0200
+
linphone (3.6.1-2) unstable; urgency=low
* Add Build-Depends: libudev-dev [linux-any]
diff -Nru linphone-3.6.1/debian/patches/libav9.patch linphone-3.6.1/debian/patches/libav9.patch
--- linphone-3.6.1/debian/patches/libav9.patch 1970-01-01 01:00:00.000000000 +0100
+++ linphone-3.6.1/debian/patches/libav9.patch 2013-09-11 19:07:59.000000000 +0200
@@ -0,0 +1,43 @@
+--- a/mediastreamer2/src/utils/ffmpeg-priv.c
++++ b/mediastreamer2/src/utils/ffmpeg-priv.c
+@@ -20,20 +20,14 @@
+
+ #include "ffmpeg-priv.h"
+
+-#ifdef FF_API_ALLOC_CONTEXT
+-#if !FF_API_ALLOC_CONTEXT
++#if LIBAVCODEC_VERSION_MAJOR >= 54
+ AVCodecContext *avcodec_alloc_context(void) {
+ return avcodec_alloc_context3(NULL);
+ }
+ void avcodec_get_context_defaults(AVCodecContext *s) {
+ avcodec_get_context_defaults3(s, NULL);
+ }
+-#endif
+-#endif
+-#ifdef FF_API_AVCODEC_OPEN
+-#if !FF_API_AVCODEC_OPEN
+ int avcodec_open(AVCodecContext *avctx, AVCodec *codec) {
+ return avcodec_open2(avctx, codec, NULL);
+ }
+ #endif
+-#endif
+--- a/mediastreamer2/src/utils/ffmpeg-priv.h
++++ b/mediastreamer2/src/utils/ffmpeg-priv.h
+@@ -75,15 +75,9 @@
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
+ #define CodecID AVCodecID
+ #endif
+-#ifdef FF_API_ALLOC_CONTEXT
+-#if !FF_API_ALLOC_CONTEXT
++#if LIBAVCODEC_VERSION_MAJOR >= 54
+ AVCodecContext *avcodec_alloc_context(void);
+ void avcodec_get_context_defaults(AVCodecContext *s);
+-#endif
+-#endif
+-#ifdef FF_API_AVCODEC_OPEN
+-#if !FF_API_AVCODEC_OPEN
+ int avcodec_open(AVCodecContext *avctx, AVCodec *codec);
+ #endif
+-#endif
+ #endif /* FFMPEG_PRIV_H */
diff -Nru linphone-3.6.1/debian/patches/series linphone-3.6.1/debian/patches/series
--- linphone-3.6.1/debian/patches/series 2013-07-30 22:45:13.000000000 +0200
+++ linphone-3.6.1/debian/patches/series 2013-09-11 19:08:28.000000000 +0200
@@ -1,5 +1,6 @@
port-to-exosip-4.patch
manpage-section-mismatch.patch
+libav9.patch
#spelling-error-in-binary.patch
#fix-readline-detection.patch
#add-zrtp-to-ortp-dependencies.patch
