Attachment 60604 Details for Bug 90933 – file.diff

[patch] file.diff

file.diff (text/plain), 5.04 KB, created by tkato432 on 2005-12-26 15:10:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2005-12-26 15:10:07 UTC

Size: 5.04 KB

patch

obsolete

>diff -urN /usr/ports/net/linphone-base/Makefile.common net/linphone-base/Makefile.common
>--- /usr/ports/net/linphone-base/Makefile.common	Sun Sep  4 13:50:34 2005
>+++ net/linphone-base/Makefile.common	Tue Dec 20 11:51:59 2005
>@@ -3,7 +3,7 @@
> #
> 
> LINPHONE_PORTNAME=	linphone
>-LINPHONE_PORTVERSION=	1.1.0
>+LINPHONE_PORTVERSION=	1.2.0
> LINPHONE_PORTREVISION=	0
> LINPHONE_PORTEPOCH=	1
> LINPHONE_MASTER_SITES=	http://simon.morlat.free.fr/download/stable/source/
>diff -urN /usr/ports/net/linphone-base/distinfo net/linphone-base/distinfo
>--- /usr/ports/net/linphone-base/distinfo	Sat Nov 26 19:29:31 2005
>+++ net/linphone-base/distinfo	Tue Dec 20 13:03:55 2005
>@@ -1,3 +1,3 @@
>-MD5 (linphone-1.1.0.tar.gz) = 9f164b41c76ef1caca164909dea199a1
>-SHA256 (linphone-1.1.0.tar.gz) = 2bd35760ec2e7b9ac8e501ca16ccaacdb96f5e753477fa7b35842336a8597984
>-SIZE (linphone-1.1.0.tar.gz) = 7334577
>+MD5 (linphone-1.2.0.tar.gz) = bd5e513a665ce2e381afce64d569c707
>+SHA256 (linphone-1.2.0.tar.gz) = 24496cae7c4919473d6f8e78506d762e671fe84a627a5dfda5cb44cda5c421d2
>+SIZE (linphone-1.2.0.tar.gz) = 7372152
>diff -urN /usr/ports/net/linphone-base/files/patch-console__linphonec.c net/linphone-base/files/patch-console__linphonec.c
>--- /usr/ports/net/linphone-base/files/patch-console__linphonec.c	Thu Jan  1 09:00:00 1970
>+++ net/linphone-base/files/patch-console__linphonec.c	Tue Dec 20 13:30:10 2005
>@@ -0,0 +1,32 @@
>+--- console/linphonec.c.orig	Wed Nov 30 21:11:54 2005
>++++ console/linphonec.c	Tue Dec 20 13:29:42 2005
>+@@ -71,8 +71,8 @@
>+ //Process termination handling
>+ void term(int sig)
>+ {
>+-   terminate = TRUE;
>+    char input[LINE_MAX_LEN];
>++   terminate = TRUE;
>+    snprintf (input,sizeof(LINE_MAX_LEN),"%s", "terminate");
>+    linphonec_parse_command_line(&linphonec,input);
>+    snprintf (input,sizeof(LINE_MAX_LEN), "%s", "quit");
>+@@ -161,9 +161,6 @@
>+ int
>+ linphonec_main_loop (LinphoneCore * opm, char * sipAddr)
>+ {
>+-	if (terminate_on_close) {
>+-           signal(SIGTERM, term); 
>+-        }
>+ 	//auto call handling
>+ 	gboolean firstTimeInLoop=TRUE;
>+ 	char input[LINE_MAX_LEN];
>+@@ -171,6 +168,9 @@
>+ 	fd_set fdset;
>+ 	struct timeval timeout;
>+ 	gboolean run=TRUE;
>++	if (terminate_on_close) {
>++           signal(SIGTERM, term); 
>++        }
>+ 	printf("linphonec> ");fflush(stdout);
>+ 	while (run && !terminate)
>+ 	{
>diff -urN /usr/ports/net/linphone-base/files/patch-coreapi::linphonecore.c net/linphone-base/files/patch-coreapi::linphonecore.c
>--- /usr/ports/net/linphone-base/files/patch-coreapi::linphonecore.c	Tue Apr  5 13:35:09 2005
>+++ net/linphone-base/files/patch-coreapi::linphonecore.c	Tue Dec 20 13:24:37 2005
>@@ -1,6 +1,6 @@
>---- coreapi/linphonecore.c.orig	Thu Mar 17 01:16:55 2005
>-+++ coreapi/linphonecore.c	Wed Mar 23 13:17:30 2005
>-@@ -34,9 +34,7 @@
>+--- coreapi/linphonecore.c.orig	Thu Dec  8 02:37:31 2005
>++++ coreapi/linphonecore.c	Tue Dec 20 13:24:10 2005
>+@@ -36,9 +36,7 @@
>  #include <arpa/inet.h>
>  #include <time.h>
>  
>@@ -10,3 +10,17 @@
>  
>  #include "enum.h"
>  
>+@@ -1225,12 +1223,12 @@
>+ {
>+     char *real_url=NULL;
>+     osip_to_t *real_parsed_url=NULL;
>++    LinphoneCall *call=lc->call;
>+     if (!linphone_core_interpret_url(lc,url,&real_url,&real_parsed_url)){
>+         /* bad url */
>+         return -1;
>+     }
>+ 
>+-    LinphoneCall *call=lc->call;
>+     if (call==NULL){
>+         g_warning("No established call to refer.");
>+         return -1;
>diff -urN /usr/ports/net/linphone-base/pkg-plist net/linphone-base/pkg-plist
>--- /usr/ports/net/linphone-base/pkg-plist	Sun Sep  4 13:50:35 2005
>+++ net/linphone-base/pkg-plist	Tue Dec 20 13:37:56 2005
>@@ -5,6 +5,7 @@
> include/linphone/gshell.h
> include/linphone/gspawn.h
> include/linphone/linphonecore.h
>+include/linphone/lpconfig.h
> include/linphone/sndcard.h
> include/linphone/uglib.h
> include/ortp/ortp-config.h
>@@ -20,10 +21,10 @@
> include/ortp/telephonyevents.h
> lib/liblinphone.a
> lib/liblinphone.so
>-lib/liblinphone.so.2
>+lib/liblinphone.so.3
> lib/libortp.a
> lib/libortp.so
>-lib/libortp.so.7
>+lib/libortp.so.2
> libdata/pkgconfig/linphone.pc
> libdata/pkgconfig/ortp.pc
> %%DATADIR%%/sounds/hello16000.wav
>@@ -37,15 +38,6 @@
> %%DATADIR%%/sounds/rings/synth.wav
> %%DATADIR%%/sounds/rings/tapping.wav
> %%DATADIR%%/sounds/rings/toy.wav
>-%%DOCSDIR%%/mediastreamer/book1.html
>-%%DOCSDIR%%/mediastreamer/coreapi.html
>-%%DOCSDIR%%/mediastreamer/mediastreamer-filters.html
>-%%DOCSDIR%%/mediastreamer/mediastreamer-msringplayer.html
>-%%DOCSDIR%%/mediastreamer/mediastreamer-mssync.html
>-%%DOCSDIR%%/mediastreamer/mediastreamer-running-processing-chains.html
>-%%DOCSDIR%%/mediastreamer/msfilterimplementations.html
>-%%DOCSDIR%%/mediastreamer/userapi.html
>-%%DOCSDIR%%/mediastreamer/index.sgml
> share/locale/cs/LC_MESSAGES/linphone.mo
> share/locale/de/LC_MESSAGES/linphone.mo
> share/locale/es/LC_MESSAGES/linphone.mo
>@@ -54,8 +46,8 @@
> share/locale/ja/LC_MESSAGES/linphone.mo
> share/locale/nl/LC_MESSAGES/linphone.mo
> share/locale/pl/LC_MESSAGES/linphone.mo
>-@dirrm %%DOCSDIR%%/mediastreamer
>-@dirrm %%DOCSDIR%%
>+share/locale/pt_BR/LC_MESSAGES/linphone.mo
>+share/locale/sv/LC_MESSAGES/linphone.mo
> @dirrm %%DATADIR%%/sounds/rings
> @dirrm %%DATADIR%%/sounds
> @dirrm %%DATADIR%%

Actions: View | Diff

Attachments on bug 90933: 60604