[Pkg-voip-commits] r10460 - in /linphone/trunk/debian: changelog control patches/libav10.patch patches/series rules

msp at alioth.debian.org msp at alioth.debian.org
Sat Apr 19 07:33:28 UTC 2014


Author: msp
Date: Sat Apr 19 07:33:27 2014
New Revision: 10460

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10460
Log:
Add Build-Depends: polarssl, gsm1

Modified:
    linphone/trunk/debian/changelog
    linphone/trunk/debian/control
    linphone/trunk/debian/patches/libav10.patch
    linphone/trunk/debian/patches/series
    linphone/trunk/debian/rules

Modified: linphone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/changelog?rev=10460&op=diff
==============================================================================
--- linphone/trunk/debian/changelog	(original)
+++ linphone/trunk/debian/changelog	Sat Apr 19 07:33:27 2014
@@ -1,6 +1,6 @@
 linphone (3.7.0-1) UNRELEASED; urgency=low
 
-  * New upstream release
+  * New upstream release 
     - Fixes "New upstream version available" (Closes: #743474)
 
   [ Felix Lechner ]
@@ -10,9 +10,9 @@
   * Update debian/watch
   * Fix "linphone Broken Vcs-Svn: header in debian/control" 
     updated debian/control (Closes: #743652)
-  * Add Build-Depends: polarssl, zrtp, gsm1
-
- -- Felix Lechner <felix.lechner at gmail.com>  Thu, 20 Feb 2014 15:50:39 -0800
+  * Add Build-Depends: polarssl, gsm1
+
+ -- Mark Purcell <msp at debian.org>  Fri, 18 Apr 2014 21:25:06 +1000
 
 linphone (3.6.1-2.2) experimental; urgency=low
 

Modified: linphone/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/control?rev=10460&op=diff
==============================================================================
--- linphone/trunk/debian/control	(original)
+++ linphone/trunk/debian/control	Sat Apr 19 07:33:27 2014
@@ -6,7 +6,6 @@
 Build-Depends: debhelper (>= 9),
  dh-autoreconf, autoconf, automake, autotools-dev, libtool, pkg-config, intltool, doxygen,
  libpolarssl-dev,
- libsrtp-dev [!hurd-any !sparc], libzrtpcpp-dev (>= 2.1),
  libncurses5-dev, libreadline6-dev, libnotify-dev, libpango1.0-dev,
  sgmltools-lite, vim-common,
  libpcap-dev, libupnp-dev, libcunit1-dev,
@@ -19,13 +18,18 @@
  libpulse-dev,
  libgtk2.0-dev, libglew-dev,
  libglade2-dev, libtheora-dev, libvpx-dev,
+ libgsm1-dev,
  libxv-dev, libtiff-dev,
  libxext-dev,
  libatk1.0-dev,
  libreadline-dev, libsdl1.2-dev,
  libcairo2-dev, libfontconfig1-dev, libfreetype6-dev, libgdk-pixbuf2.0-dev,
  mesa-common-dev,
- libavcodec-dev, libavutil-dev, libswscale-dev
+ libavcodec-dev (>= 6:10~), libavutil-dev (>= 6:10~), libswscale-dev (>= 6:10~)
+#
+# Requires updated libsrtp-dev
+# libsrtp-dev [!hurd-any !sparc], libzrtpcpp-dev (>= 2.1),
+#
 Standards-Version: 3.9.5
 Homepage: http://www.linphone.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-voip/linphone/trunk/

Modified: linphone/trunk/debian/patches/libav10.patch
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/patches/libav10.patch?rev=10460&op=diff
==============================================================================
--- linphone/trunk/debian/patches/libav10.patch	(original)
+++ linphone/trunk/debian/patches/libav10.patch	Sat Apr 19 07:33:27 2014
@@ -3,10 +3,10 @@
 Subject: Re: FTBFS with libav10
 Date: Wed, 26 Feb 2014 08:49:06 +0100
 
-Index: linphone-3.6.1/mediastreamer2/src/videofilters/nowebcam.c
-===================================================================
---- linphone-3.6.1.orig/mediastreamer2/src/videofilters/nowebcam.c	2013-02-20 13:38:36.504652970 +0000
-+++ linphone-3.6.1/mediastreamer2/src/videofilters/nowebcam.c	2014-02-26 07:21:49.232963255 +0000
+Index: linphone-3.7.0/mediastreamer2/src/videofilters/nowebcam.c
+===================================================================
+--- linphone-3.7.0.orig/mediastreamer2/src/videofilters/nowebcam.c	2014-02-06 01:00:16.000000000 +1100
++++ linphone-3.7.0/mediastreamer2/src/videofilters/nowebcam.c	2014-04-19 16:53:06.270261472 +1000
 @@ -56,20 +56,25 @@
  #ifndef NO_FFMPEG
  	AVCodecContext av_context;
@@ -29,21 +29,21 @@
 +	if (!orig)
 +		return NULL;
 +
- 	avcodec_get_context_defaults(&av_context);
- 	if (avcodec_open(&av_context,codec)<0){
+ 	avcodec_get_context_defaults3(&av_context,NULL);
+ 	if (avcodec_open2(&av_context,codec,NULL)<0){
 +		av_frame_free(&orig);
  		ms_error("jpeg2yuv: avcodec_open failed");
  		return NULL;
  	}
-@@ -79,6 +84,7 @@
- 
+@@ -80,6 +85,7 @@
+ 	memset(&orig, 0, sizeof(orig));
  	if (avcodec_decode_video2(&av_context,&orig,&got_picture,&pkt) < 0) {
  		ms_error("jpeg2yuv: avcodec_decode_video failed");
 +		av_frame_free(&orig);
  		avcodec_close(&av_context);
  		return NULL;
  	}
-@@ -90,24 +96,27 @@
+@@ -91,24 +97,27 @@
                  NULL, NULL, NULL);
  	if (sws_ctx==NULL) {
  		ms_error("jpeg2yuv: ms_sws_getContext() failed.");
@@ -73,11 +73,33 @@
  	return ret;
  #elif TARGET_OS_IPHONE
  	MSPicture dest;
-Index: linphone-3.6.1/mediastreamer2/src/videofilters/videoenc.c
-===================================================================
---- linphone-3.6.1.orig/mediastreamer2/src/videofilters/videoenc.c	2013-06-14 15:21:26.654950046 +0000
-+++ linphone-3.6.1/mediastreamer2/src/videofilters/videoenc.c	2014-02-26 07:47:37.095279237 +0000
-@@ -223,19 +223,15 @@
+Index: linphone-3.7.0/mediastreamer2/src/videofilters/videoenc.c
+===================================================================
+--- linphone-3.7.0.orig/mediastreamer2/src/videofilters/videoenc.c	2014-01-21 22:24:46.622558345 +1100
++++ linphone-3.7.0/mediastreamer2/src/videofilters/videoenc.c	2014-04-19 17:07:06.339433637 +1000
+@@ -230,16 +230,16 @@
+ 
+ static const MSVideoConfiguration * get_vconf_list(EncState *s) {
+ 	switch (s->codec) {
+-		case CODEC_ID_H263:
++		case AV_CODEC_ID_H263:
+ 			return  &h263_conf_list[0];
+-		case CODEC_ID_H263P:
++		case AV_CODEC_ID_H263P:
+ 			return &h263p_conf_list[0];
+-		case CODEC_ID_MJPEG:
++		case AV_CODEC_ID_MJPEG:
+ 			return &mjpeg_conf_list[0];
+-		case CODEC_ID_MPEG4:
++		case AV_CODEC_ID_MPEG4:
+ 		default:
+ 			return &mpeg4_conf_list[0];
+-		case CODEC_ID_SNOW:
++		case AV_CODEC_ID_SNOW:
+ 			return &snow_conf_list[0];
+ 	}
+ }
+@@ -262,19 +262,15 @@
  }
  
  static void enc_h263_init(MSFilter *f){
@@ -100,27 +122,27 @@
  }
  
  static void prepare(EncState *s){
-@@ -243,7 +239,7 @@
+@@ -282,7 +278,7 @@
  	const int max_br_vbv=128000;
  
- 	avcodec_get_context_defaults(c);
+ 	avcodec_get_context_defaults3(c, NULL);
 -	if (s->codec==CODEC_ID_MJPEG)
 +	if (s->codec==AV_CODEC_ID_MJPEG)
  	{
  		ms_message("Codec bitrate set to %i",c->bit_rate);
- 		c->width = s->vsize.width;  
-@@ -269,8 +265,7 @@
+ 		c->width = s->vconf.vsize.width;
+@@ -308,8 +304,7 @@
  
  	/* ffmpeg vbv rate control consumes too much cpu above a certain target bitrate.
  	We don't use it above max_br_vbv */
--	if (s->codec!=CODEC_ID_SNOW && s->maxbr<max_br_vbv){
+-	if (s->codec!=CODEC_ID_SNOW && s->vconf.required_bitrate<max_br_vbv){
 -		/*snow does not like 1st pass rate control*/
 +	if (s->maxbr<max_br_vbv){
  		c->rc_max_rate=c->bit_rate;
  		c->rc_min_rate=0;
  		c->rc_buffer_size=c->rc_max_rate;
-@@ -287,9 +282,6 @@
- 	c->gop_size=(int)s->fps*10; /*emit I frame every 10 seconds*/
+@@ -326,9 +321,6 @@
+ 	c->gop_size=(int)s->vconf.fps*10; /*emit I frame every 10 seconds*/
  	c->pix_fmt=PIX_FMT_YUV420P;
  	s->comp_buf=allocb(c->bit_rate*2,0);
 -	if (s->codec==CODEC_ID_SNOW){
@@ -129,7 +151,7 @@
  	
  	ms_message("Codec size set to w=%i/h=%i",c->width, c->height);
  
-@@ -304,7 +296,7 @@
+@@ -343,7 +335,7 @@
  #endif
  	c->rtp_payload_size = s->mtu/2;
  	if (s->profile==0){
@@ -138,7 +160,7 @@
  	}else{
  		/*
  		c->flags|=CODEC_FLAG_H263P_UMV;
-@@ -313,7 +305,7 @@
+@@ -352,7 +344,7 @@
  		c->flags|=CODEC_FLAG_OBMC;
  		c->flags|=CODEC_FLAG_AC_PRED;
  		*/
@@ -147,7 +169,7 @@
  	}
  }
  
-@@ -331,13 +323,11 @@
+@@ -370,13 +362,11 @@
  	EncState *s=(EncState*)f->data;
  	int error;
  	prepare(s);
@@ -164,7 +186,7 @@
  		/**/
  	}else {
  		ms_error("Unsupported codec id %i",s->codec);
-@@ -724,12 +714,12 @@
+@@ -763,12 +753,12 @@
  	uint8_t *psc;
  	uint32_t timestamp=f->ticker->time*90LL;
  	
@@ -179,38 +201,40 @@
  	{
  		mblk_t *lqt=NULL;
  		mblk_t *cqt=NULL;
-@@ -766,8 +756,9 @@
+@@ -805,8 +795,9 @@
  static void process_frame(MSFilter *f, mblk_t *inm){
  	EncState *s=(EncState*)f->data;
  	AVFrame pict;
 +	AVPacket pkt;
  	AVCodecContext *c=&s->av_context;
--	int error;
+-	int error,got_packet;
 +	int error, got_output;
  	mblk_t *comp_buf=s->comp_buf;
  	int comp_buf_sz=comp_buf->b_datap->db_lim-comp_buf->b_datap->db_base;
  	YuvBuf yuv;
-@@ -789,23 +780,18 @@
+@@ -830,25 +821,19 @@
  		s->req_vfu=FALSE;
  	}
  	comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base;
 -	if (s->codec==CODEC_ID_SNOW){
 -		//prepend picture size
--		uint32_t header=((s->vsize.width&0xffff)<<16) | (s->vsize.height&0xffff);
+-		uint32_t header=((s->vconf.vsize.width&0xffff)<<16) | (s->vconf.vsize.height&0xffff);
 -		*(uint32_t*)comp_buf->b_wptr=htonl(header);
 -		comp_buf->b_wptr+=4;
 -		comp_buf_sz-=4;
 -	}
  
--	error=avcodec_encode_video(c, (uint8_t*)comp_buf->b_wptr,comp_buf_sz, &pict);
+-	packet.data=comp_buf->b_wptr;
+-	packet.size=comp_buf_sz;
+-	error=avcodec_encode_video2(c, &packet, &pict, &got_packet);
 +	pkt.data = (uint8_t *)comp_buf->b_wptr;
 +	pkt.size = comp_buf_sz;
 +	error=avcodec_encode_video2(c, &pkt, &pict, &got_output);
- 
--	if (error<=0) ms_warning("ms_AVencoder_process: error %i.",error);
--	else{
-+	if (error<0) ms_warning("ms_AVencoder_process: error %i.",error);
-+	else if (got_output) {
++
+ 
+ 	if (error<0) ms_warning("ms_AVencoder_process: error %i.",error);
+-	else if (got_packet){
++	else if (got_output){
  		s->framenum++;
  		if (s->framenum==1){
  			video_starter_first_frame (&s->starter,f->ticker->time);
@@ -219,56 +243,8 @@
 +		if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){
  			ms_message("Emitting I-frame");
  		}
- 		comp_buf->b_wptr+=error;
-@@ -837,7 +823,6 @@
- 
- static int enc_set_br(MSFilter *f, void *arg){
- 	EncState *s=(EncState*)f->data;
--	bool_t snow=s->codec==CODEC_ID_SNOW;
- 	s->maxbr=*(int*)arg;
- 	if (s->av_context.codec!=NULL){
- 		/*when we are processing, apply new settings immediately*/
-@@ -847,8 +832,8 @@
- 		ms_filter_unlock(f);
- 		return 0;
- 	}
--	if (s->maxbr>=1024000 && s->codec!=CODEC_ID_H263P){
--		if (s->codec!=CODEC_ID_H263P){
-+	if (s->maxbr>=1024000 && s->codec!=AV_CODEC_ID_H263P){
-+		if (s->codec!=AV_CODEC_ID_H263P){
- 			s->vsize.width = MS_VIDEO_SIZE_SVGA_W;
- 			s->vsize.height = MS_VIDEO_SIZE_SVGA_H;
- 		}else{
-@@ -857,7 +842,7 @@
- 		}
- 		s->fps=25;
- 	}else if (s->maxbr>=800000 ){
--		if (s->codec!=CODEC_ID_H263P){
-+		if (s->codec!=AV_CODEC_ID_H263P){
- 			s->vsize.width = MS_VIDEO_SIZE_VGA_W;
- 			s->vsize.height = MS_VIDEO_SIZE_VGA_H;
- 		}else{
-@@ -874,7 +859,7 @@
- 		s->vsize.height=MS_VIDEO_SIZE_CIF_H;
- 		s->fps=17;
- 		s->qmin=3;
--	}else if (s->maxbr>=170000 && s->codec!=CODEC_ID_H263P && s->codec!=CODEC_ID_H263){
-+	}else if (s->maxbr>=170000 && s->codec!=AV_CODEC_ID_H263P && s->codec!=AV_CODEC_ID_H263){
- 		s->vsize.width=MS_VIDEO_SIZE_QVGA_W;
- 		s->vsize.height=MS_VIDEO_SIZE_QVGA_H;
- 		s->fps=15;
-@@ -887,8 +872,8 @@
- 	}else if (s->maxbr>=64000){
- 		s->vsize.width=MS_VIDEO_SIZE_QCIF_W;
- 		s->vsize.height=MS_VIDEO_SIZE_QCIF_H;
--		s->fps=snow ? 7 : 5;
--		s->qmin=snow ? 4 : 5;
-+		s->fps=5;
-+		s->qmin=5;
- 	}else{
- 		s->vsize.width=MS_VIDEO_SIZE_QCIF_W;
- 		s->vsize.height=MS_VIDEO_SIZE_QCIF_H;
-@@ -963,22 +948,6 @@
+ 		comp_buf->b_wptr+=packet.size;
+@@ -1026,22 +1011,6 @@
  	methods
  };
  
@@ -291,7 +267,7 @@
  MSFilterDesc ms_mjpeg_enc_desc={
  	MS_JPEG_ENC_ID,
  	"MSJpegEnc",
-@@ -1045,26 +1014,6 @@
+@@ -1108,26 +1077,6 @@
  	.methods=methods
  };
  
@@ -318,7 +294,7 @@
  MSFilterDesc ms_mjpeg_enc_desc={
  	.id=MS_JPEG_ENC_ID,
  	.name="MSMJpegEnc",
-@@ -1085,15 +1034,13 @@
+@@ -1148,15 +1097,13 @@
  
  void __register_ffmpeg_encoders_if_possible(void){
  	ms_ffmpeg_check_init();
@@ -337,10 +313,10 @@
  	{
  		ms_filter_register(&ms_mjpeg_enc_desc);
  	}
-Index: linphone-3.6.1/mediastreamer2/src/videofilters/jpegwriter.c
-===================================================================
---- linphone-3.6.1.orig/mediastreamer2/src/videofilters/jpegwriter.c	2013-02-20 13:38:36.504652970 +0000
-+++ linphone-3.6.1/mediastreamer2/src/videofilters/jpegwriter.c	2014-02-26 07:43:01.362474399 +0000
+Index: linphone-3.7.0/mediastreamer2/src/videofilters/jpegwriter.c
+===================================================================
+--- linphone-3.7.0.orig/mediastreamer2/src/videofilters/jpegwriter.c	2013-11-25 20:35:32.000000000 +1100
++++ linphone-3.7.0/mediastreamer2/src/videofilters/jpegwriter.c	2014-04-19 17:11:44.602522497 +1000
 @@ -36,9 +36,9 @@
  
  static void jpg_init(MSFilter *f){
@@ -357,7 +333,7 @@
  		MSPicture yuvbuf, yuvjpeg;
  		mblk_t *m=ms_queue_peek_last(f->inputs[0]);
  		if (ms_yuv_buf_init_from_mblk(&yuvbuf,m)==0){
--			int error;
+-			int error,got_pict;
 -			int comp_buf_sz=msgdsize(m);
 -			uint8_t *comp_buf=(uint8_t*)alloca(comp_buf_sz);
 +			int error, got_output;
@@ -365,12 +341,12 @@
 +			AVPacket pkt = { 0 };
  			mblk_t *jpegm;
  			struct SwsContext *sws_ctx;
- 			
-@@ -128,16 +127,17 @@
- 			
+ 			struct AVPacket packet;
+@@ -131,16 +130,17 @@
  			avcodec_get_frame_defaults(&pict);
  			avpicture_fill((AVPicture*)&pict,(uint8_t*)jpegm->b_rptr,avctx->pix_fmt,avctx->width,avctx->height);
--			error=avcodec_encode_video(avctx, (uint8_t*)comp_buf,comp_buf_sz, &pict);
+ 			packet.data=comp_buf; packet.size=comp_buf_sz;
+-			error=avcodec_encode_video2(avctx, &packet, &pict, &got_pict);
 +			error=avcodec_encode_video2(avctx, &pkt, &pict, &got_output);
  			if (error<0){
  				ms_error("Could not encode jpeg picture.");
@@ -387,10 +363,10 @@
  			cleanup(s,avctx);
  			freemsg(jpegm);
  		}
-Index: linphone-3.6.1/mediastreamer2/src/videofilters/videodec.c
-===================================================================
---- linphone-3.6.1.orig/mediastreamer2/src/videofilters/videodec.c	2013-02-20 13:38:36.504652970 +0000
-+++ linphone-3.6.1/mediastreamer2/src/videofilters/videodec.c	2014-02-26 07:27:45.029778243 +0000
+Index: linphone-3.7.0/mediastreamer2/src/videofilters/videodec.c
+===================================================================
+--- linphone-3.7.0.orig/mediastreamer2/src/videofilters/videodec.c	2014-02-08 04:46:30.151313750 +1100
++++ linphone-3.7.0/mediastreamer2/src/videofilters/videodec.c	2014-04-19 17:15:27.910585716 +1000
 @@ -44,7 +44,6 @@
  	uint8_t dci[512];
  	int dci_size;
@@ -436,7 +412,7 @@
  	if (s->av_context.codec==NULL){
 -		/* we must know picture size before initializing snow decoder*/
 -		if (s->codec!=CODEC_ID_SNOW){
--			error=avcodec_open(&s->av_context, s->av_codec);
+-			error=avcodec_open2(&s->av_context, s->av_codec, NULL);
 -			if (error!=0) ms_error("avcodec_open() failed: %i",error);
 -			if (s->codec==CODEC_ID_MPEG4 && s->dci_size>0){
 -				s->av_context.extradata=s->dci;
@@ -461,7 +437,7 @@
 -			int error;
 -			s->av_context.width=h>>16;
 -			s->av_context.height=h&0xffff;
--			error=avcodec_open(&s->av_context, s->av_codec);
+-			error=avcodec_open2(&s->av_context, s->av_codec, NULL);
 -			if (error!=0) ms_error("avcodec_open() failed for snow: %i",error);
 -			else {
 -				s->snow_initialized=TRUE;
@@ -491,7 +467,7 @@
  
  	if (inm){
  		/* accumulate the video packet until we have the rtp markbit*/
-@@ -807,22 +773,6 @@
+@@ -820,22 +786,6 @@
  	methods
  };
  
@@ -514,7 +490,7 @@
  #else
  
  MSFilterDesc ms_h263_dec_desc={
-@@ -906,28 +856,11 @@
+@@ -919,28 +869,11 @@
  	.methods= methods
  };
  
@@ -543,10 +519,10 @@
  
  /* decode JPEG image with RTP/jpeg headers */
  MS_FILTER_DESC_EXPORT(ms_jpeg_dec_desc)
-Index: linphone-3.6.1/mediastreamer2/src/videofilters/h264dec.c
-===================================================================
---- linphone-3.6.1.orig/mediastreamer2/src/videofilters/h264dec.c	2013-02-20 13:38:36.476638972 +0000
-+++ linphone-3.6.1/mediastreamer2/src/videofilters/h264dec.c	2014-02-26 07:28:18.578609351 +0000
+Index: linphone-3.7.0/mediastreamer2/src/videofilters/h264dec.c
+===================================================================
+--- linphone-3.7.0.orig/mediastreamer2/src/videofilters/h264dec.c	2014-02-08 20:09:25.000000000 +1100
++++ linphone-3.7.0/mediastreamer2/src/videofilters/h264dec.c	2014-04-19 16:50:11.285417732 +1000
 @@ -56,7 +56,7 @@
  static void dec_open(DecData *d){
  	AVCodec *codec;
@@ -554,12 +530,12 @@
 -	codec=avcodec_find_decoder(CODEC_ID_H264);
 +	codec=avcodec_find_decoder(AV_CODEC_ID_H264);
  	if (codec==NULL) ms_fatal("Could not find H264 decoder in ffmpeg.");
- 	avcodec_get_context_defaults(&d->av_context);
- 	error=avcodec_open(&d->av_context,codec);
-Index: linphone-3.6.1/mediastreamer2/build/iphone/voipdescs.h
-===================================================================
---- linphone-3.6.1.orig/mediastreamer2/build/iphone/voipdescs.h	2014-02-26 07:29:46.975799162 +0000
-+++ linphone-3.6.1/mediastreamer2/build/iphone/voipdescs.h	2014-02-26 07:29:56.918045450 +0000
+ 	avcodec_get_context_defaults3(&d->av_context, NULL);
+ 	error=avcodec_open2(&d->av_context,codec, NULL);
+Index: linphone-3.7.0/mediastreamer2/build/iphone/voipdescs.h
+===================================================================
+--- linphone-3.7.0.orig/mediastreamer2/build/iphone/voipdescs.h	2013-05-30 18:09:06.000000000 +1000
++++ linphone-3.7.0/mediastreamer2/build/iphone/voipdescs.h	2014-04-19 16:50:11.285417732 +1000
 @@ -26,7 +26,6 @@
  extern MSFilterDesc ms_mpeg4_dec_desc;
  extern MSFilterDesc ms_h263_dec_desc;
@@ -576,10 +552,10 @@
  &ms_jpeg_dec_desc,
  &ms_mjpeg_dec_desc,
  &ms_pix_conv_desc,
-Index: linphone-3.6.1/mediastreamer2/build/win32native/voipdescs.h
-===================================================================
---- linphone-3.6.1.orig/mediastreamer2/build/win32native/voipdescs.h	2012-09-12 09:34:36.000000000 +0000
-+++ linphone-3.6.1/mediastreamer2/build/win32native/voipdescs.h	2014-02-26 07:30:21.330650191 +0000
+Index: linphone-3.7.0/mediastreamer2/build/win32native/voipdescs.h
+===================================================================
+--- linphone-3.7.0.orig/mediastreamer2/build/win32native/voipdescs.h	2012-09-12 19:34:36.000000000 +1000
++++ linphone-3.7.0/mediastreamer2/build/win32native/voipdescs.h	2014-04-19 16:50:11.285417732 +1000
 @@ -24,8 +24,6 @@
  extern MSFilterDesc ms_mpeg4_enc_desc;
  extern MSFilterDesc ms_mpeg4_dec_desc;

Modified: linphone/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/patches/series?rev=10460&op=diff
==============================================================================
--- linphone/trunk/debian/patches/series	(original)
+++ linphone/trunk/debian/patches/series	Sat Apr 19 07:33:27 2014
@@ -1 +1 @@
-#libav10.patch
+libav10.patch

Modified: linphone/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/rules?rev=10460&op=diff
==============================================================================
--- linphone/trunk/debian/rules	(original)
+++ linphone/trunk/debian/rules	Sat Apr 19 07:33:27 2014
@@ -12,7 +12,7 @@
 	dh_autoreconf ./autogen.sh
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-zrtp --enable-ipv6 --disable-strict --disable-ssl --disable-ssl-hmac $(CONFIGURE_ARGS)
+	dh_auto_configure -- --enable-ipv6 --disable-strict $(CONFIGURE_ARGS)
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V




More information about the Pkg-voip-commits mailing list