[Pkg-voip-commits] r10424 - in /linphone/trunk/debian: changelog patches/libav9.patch patches/series

[lechner-guest at alioth.debian.org]

Author: lechner-guest
Date: Sat Feb  8 08:59:29 2014
New Revision: 10424

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10424
Log:
* Non-maintainer upload.
* Apply Sebastian Ramacher's patch to fix FTBFS (Closes: #720668).

Added:
    linphone/trunk/debian/patches/libav9.patch
Modified:
    linphone/trunk/debian/changelog
    linphone/trunk/debian/patches/series

Modified: linphone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/changelog?rev=10424&op=diff
==============================================================================
--- linphone/trunk/debian/changelog	(original)
+++ linphone/trunk/debian/changelog	Sat Feb  8 08:59:29 2014
@@ -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 <luk at 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]

Added: linphone/trunk/debian/patches/libav9.patch
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/patches/libav9.patch?rev=10424&op=file
==============================================================================
--- linphone/trunk/debian/patches/libav9.patch	(added)
+++ linphone/trunk/debian/patches/libav9.patch	Sat Feb  8 08:59:29 2014
@@ -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 */

Modified: linphone/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/patches/series?rev=10424&op=diff
==============================================================================
--- linphone/trunk/debian/patches/series	(original)
+++ linphone/trunk/debian/patches/series	Sat Feb  8 08:59:29 2014
@@ -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