LOG Updated to 3.6.1

.abf.yml

@@ -1,2 +1,7 @@
+removed_sources:
+  linphone-3.5.2.tar.gz: d0dde9d421b7cf6893c8e5acb969d5bd4a04a231
 sources:
-  "linphone-3.5.2.tar.gz": d0dde9d421b7cf6893c8e5acb969d5bd4a04a231
+  linphone-3.6.1.tar.gz: 3bba40df89443326261e2688f599c31ff156580e
+  linphone16.png: 671958aafa4d1710c2f5b80c46d35a8b79349576
+  linphone32.png: 042549a93b9616ff9345bf15525a66e38733b150
+  linphone48.png: fc62e118a2fcc94f16fca136241a81591a0bb0ef

linphone-3.5.0-link.patch

@@ -1,11 +0,0 @@
---- mediastreamer2/src/Makefile.am.link	2011-12-27 01:49:31.708480014 +0100
-+++ mediastreamer2/src/Makefile.am	2011-12-27 01:51:55.756165634 +0100
-@@ -204,7 +204,7 @@
- 				$(GSM_LIBS) \
- 				$(LIBV4L1_LIBS) \
- 				$(LIBV4L2_LIBS) \
--				$(SPANDSP_LIBS)
-+				$(SPANDSP_LIBS) -lXext
- libmediastreamer_la_LDFLAGS= -no-undefined -version-info $(LIBMEDIASTREAMER_SO_VERSION) 
- 
- if !BUILD_WIN32

linphone-3.5.2-ffmpeg-0.11.patch

