linphone-3.5.1

- BR: libsoup-devel

.gitignore

@@ -1,3 +1,4 @@
 linphone-3.2.1.tar.gz
 /linphone-3.4.3.tar.gz
 /linphone-3.5.0.tar.gz
+/linphone-3.5.1.tar.gz

linphone-3.5.0-unusedvar.patch

@@ -1,13 +0,0 @@
---- linphone-3.5.0/mediastreamer2/tests/mediastream.c	2011-12-20 10:35:18.000000000 +0200
-+++ linphone-3.5.0/mediastreamer2/tests/mediastream.c	2011-12-26 04:55:01.468278706 +0200
-@@ -430,8 +430,8 @@
- 
- 
- void setup_media_streams(MediastreamDatas* args) {
--	/*create the rtp session */
--	MSWebCam *cam=NULL;
-+	/*create the rtp session
-+	MSWebCam *cam=NULL; */
- 
- 	ortp_init();
- 	if (args->is_verbose) {

linphone-3.5.1-glib-2.31.patch

@@ -0,0 +1,20 @@
+--- linphone-3.5.1/gtk/setupwizard.c	2012-02-08 16:57:35.000000000 +0200
++++ linphone-3.5.1/gtk/setupwizard.c	2012-02-19 19:51:01.487146154 +0200
+@@ -270,7 +270,7 @@
+ 	linphone_account_creator_set_username(creator, gtk_entry_get_text(username));
+ 
+ 	if (g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) {
+-		g_thread_create(check_username_availability, (void*)w, FALSE, NULL);
++		g_thread_new (NULL, check_username_availability, (void*)w);
+ 	}
+ 	else {
+ 		if (gtk_entry_get_text_length(username) < LOGIN_MIN_SIZE) {
+@@ -534,7 +534,7 @@
+ 	ok = create_pixbuf(linphone_gtk_get_ui_config("ok","ok.png"));
+ 	notok = create_pixbuf(linphone_gtk_get_ui_config("notok","notok.png"));
+ 
+-	g_thread_init (NULL);
++	g_type_init ();
+ 	gdk_threads_init ();
+ 
+ 	GtkWidget *p1=create_intro();

linphone-3.5.1-unusedvar.patch

@@ -0,0 +1,15 @@
+--- linphone-3.5.1/mediastreamer2/src/nowebcam.c	2012-01-18 13:00:15.000000000 +0200
++++ linphone-3.5.1/mediastreamer2/src/nowebcam.c	2012-02-19 19:24:12.643525630 +0200
+@@ -1875,10 +1875,11 @@
+ }
+ 
+ int static_image_set_vsize(MSFilter *f, void* data){
+-	SIData *d=(SIData*)f->data;
+ #ifndef NO_FFMPEG
++	SIData *d=(SIData*)f->data;
+ 	d->vsize=*(MSVideoSize*)data;
+ #else
++	__attribute__((__unused__)) SIData *d=(SIData*)f->data;
+     // no rescaling without ffmpeg
+ #endif
+ 	return 0;

linphone.spec

@@ -1,6 +1,8 @@
+%global novideo 1
+
 Name:           linphone
-Version:        3.5.0
+Version:        3.5.1
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -8,12 +10,20 @@ License:        GPLv2+
 URL:            http://www.linphone.org/
 
 Source0:        http://download.savannah.gnu.org/releases/linphone/3.4.x/sources/%{name}-%{version}.tar.gz
-Patch0:         linphone-3.5.0-unusedvar.patch
+Patch0:         linphone-3.5.1-unusedvar.patch
+Patch1:         linphone-3.5.1-glib-2.31.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if ! 0%{?novideo}
+BuildRequires:  libtheora-devel
+BuildRequires:  libv4l-devel
+BuildRequires:  libvpx-devel
+%endif
+
 BuildRequires:  libosip2-devel >= 3.6.0
 BuildRequires:  libeXosip2-devel >= 3.6.0
+BuildRequires:  libsoup-devel
 BuildRequires:  ortp-devel >= 1:0.18.0
 BuildRequires:  openssl-devel
 BuildRequires:  pulseaudio-libs-devel
@@ -65,6 +75,11 @@ Libraries and headers required to develop software with linphone.
 %setup0 -q
 %patch0 -p1 -b .unusedvar
 
+%if 0%{?fedora} > 16
+%patch1 -p1 -b .glib-2.31
+%endif
+
+
 # g_thread_init has been deprecated since version 2.32 and should not be used in newly-written code.
 # This function is no longer necessary. The GLib threading system is automatically initialized at
 # the start of your program.
@@ -89,12 +104,15 @@ done
 
 %build
 %configure --disable-static \
+%if 0%{?novideo}
+           --disable-video \
+%endif
+           --disable-ffmpeg \
            --disable-rpath \
            --enable-console_ui=yes \
            --enable-gtk_ui=yes \
            --enable-ipv6 \
            --enable-truespeech \
-           --disable-video \
            --enable-alsa \
            --enable-strict \
            --enable-nonstandard-gsm \
@@ -131,7 +149,10 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{_bindir}/*
+%{_bindir}/linphone
+%{_bindir}/linphonec
+%{_bindir}/linphonecsh
+%{_bindir}/mediastream
 %{_libdir}/liblinphone.so.4*
 %{_libdir}/libmediastreamer.so.1*
 %{_mandir}/man1/*
@@ -154,6 +175,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/mediastreamer.pc
 
 %changelog
+* Sun Feb 19 2012 Alexey Kurov <nucleo@fedoraproject.org> - 3.5.1-1
+- linphone-3.5.1
+- BR: libsoup-devel
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 

sources

@@ -1 +1 @@
-ad89cd6030a131f2b17ea50eb6f4c6f2  linphone-3.5.0.tar.gz
+5828190b553d5b342a7a2ee302b32f80  linphone-3.5.1.tar.gz