diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2009-05-10 18:34:10 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2009-05-10 18:34:10 +0000 |
| commit | a689361a468759e31acb582f0202c57f96480f7b (patch) | |
| tree | a69392dec029b240afd6b89bba86ef384a3970cb /net | |
| parent | 90ecd2093e7d2d0f3adae240fd2d54d59e729dc8 (diff) | |
| download | ports-a689361a468759e31acb582f0202c57f96480f7b.tar.gz ports-a689361a468759e31acb582f0202c57f96480f7b.zip | |
Notes
Diffstat (limited to 'net')
| -rw-r--r-- | net/linphone-base/Makefile | 9 | ||||
| -rw-r--r-- | net/linphone-base/distinfo | 6 | ||||
| -rw-r--r-- | net/linphone-base/files/patch-coreapi::linphonecore.c | 9 | ||||
| -rw-r--r-- | net/linphone-base/pkg-plist.gui | 1 |
4 files changed, 9 insertions, 16 deletions
diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile index 8ab79aa547a3..c3308788d881 100644 --- a/net/linphone-base/Makefile +++ b/net/linphone-base/Makefile @@ -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 @@ PLIST_SUB+= NLS="" .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 @@ SUBDIRS= pixmaps gtk-glade .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 @@ post-install: ${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 --git a/net/linphone-base/distinfo b/net/linphone-base/distinfo index 78adff18b868..f1b41a778f92 100644 --- a/net/linphone-base/distinfo +++ b/net/linphone-base/distinfo @@ -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 --git a/net/linphone-base/files/patch-coreapi::linphonecore.c b/net/linphone-base/files/patch-coreapi::linphonecore.c index 8e823e6cf30e..4052275f335a 100644 --- a/net/linphone-base/files/patch-coreapi::linphonecore.c +++ b/net/linphone-base/files/patch-coreapi::linphonecore.c @@ -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 --git a/net/linphone-base/pkg-plist.gui b/net/linphone-base/pkg-plist.gui index 0a2b8cb89ab2..4a0654f93ec5 100644 --- a/net/linphone-base/pkg-plist.gui +++ b/net/linphone-base/pkg-plist.gui @@ -15,6 +15,7 @@ share/applications/linphone.desktop %%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 |