thefossguy/linphone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linphone-3.4.3

Browse Source 
BR: openssl-devel libsamplerate-devel gettext
BR: pulseaudio-libs-devel jack-audio-connection-kit-devel
drop 3.2.1 patches
This commit is contained in:
nucleo 2011-09-02 14:36:13 +03:00
parent 147a09c9d4
commit 31a235c5d9
8 changed files with 228 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
linphone-3.2.1.tar.gz
/linphone-3.4.3.tar.gz

41
linphone-3.2.1-Makefile.in.patch
View File

@ -1,41 +0,0 @@
--- console/Makefile.in.orig 2009-09-28 14:04:14.000000000 +0100
+++ console/Makefile.in 2010-03-15 14:17:00.968656754 +0000
@@ -332,12 +332,13 @@
@BUILD_CONSOLE_TRUE@sipomatic_SOURCES = \
@BUILD_CONSOLE_TRUE@ sipomatic.c sipomatic.h
-@BUILD_CONSOLE_TRUE@sipomatic_CFLAGS = $(COMMON_CFLAGS) $(CONSOLE_FLAGS)
+@BUILD_CONSOLE_TRUE@sipomatic_CFLAGS = $(COMMON_CFLAGS) $(CONSOLE_FLAGS) $(EXOSIP_FLAGS)
@BUILD_CONSOLE_TRUE@sipomatic_LDADD = $(INTLLIBS) \
@BUILD_CONSOLE_TRUE@ $(top_builddir)/coreapi/liblinphone.la \
@BUILD_CONSOLE_TRUE@ $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
@BUILD_CONSOLE_TRUE@ $(ORTP_LIBS) \
@BUILD_CONSOLE_TRUE@ $(SPEEX_LIBS) \
+@BUILD_CONSOLE_TRUE@ $(EXOSIP_LIBS) \
@BUILD_CONSOLE_TRUE@ $(OSIP_LIBS)
@BUILD_CONSOLE_TRUE@linphonecsh_SOURCES = shell.c
--- gtk-glade/Makefile.in.orig 2009-10-02 21:09:47.000000000 +0100
+++ gtk-glade/Makefile.in 2010-03-15 14:18:24.231659156 +0000
@@ -77,7 +77,6 @@
@BUILD_GLADE_UI_TRUE@@BUILD_WIN32_TRUE@am__DEPENDENCIES_2 = \
@BUILD_GLADE_UI_TRUE@@BUILD_WIN32_TRUE@ linphone.res
@BUILD_GLADE_UI_TRUE@linphone_3_DEPENDENCIES = \
-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/oRTP/src/libortp.la \
@BUILD_GLADE_UI_TRUE@ $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
@BUILD_GLADE_UI_TRUE@ $(top_builddir)/coreapi/liblinphone.la \
@BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1) \
@@ -339,12 +338,11 @@
@BUILD_GLADE_UI_TRUE@ linphone.h
@BUILD_GLADE_UI_TRUE@linphone_3_LDADD = \
-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/oRTP/src/libortp.la \
@BUILD_GLADE_UI_TRUE@ $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
@BUILD_GLADE_UI_TRUE@ $(top_builddir)/coreapi/liblinphone.la \
@BUILD_GLADE_UI_TRUE@ $(LIBGTK_LIBS) $(INTLLIBS) \
@BUILD_GLADE_UI_TRUE@ $(LIBGLADE_LIBS) $(am__append_1)
-@BUILD_GLADE_UI_TRUE@@BUILD_WIN32_FALSE@linphone_3_LDFLAGS = -export-dynamic
+@BUILD_GLADE_UI_TRUE@@BUILD_WIN32_FALSE@linphone_3_LDFLAGS = -export-dynamic -losipparser2 $(ORTP_LIBS)
@BUILD_GLADE_UI_TRUE@@BUILD_WIN32_TRUE@linphone_3_LDFLAGS = -Wl,--export-all-symbols -mwindows
@BUILD_GLADE_UI_TRUE@gladedir = $(datadir)/linphone
@BUILD_GLADE_UI_TRUE@glade_DATA = $(GLADE_FILES) $(PIXMAPS) $(top_srcdir)/COPYING