@@ -1,63 +0,0 @@
---- linphone-3.5.2/mediastreamer2/src/h264dec.c.bero	2012-06-08 18:43:25.160910216 +0200
-+++ linphone-3.5.2/mediastreamer2/src/h264dec.c	2012-06-08 18:43:28.718910233 +0200
-@@ -44,7 +44,6 @@ typedef struct _DecData{
- static void ffmpeg_init(){
- 	static bool_t done=FALSE;
- 	if (!done){
--		avcodec_init();
- 		avcodec_register_all();
- 		done=TRUE;
- 	}
---- linphone-3.5.2/mediastreamer2/src/videoenc.c.bero	2012-06-08 18:25:47.017905070 +0200
-+++ linphone-3.5.2/mediastreamer2/src/videoenc.c	2012-06-08 18:42:55.334910071 +0200
-@@ -53,7 +53,6 @@ void ms_ffmpeg_log_callback(void* ptr, i
- 
- void ms_ffmpeg_check_init(){
- 	if(!avcodec_initialized){
--		avcodec_init();
- 		avcodec_register_all();
- 		avcodec_initialized=TRUE;
- #ifdef ENABLE_LOG_FFMPEG
-@@ -300,9 +299,14 @@ static void prepare_h263(EncState *s){
- 	if (s->profile==0){
- 		s->codec=CODEC_ID_H263;
- 	}else{
-+#if LIBAVCODEC_VERSION_INT < (54<<16)
- 		c->flags|=CODEC_FLAG_H263P_UMV;
--		c->flags|=CODEC_FLAG_AC_PRED;
- 		c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
-+#else
-+		av_opt_set_int(c, "umv", 1, 0);
-+		av_opt_set_int(c, "structured_slices", 1, 0);
-+#endif
-+		c->flags|=CODEC_FLAG_AC_PRED;
- 		/*
- 		c->flags|=CODEC_FLAG_OBMC;
- 		c->flags|=CODEC_FLAG_AC_PRED;
-@@ -372,7 +376,7 @@ static void add_rfc2190_header(mblk_t **
- 	// assume video size is CIF or QCIF
- 	if (context->width == 352 && context->height == 288) header->b_wptr[1] = 0x60;
- 	else header->b_wptr[1] = 0x40;
--	if (context->coded_frame->pict_type != FF_I_TYPE) header->b_wptr[1] |= 0x10;
-+	if (context->coded_frame->pict_type != AV_PICTURE_TYPE_I) header->b_wptr[1] |= 0x10;
- 	header->b_wptr += 4;
- 	header->b_cont = *packet;
- 	*packet = header;
-@@ -779,7 +783,7 @@ static void process_frame(MSFilter *f, m
- 		s->req_vfu=TRUE;
- 	}
- 	if (s->req_vfu){
--		pict.pict_type=FF_I_TYPE;
-+		pict.pict_type=AV_PICTURE_TYPE_I;
- 		s->req_vfu=FALSE;
- 	}
- 	comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base;
-@@ -799,7 +803,7 @@ static void process_frame(MSFilter *f, m
- 		if (s->framenum==1){
- 			video_starter_first_frame (&s->starter,f->ticker->time);
- 		}
--		if (c->coded_frame->pict_type==FF_I_TYPE){
-+		if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){
- 			ms_message("Emitting I-frame");
- 		}
- 		comp_buf->b_wptr+=error;

linphone-3.6.1-imagedir.patch

@@ -1,5 +1,5 @@
---- mediastreamer2/src/nowebcam.c.image	2009-07-13 11:25:33.000000000 +0200
-+++ mediastreamer2/src/nowebcam.c	2009-09-19 03:16:14.000000000 +0200
+--- mediastreamer2/src/videofilters/nowebcam.c.image	2009-07-13 11:25:33.000000000 +0200
++++ mediastreamer2/src/videofilters/nowebcam.c	2009-09-19 03:16:14.000000000 +0200
 @@ -1668,9 +1668,9 @@
  mblk_t *ms_load_nowebcam(MSVideoSize *reqsize, int idx){
  	char tmp[256];
@@ -12,14 +12,14 @@
  	return ms_load_jpeg_as_yuv(tmp,reqsize);
  }
  
---- mediastreamer2/src/Makefile.am.image	2009-08-31 16:42:30.000000000 +0200
-+++ mediastreamer2/src/Makefile.am	2009-09-19 03:16:14.000000000 +0200
-@@ -180,7 +180,7 @@
+--- mediastreamer2/src/Makefile.am.image-dir	2013-05-30 16:09:06.000000000 +0800
++++ mediastreamer2/src/Makefile.am	2013-06-28 11:42:41.023215683 +0800
+@@ -363,7 +363,7 @@
  
  AM_OBJCFLAGS=$(AM_CFLAGS)
  
 -imgdir=$(datadir)/images/
 +imgdir=$(datadir)/images/linphone/
  
- img_DATA=nowebcamCIF.jpg
+ img_DATA=voip/nowebcamCIF.jpg
  

linphone-3.6.1-link.patch

@@ -0,0 +1,11 @@
+--- mediastreamer2/src/Makefile.am.link	2013-06-28 11:43:20.000000000 +0800
++++ mediastreamer2/src/Makefile.am	2013-06-28 11:44:29.066170084 +0800
+@@ -331,7 +331,7 @@
+ 					$(LIBV4L2_LIBS) \
+ 					$(SPANDSP_LIBS) \
+ 					$(PCAP_LIBS) \
+-					$(OPUS_LIBS)
++					$(OPUS_LIBS) -lXext
+ 
+ if BUILD_VP8
+ AM_CFLAGS+=$(VP8_CFLAGS)

linphone.spec

@@ -1,24 +1,26 @@
-%define linphone_major 4
-%define mediastreamer_major 1
+%define linphone_major 5
+%define mediastreamer_major 3
+%define lpcxml_major 0
 %define liblinphone %mklibname %{name} %{linphone_major}
 %define libmediastreamer %mklibname mediastreamer %{mediastreamer_major}
+%define liblpcxml %mklibname lpc2xml %{lpcxml_major}
 %define libname_devel %mklibname -d %{name}
 
 Summary:	Voice over IP Application
 Name:		linphone
-Version:	3.5.2
-Release:	3
+Version:	3.6.1
+Release:	1
 License:	GPLv2+
 Group:		Communications
 Url:		http://www.linphone.org/
 Source0:	http://download.savannah.gnu.org/releases/linphone/stable/sources/linphone-%{version}.tar.gz
-Source1:	http://download.savannah.gnu.org/releases/linphone/stable/sources/linphone-%{version}.tar.gz.sig
+# Source1:	http://download.savannah.gnu.org/releases/linphone/stable/sources/linphone-%{version}.tar.gz.sig
 Source2:	%{name}48.png
 Source3:	%{name}32.png
 Source4:	%{name}16.png
-Patch0:		linphone-3.2.0-imagedir.patch
-Patch1:		linphone-3.5.0-link.patch
-Patch2:		linphone-3.5.2-ffmpeg-0.11.patch
+Patch0:         linphone-3.6.1-imagedir.patch
+Patch1:         linphone-3.6.1-link.patch
+Patch2:         linphone-exosip-4.0.0.patch
 BuildRequires:	desktop-file-utils
 BuildRequires:	gtk-doc
 BuildRequires:	intltool
@@ -54,6 +56,14 @@ Group:		System/Libraries
 %description -n %{liblinphone}
 Primary library for %{name}.
 
+#--------------------------------------------------------------------
+%package -n     %{liblpcxml}
+Summary:        Shared libs for %{name}
+Group:          System/Libraries
+
+%description -n %{liblpcxml}
+Shared libs for %{name}
+
 #--------------------------------------------------------------------
 %package -n %{libmediastreamer}
 Summary:	Media Streaming library for %{name}
@@ -67,6 +77,8 @@ Media Streaming library for %{name}.
 Summary:	Header files and static libraries from %{name}
 Group:		Development/C
 Requires:	%{liblinphone} = %{version}-%{release}
+Requires:       %{liblpcxml} = %{version}-%{release}
+Requires:       %{libname_mediastreamer} = %{version}-%{release}
 Provides:	lib%{name}-devel = %{version}-%{release}
 Provides:	%{name}-devel = %{version}-%{release}
 
@@ -76,9 +88,10 @@ Libraries and includes files for developing programs based on %{name}.
 #--------------------------------------------------------------------
 %prep
 %setup -q
+find '(' -name '*.c' -o -name '*.h' ')' -print0 | xargs -0 sed -i -e 's,\r$,,'
 %patch0 -p0 -b .image-dir
 %patch1 -p0 -b .link
-%patch2 -p1 -b .ffmpeg11~
+%patch2 -p1 -b .exosip~
 
 %build
 ./autogen.sh
@@ -154,6 +167,10 @@ desktop-file-install \
 %files -n %{liblinphone}
 %{_libdir}/liblinphone.so.%{linphone_major}*
 
+%files -n %{liblpcxml}
+%{_libdir}/liblpc2xml.so.%{lpcxml_major}*
+%{_libdir}/libxml2lpc.so.%{lpcxml_major}*
+
 %files -n %{libmediastreamer}
 %{_libdir}/libmediastreamer.so.%{mediastreamer_major}*