Attachment #95820 for bug #134292

View | Details | Raw Unified | Return to bug 134292
Collapse All | Expand All




#

PORTNAME=	linphone
PORTVERSION=	3.1.2
PORTEPOCH=	1
CATEGORIES?=	net
MASTER_SITES=	SAVANNAH/${PORTNAME}/stable/sources

.endif

.if defined(LINPHONE_GUI)
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

.else
PKGNAMESUFFIX=	-base
CONFIGURE_ARGS+=	--enable-gtk_ui=no
MAN1=		linphonec.1 linphonecsh.1 sipomatic.1
SUBDIRS=	po oRTP mediastreamer2 coreapi console
.endif


		${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

Lines 1-3 Link Here

(-)net/linphone-base/distinfo (-3 / +3 lines)
1	MD5 (linphone-3.1.0.tar.gz) = ed40cf4088c306400b005bbd63ac36be	1	MD5 (linphone-3.1.2.tar.gz) = f0a6e48a2b3cf276f78f8499444be732
2	SHA256 (linphone-3.1.0.tar.gz) = e41e99925e8c81a9e6c7f4cf399da1d9f571927413196898af46ecbebee6a91b	2	SHA256 (linphone-3.1.2.tar.gz) = 2e676f2bc6aeed7753458079355fc64362c75b530913e9226cd4abd9257cbf17
3	SIZE (linphone-3.1.0.tar.gz) = 7794213	3	SIZE (linphone-3.1.2.tar.gz) = 7732132




 	/*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;

Lines 15-20 Link Here

(-)net/linphone-base/pkg-plist.gui (+1 lines)
15	%%DATADIR%%/password.glade	15	%%DATADIR%%/password.glade
16	%%DATADIR%%/sip_account.glade	16	%%DATADIR%%/sip_account.glade
17	%%DATADIR%%/stock_people.png	17	%%DATADIR%%/stock_people.png
		18	%%DATADIR%%/waiting.glade
18	share/pixmaps/linphone/linphone.png	19	share/pixmaps/linphone/linphone.png
19	share/pixmaps/linphone/linphone2.png	20	share/pixmaps/linphone/linphone2.png
20	share/pixmaps/linphone/linphone2.xpm	21	share/pixmaps/linphone/linphone2.xpm

Return to bug 134292

Lines 6-12 Link Here

(-)net/linphone-base/Makefile (-4 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= linphone	8	PORTNAME= linphone
9	PORTVERSION= 3.1.0	9	PORTVERSION= 3.1.2
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES?= net	11	CATEGORIES?= net
12	MASTER_SITES= SAVANNAH/${PORTNAME}/stable/sources	12	MASTER_SITES= SAVANNAH/${PORTNAME}/stable/sources
Lines 45-52 Link Here
45	.endif	45	.endif
46		46
47	.if defined(LINPHONE_GUI)	47	.if defined(LINPHONE_GUI)
48	BUILD_DEPENDS+= linphone-base>=3.1.0:${PORTSDIR}/net/linphone-base	48	BUILD_DEPENDS+= linphone-base>=3.1.2:${PORTSDIR}/net/linphone-base
49	RUN_DEPENDS+= linphone-base>=3.1.0:${PORTSDIR}/net/linphone-base	49	RUN_DEPENDS+= linphone-base>=3.1.2:${PORTSDIR}/net/linphone-base
50	DESCR= ${PKGDIR}/pkg-descr.gui	50	DESCR= ${PKGDIR}/pkg-descr.gui
51	PLIST= ${PKGDIR}/pkg-plist.gui	51	PLIST= ${PKGDIR}/pkg-plist.gui
52	USE_GNOME+= libglade2	52	USE_GNOME+= libglade2
Lines 55-61 Link Here
55	.else	55	.else
56	PKGNAMESUFFIX= -base	56	PKGNAMESUFFIX= -base
57	CONFIGURE_ARGS+= --enable-gtk_ui=no	57	CONFIGURE_ARGS+= --enable-gtk_ui=no
58	MAN1= linphonec.1 sipomatic.1	58	MAN1= linphonec.1 linphonecsh.1 sipomatic.1
59	SUBDIRS= po oRTP mediastreamer2 coreapi console	59	SUBDIRS= po oRTP mediastreamer2 coreapi console
60	.endif	60	.endif
61		61
Lines 79-84 Link Here
79	${PREFIX}/share/applications	79	${PREFIX}/share/applications
80	.else	80	.else
81	${INSTALL_MAN} ${WRKSRC}/share/C/linphonec.1 ${MANPREFIX}/man/man1	81	${INSTALL_MAN} ${WRKSRC}/share/C/linphonec.1 ${MANPREFIX}/man/man1
		82	${INSTALL_MAN} ${WRKSRC}/share/C/linphonecsh.1 ${MANPREFIX}/man/man1
82	${INSTALL_MAN} ${WRKSRC}/share/C/sipomatic.1 ${MANPREFIX}/man/man1	83	${INSTALL_MAN} ${WRKSRC}/share/C/sipomatic.1 ${MANPREFIX}/man/man1
83	${INSTALL_DATA} ${WRKSRC}/share/linphone.pc ${PREFIX}/libdata/pkgconfig	84	${INSTALL_DATA} ${WRKSRC}/share/linphone.pc ${PREFIX}/libdata/pkgconfig
84	@${MKDIR} ${DATADIR}/sounds	85	@${MKDIR} ${DATADIR}/sounds

Lines 21-32 Link Here

(-)net/linphone-base/files/patch-coreapi::linphonecore.c (-9 lines)
21	/alsadev let the user use custom alsa device within linphone/	21	/alsadev let the user use custom alsa device within linphone/
22	devid=lp_config_get_string(lc->config,"sound","alsadev",NULL);	22	devid=lp_config_get_string(lc->config,"sound","alsadev",NULL);
23	if (devid){	23	if (devid){
24	@@ -2108,7 +2106,7 @@
25	if (olddev!=NULL && olddev!=lc->video_conf.device){
26	toggle_video_preview(lc,FALSE);/restart the video local preview/
27	}
28	- if (lc->ready){
29	+ if (lc->ready && lc->video_conf.device){
30	vd=ms_web_cam_get_string_id(lc->video_conf.device);
31	if (vd && strstr(vd,"Static picture")!=NULL){
32	vd=NULL;