12
linphone-3.2.1-desktop.patch
View File

@ -1,12 +0,0 @@
--- linphone-3.2.1/share/linphone.desktop.orig 2009-06-16 11:49:48.000000000 +0100
+++ linphone-3.2.1/share/linphone.desktop 2010-03-15 15:51:02.126659419 +0000
@@ -5,6 +5,6 @@
Comment[de]=Linphone ist ein web-phone.
Type=Application
Exec=linphone-3
-Icon=linphone/linphone2.png
+Icon=linphone2
Terminal=false
-Categories=Application;Network;
\ No newline at end of file
+Categories=Application;Network;

28
linphone-3.2.1-oRTP.patch
View File

@ -1,28 +0,0 @@
diff -Naur linphone-2.1.1.orig/oRTP/Makefile.am linphone-2.1.1/oRTP/Makefile.am
--- linphone-2.1.1.orig/oRTP/Makefile.am 2007-10-18 22:05:10.000000000 +0200
+++ linphone-2.1.1/oRTP/Makefile.am 2009-03-13 08:38:34.000000000 +0100
@@ -12,14 +12,13 @@
if HAVE_DOXYGEN
# doxdir & pkgdocdir are not always defined by automake
-docdir=$(datadir)/doc
pkgdocdir=$(docdir)/$(PACKAGE)-$(VERSION)
doc_htmldir=$(pkgdocdir)/html
doc_html_DATA = $(top_builddir)/doc/html/html.tar
$(doc_html_DATA): $(top_builddir)/doc/html/index.html
- cd $(<D) && tar cf html.tar *
+ cd $(top_builddir)/doc/html && tar cf html.tar *
$(top_builddir)/doc/html/index.html: $(SOURCES) ortp.doxygen Makefile.am
rm -rf doc
@@ -51,7 +50,7 @@
.PHONY: package
PKG_NAME = $(PACKAGE)-$(VERSION)-$(RELEASE)
-BUILDROOT = $(shell pwd)/epm-install
+BUILDROOT = `pwd`/epm-install
package: $(srcdir)/pkg.list $(srcdir)/configure
-rm -rf pkg $(BUILDROOT) $(PKG_NAME).*

24
linphone-3.4.3-chdir.patch Normal file
View File

