Attachment 95820 Details for Bug 134292 – file.diff

[patch] file.diff

file.diff (text/plain), 3.27 KB, created by tkato432 on 2009-05-06 19:10:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2009-05-06 19:10:06 UTC

Size: 3.27 KB

patch

obsolete

>diff -urN /usr/ports/net/linphone-base/Makefile net/linphone-base/Makefile
>--- /usr/ports/net/linphone-base/Makefile	2009-04-03 19:10:17.000000000 +0900
>+++ net/linphone-base/Makefile	2009-05-05 22:59:38.000000000 +0900
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	linphone
>-PORTVERSION=	3.1.0
>+PORTVERSION=	3.1.2
> PORTEPOCH=	1
> CATEGORIES?=	net
> MASTER_SITES=	SAVANNAH/${PORTNAME}/stable/sources
>@@ -45,8 +45,8 @@
> .endif
> 
> .if defined(LINPHONE_GUI)
>-BUILD_DEPENDS+=	linphone-base>=3.1.0:${PORTSDIR}/net/linphone-base
>-RUN_DEPENDS+=	linphone-base>=3.1.0:${PORTSDIR}/net/linphone-base
>+BUILD_DEPENDS+=	linphone-base>=3.1.2:${PORTSDIR}/net/linphone-base
>+RUN_DEPENDS+=	linphone-base>=3.1.2:${PORTSDIR}/net/linphone-base
> DESCR=		${PKGDIR}/pkg-descr.gui
> PLIST=		${PKGDIR}/pkg-plist.gui
> USE_GNOME+=	libglade2
>@@ -55,7 +55,7 @@
> .else
> PKGNAMESUFFIX=	-base
> CONFIGURE_ARGS+=	--enable-gtk_ui=no
>-MAN1=		linphonec.1 sipomatic.1
>+MAN1=		linphonec.1 linphonecsh.1 sipomatic.1
> SUBDIRS=	po oRTP mediastreamer2 coreapi console
> .endif
> 
>@@ -79,6 +79,7 @@
> 		${PREFIX}/share/applications
> .else
> 	${INSTALL_MAN} ${WRKSRC}/share/C/linphonec.1 ${MANPREFIX}/man/man1
>+	${INSTALL_MAN} ${WRKSRC}/share/C/linphonecsh.1 ${MANPREFIX}/man/man1
> 	${INSTALL_MAN} ${WRKSRC}/share/C/sipomatic.1 ${MANPREFIX}/man/man1
> 	${INSTALL_DATA} ${WRKSRC}/share/linphone.pc ${PREFIX}/libdata/pkgconfig
> 	@${MKDIR} ${DATADIR}/sounds
>diff -urN /usr/ports/net/linphone-base/distinfo net/linphone-base/distinfo
>--- /usr/ports/net/linphone-base/distinfo	2009-04-03 19:10:17.000000000 +0900
>+++ net/linphone-base/distinfo	2009-05-05 22:01:53.000000000 +0900
>@@ -1,3 +1,3 @@
>-MD5 (linphone-3.1.0.tar.gz) = ed40cf4088c306400b005bbd63ac36be
>-SHA256 (linphone-3.1.0.tar.gz) = e41e99925e8c81a9e6c7f4cf399da1d9f571927413196898af46ecbebee6a91b
>-SIZE (linphone-3.1.0.tar.gz) = 7794213
>+MD5 (linphone-3.1.2.tar.gz) = f0a6e48a2b3cf276f78f8499444be732
>+SHA256 (linphone-3.1.2.tar.gz) = 2e676f2bc6aeed7753458079355fc64362c75b530913e9226cd4abd9257cbf17
>+SIZE (linphone-3.1.2.tar.gz) = 7732132
>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	2009-04-03 19:10:19.000000000 +0900
>+++ net/linphone-base/files/patch-coreapi::linphonecore.c	2009-04-16 01:50:24.000000000 +0900
>@@ -21,12 +21,3 @@
>  	/*alsadev let the user use custom alsa device within linphone*/
>  	devid=lp_config_get_string(lc->config,"sound","alsadev",NULL);
>  	if (devid){
>-@@ -2108,7 +2106,7 @@
>- 	if (olddev!=NULL && olddev!=lc->video_conf.device){
>- 		toggle_video_preview(lc,FALSE);/*restart the video local preview*/
>- 	}
>--	if (lc->ready){
>-+	if (lc->ready && lc->video_conf.device){
>- 		vd=ms_web_cam_get_string_id(lc->video_conf.device);
>- 		if (vd && strstr(vd,"Static picture")!=NULL){
>- 			vd=NULL;
>diff -urN /usr/ports/net/linphone-base/pkg-plist.gui net/linphone-base/pkg-plist.gui
>--- /usr/ports/net/linphone-base/pkg-plist.gui	2009-04-03 19:10:19.000000000 +0900
>+++ net/linphone-base/pkg-plist.gui	2009-04-22 04:52:26.000000000 +0900
>@@ -15,6 +15,7 @@
> %%DATADIR%%/password.glade
> %%DATADIR%%/sip_account.glade
> %%DATADIR%%/stock_people.png
>+%%DATADIR%%/waiting.glade
> share/pixmaps/linphone/linphone.png
> share/pixmaps/linphone/linphone2.png
> share/pixmaps/linphone/linphone2.xpm

Actions: View | Diff

Attachments on bug 134292: 95820