@ -0,0 +1,24 @@
From 3873e40dc1c3c04d76ae22bf1169cecec5193624 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 04 Apr 2011 22:38:42 +0000
Subject: restore intl of .ui files (thanks intltool grrr)
---
diff --git a/gtk/main.c b/gtk/main.c
index e73ae8a..5e16710 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1431,8 +1431,11 @@ int main(int argc, char *argv[]){
g_object_set(settings, "gtk-menu-images", TRUE, NULL);
g_object_set(settings, "gtk-button-images", TRUE, NULL);
- if (workingdir!=NULL)
- chdir(workingdir);
+ if (workingdir!=NULL){
+ if (chdir(workingdir)==-1){
+ g_error("Could not change directory to %s : %s",workingdir,strerror(errno));
+ }
+ }
/* Now, look for the factory configuration file, we do it this late
since we want to have had time to change directory and to parse

173
linphone-3.4.3-unusedvar.patch Normal file
View File

@ -0,0 +1,173 @@
diff -uNrp linphone-3.4.3/coreapi/linphonecore.c linphone-3.4.3/coreapi/linphonecore.c
--- linphone-3.4.3/coreapi/linphonecore.c 2011-03-28 21:35:36.000000000 +0300
+++ linphone-3.4.3/coreapi/linphonecore.c 2011-09-02 14:00:57.348939880 +0300
@@ -746,7 +746,7 @@ static void codecs_config_read(LinphoneC
}
static void video_config_read(LinphoneCore *lc){
- int capture, display, self_view;
+ __attribute__((__unused__)) int capture, display, self_view;
int enabled;
const char *str;
int ndev;
diff -uNrp linphone-3.4.3/mediastreamer2/src/ice.c linphone-3.4.3/mediastreamer2/src/ice.c
--- linphone-3.4.3/mediastreamer2/src/ice.c 2010-08-26 13:21:55.000000000 +0300
+++ linphone-3.4.3/mediastreamer2/src/ice.c 2011-09-02 13:10:40.476774786 +0300
@@ -480,7 +480,7 @@ static int ice_process_stun_message(RtpS
struct CandidatePair *remote_candidates = NULL;
StunMessage msg;
bool_t res;
- int highest_priority_success=-1;
+ __attribute__((__unused__)) int highest_priority_success=-1;
OrtpEventData *evt_data = ortp_event_get_data(evt);
mblk_t *mp = evt_data->packet;
struct sockaddr_in *udp_remote;
diff -uNrp linphone-3.4.3/mediastreamer2/src/msconf.c linphone-3.4.3/mediastreamer2/src/msconf.c
--- linphone-3.4.3/mediastreamer2/src/msconf.c 2010-08-26 13:21:55.000000000 +0300
+++ linphone-3.4.3/mediastreamer2/src/msconf.c 2011-09-02 13:47:15.780745079 +0300
@@ -416,7 +416,7 @@ static void conf_sum(MSFilter *f, ConfSt
#ifndef DISABLE_SPEEX
if (chan->speex_pp!=NULL && s->enable_vad==TRUE && i==0)
{
- int vad;
+ __attribute__((__unused__)) int vad;
vad = speex_preprocess(chan->speex_pp, (short*)chan->input, NULL);
ms_filter_notify(f, MS_CONF_SPEEX_PREPROCESS_MIC, (void*)chan->speex_pp);
@@ -447,7 +447,7 @@ static void conf_sum(MSFilter *f, ConfSt
}
else if (chan->speex_pp!=NULL && s->enable_vad==TRUE)
{
- int vad;
+ __attribute__((__unused__)) int vad;
if (s->enable_halfduplex>0)
{
diff -uNrp linphone-3.4.3/mediastreamer2/src/msjoin.c linphone-3.4.3/mediastreamer2/src/msjoin.c
--- linphone-3.4.3/mediastreamer2/src/msjoin.c 2010-08-26 13:21:55.000000000 +0300
+++ linphone-3.4.3/mediastreamer2/src/msjoin.c 2011-09-02 13:38:36.539657990 +0300
@@ -30,7 +30,7 @@ static void join_process(MSFilter *f){
if (f->inputs[1]!=NULL)
{
while((im=ms_queue_get(f->inputs[1]))!=NULL){
- int payload;
+ __attribute__((__unused__)) int payload;
payload=mblk_set_payload_type(im, 123);
ms_queue_put(f->outputs[0],im);
}
diff -uNrp linphone-3.4.3/mediastreamer2/src/mtu.c linphone-3.4.3/mediastreamer2/src/mtu.c
--- linphone-3.4.3/mediastreamer2/src/mtu.c 2010-08-26 16:14:08.000000000 +0300
+++ linphone-3.4.3/mediastreamer2/src/mtu.c 2011-09-02 13:52:56.766512552 +0300
@@ -208,7 +208,7 @@ int ms_discover_mtu(const char *host){
}
mtu=1500-28;//was the size of the inital buf
do{
- int send_returned;
+ __attribute__((__unused__)) int send_returned;
char *buf=ms_malloc0(mtu);//avoid mtu greater than the beginning
if(buf == NULL)
{
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 4c6deea..2b8eb73 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1636,9 +1636,9 @@ void linphone_core_iterate(LinphoneCore *lc){
linphone_core_start_invite() */
calls=calls->next;
if (call->state==LinphoneCallOutgoingInit && (curtime-call->start_time>=2)){
- /*start the call even if the OPTIONS reply did not arrive*/
- linphone_core_start_invite(lc,call,NULL);
- }
+ /*start the call even if the OPTIONS reply did not arrive*/
+ linphone_core_start_invite(lc,call,NULL);
+ }
if (call->dir==LinphoneCallIncoming && call->state==LinphoneCallOutgoingRinging){
elapsed=curtime-call->start_time;
ms_message("incoming call ringing for %i seconds",elapsed);
@@ -1996,7 +1996,6 @@ LinphoneCall * linphone_core_invite_address(LinphoneCore *lc, const LinphoneAddr
**/
LinphoneCall * linphone_core_invite_address_with_params(LinphoneCore *lc, const LinphoneAddress *addr, const LinphoneCallParams *params)
{
- int err=0;
const char *route=NULL;
const char *from=NULL;
LinphoneProxyConfig *proxy=NULL;
@@ -2049,7 +2048,7 @@ LinphoneCall * linphone_core_invite_address_with_params(LinphoneCore *lc, const
lc->current_call=call;
linphone_call_set_state (call,LinphoneCallOutgoingInit,"Starting outgoing call");
if (dest_proxy!=NULL || lc->sip_conf.ping_with_options==FALSE){
- err=linphone_core_start_invite(lc,call,dest_proxy);
+ linphone_core_start_invite(lc,call,dest_proxy);
}else{
/*defer the start of the call after the OPTIONS ping*/
call->ping_op=sal_op_new(lc->sal);
diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index a4a062d..fbbf9ce 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -269,10 +269,6 @@ static char *guess_contact_for_register(LinphoneProxyConfig *obj){
}
static void linphone_proxy_config_register(LinphoneProxyConfig *obj){
- const char *id_str;
-
- if (obj->reg_identity!=NULL) id_str=obj->reg_identity;
- else id_str=linphone_core_get_primary_contact(obj->lc);
if (obj->reg_sendregister){
char *contact;
if (obj->op)
diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c
index 869a7d8..65c60af 100644
--- a/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@ -561,19 +561,18 @@ int sal_call(SalOp *h, const char *from, const char *to){
int sal_call_notify_ringing(SalOp *h, bool_t early_media){
osip_message_t *msg;
- int err;
/*if early media send also 180 and 183 */
if (early_media && h->sdp_answer){
msg=NULL;
eXosip_lock();
- err=eXosip_call_build_answer(h->tid,180,&msg);
+ eXosip_call_build_answer(h->tid,180,&msg);
if (msg){
set_sdp(msg,h->sdp_answer);
eXosip_call_send_answer(h->tid,180,msg);
}
msg=NULL;
- err=eXosip_call_build_answer(h->tid,183,&msg);
+ eXosip_call_build_answer(h->tid,183,&msg);
if (msg){
set_sdp(msg,h->sdp_answer);
eXosip_call_send_answer(h->tid,183,msg);
diff --git a/gtk/friendlist.c b/gtk/friendlist.c
index f193076..d1b1162 100644
--- a/gtk/friendlist.c
+++ b/gtk/friendlist.c
@@ -70,7 +70,7 @@ static GdkPixbuf *create_status_picture(LinphoneOnlineStatus ss){
void linphone_gtk_set_friend_status(GtkWidget *friendlist , LinphoneFriend * fid, const gchar *url, const gchar *status, const gchar *img){
GtkTreeIter iter;
LinphoneFriend *tmp=0;
- gboolean found=FALSE;
+
GtkTreeModel *model=gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist));
if (gtk_tree_model_get_iter_first(model,&iter)) {
do{
@@ -81,10 +81,9 @@ void linphone_gtk_set_friend_status(GtkWidget *friendlist , LinphoneFriend * fid
gtk_list_store_set(GTK_LIST_STORE(model),&iter,FRIEND_PRESENCE_STATUS,status,-1);
pixbuf = create_pixbuf(img);
if (pixbuf)
- {
- gtk_list_store_set(GTK_LIST_STORE(model),&iter,FRIEND_PRESENCE_IMG, pixbuf,-1);
- }
- found=TRUE;
+ {
+ gtk_list_store_set(GTK_LIST_STORE(model),&iter,FRIEND_PRESENCE_IMG, pixbuf,-1);
+ }
}
}while(gtk_tree_model_iter_next(model,&iter));
}
--
cgit v0.8.3.4

45
linphone.spec
View File

@ -1,22 +1,24 @@
Name: linphone
Version: 3.2.1
Release: 3%{?dist}
Version: 3.4.3
Release: 1%{?dist}
Summary: Phone anywhere in the whole world by using the Internet
Group: Applications/Communications
License: GPLv2+
URL: http://www.linphone.org/
Source0: http://download.savannah.nongnu.org/releases/linphone/3.2.x/sources/%{name}-%{version}.tar.gz
Patch1: linphone-3.2.1-Makefile.in.patch
Patch2: linphone-3.2.1-oRTP.patch
Patch3: linphone-3.2.1-desktop.patch
Source0: http://download.savannah.gnu.org/releases/linphone/3.4.x/sources/%{name}-%{version}.tar.gz
Patch0: linphone-3.4.3-chdir.patch
Patch1: linphone-3.4.3-unusedvar.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libosip2-devel >= 3.1.0
BuildRequires: libeXosip2-devel >= 3.1.0
BuildRequires: ortp-devel >= 0.16.1
BuildRequires: libosip2-devel >= 3.5.0
BuildRequires: libeXosip2-devel >= 3.5.0
BuildRequires: ortp-devel >= 0.16.4
BuildRequires: openssl-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: readline-devel
BuildRequires: ncurses-devel
@ -26,6 +28,7 @@ BuildRequires: alsa-lib-devel
BuildRequires: speex-devel >= 1.2
BuildRequires: gsm-devel
BuildRequires: libsamplerate-devel
BuildRequires: desktop-file-utils
@ -34,6 +37,7 @@ BuildRequires: perl(XML::Parser)
BuildRequires: libglade2-devel
BuildRequires: intltool
BuildRequires: gettext
%description
Linphone is mostly sip compliant. It works successfully with these
@ -61,9 +65,11 @@ Libraries and headers required to develop software with linphone.
%prep
%setup0 -q
%patch1 -p0
%patch2 -p1
%patch3 -p1
%patch0 -p1 -b .chdir
%patch1 -p1 -b .unusedvar
# remove bundled oRTP
rm -rf oRTP
# Fix encoding
for f in share/cs/*.1; do
@ -87,6 +93,9 @@ done
--disable-video \
--enable-alsa \
--enable-strict \
--enable-nonstandard-gsm \
--enable-rsvp \
--enable-ssl \
--enable-external-ortp
make %{?_smp_mflags}
@ -94,7 +103,7 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
install -p -m 0644 pixmaps/linphone2.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
%find_lang %{name}
desktop-file-install --vendor=fedora \
--delete-original \
@ -124,22 +133,26 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/gnome/help/linphone
%{_datadir}/pixmaps/linphone
%{_datadir}/pixmaps/linphone2.png
%{_datadir}/sounds/linphone
%{_datadir}/images
%{_datadir}/linphone
%files devel
%defattr(-,root,root)
%exclude %{_datadir}/tutorials
%{_includedir}/linphone
%{_includedir}/mediastreamer2
%{_libdir}/liblinphone.so
%{_libdir}/libmediastreamer.so
%{_libdir}/pkgconfig/*
# This dir seems to have gone away with new release - JK 3/17/2010
#%%doc %{_datadir}/doc/mediastreamer/
%changelog
* Fri Sep 2 2011 Alexey Kurov <nucleo@fedoraproject.org> - 3.4.3-1
- linphone-3.4.3
- BR: openssl-devel libsamplerate-devel gettext
- BR: pulseaudio-libs-devel jack-audio-connection-kit-devel
- drop 3.2.1 patches
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
434b163f37107c8bedb535d5ce044119 linphone-3.2.1.tar.gz
66e21f36d62c2094f7b4360262c46f20 linphone-3.4.3.tar.gz