10 files changed, 79 insertions, 117 deletions

diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index a86f41ae4370..e8bc75b1864a 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	linphone
-PORTVERSION=	1.6.0
+PORTVERSION=	1.7.0
 PORTEPOCH=	1
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SAVANNAH:S/$/:linphone/} \
@@ -21,17 +21,18 @@ COMMENT=	A web phone that supports SIP protocol
 
 LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
 		samplerate.1:${PORTSDIR}/audio/libsamplerate \
+		portaudio.0:${PORTSDIR}/audio/portaudio \
 		speex.1:${PORTSDIR}/audio/speex \
-		osip2.3:${PORTSDIR}/net/libosip2
+		osip2.3:${PORTSDIR}/net/libosip2 \
+		ortp.5:${PORTSDIR}/net/ortp
 
 USE_GNOME=	glib20 gnomehack gnometarget intlhack pkgconfig
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-LIBTOOLFILES=	configure mediastreamer2/configure oRTP/configure
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
-CONFIGURE_ARGS=	--disable-ipv6 --disable-gtk-doc --disable-ewarning \
-		--without-ilbc --disable-strict --disable-video \
+LIBTOOLFILES=	configure mediastreamer2/configure
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--disable-ipv6 --disable-manual --disable-ewarning \
+		--disable-strict --disable-video --enable-external-ortp \
 		--with-osip=${LOCALBASE}
 MAKE_ENV=	SUBDIRS="${SUBDIRS}"
 USE_LDCONFIG=	yes
@@ -59,19 +60,19 @@ LDFLAGS+=	-lintl
 .endif
 
 .if defined(LINPHONE_GUI)
-LIB_DEPENDS+=	linphone.7:${PORTSDIR}/net/linphone-base
+LIB_DEPENDS+=	linphone.8:${PORTSDIR}/net/linphone-base
 DESCR=		${PKGDIR}/pkg-descr.gui
 PLIST=		${PKGDIR}/pkg-plist.gui
 USE_GNOME+=	gnomepanel gnomeprefix
 MAN1=		linphone.1
 DATA_PATH=	share/gnome
-SUBDIRS=	pixmaps gnome
+SUBDIRS=	pixmaps gtk
 .else
 PKGNAMESUFFIX=	-base
-CONFIGURE_ARGS+=	--enable-gnome_ui=no
+CONFIGURE_ARGS+=	--enable-gtk_ui=no
 MAN1=		linphonec.1 sipomatic.1
 DATA_PATH=	share
-SUBDIRS=	po oRTP gsmlib mediastreamer2 media_api exosip coreapi console
+SUBDIRS=	po gsmlib mediastreamer2 media_api exosip coreapi console
 .endif
 
 post-extract:
@@ -82,13 +83,16 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s| =| ?=|g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e '/^SUBDIRS =/s|docs||g' ${WRKSRC}/oRTP/Makefile.in
+	@${REINPLACE_CMD} -e '/^imgdir =/s|(datadir)|(pkgdatadir)|g' \
+		${WRKSRC}/mediastreamer2/src/Makefile.in
 
 post-install:
 .if defined(LINPHONE_GUI)
 	${INSTALL_MAN} ${WRKSRC}/share/C/linphone.1 ${MANPREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/share/linphone.desktop \
 		${PREFIX}/share/gnome/applications
+	${INSTALL_DATA} ${WRKSRC}/share/linphone_applet.desktop \
+		${PREFIX}/share/gnome/applications
 .else
 	${INSTALL_MAN} ${WRKSRC}/share/C/linphonec.1 ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/share/C/sipomatic.1 ${MANPREFIX}/man/man1
diff --git a/net/linphone-base/distinfo b/net/linphone-base/distinfo
index 8784660c502a..3be6a0baace0 100644
--- a/net/linphone-base/distinfo
+++ b/net/linphone-base/distinfo
@@ -1,6 +1,6 @@
-MD5 (linphone-1.6.0.tar.gz) = fb345125e23c787df0818ff7caad5515
-SHA256 (linphone-1.6.0.tar.gz) = ba1c32207fd62d374c9397a81fb1247da93edb859e30d0d855dc65e5457f690b
-SIZE (linphone-1.6.0.tar.gz) = 7720841
+MD5 (linphone-1.7.0.tar.gz) = c9ba7cd5089fbd958a17c29d81da9ad5
+SHA256 (linphone-1.7.0.tar.gz) = f47b09889e5b8aacc3fd843ac1a98cbda7260bebab24e375df88bd80f0316a73
+SIZE (linphone-1.7.0.tar.gz) = 7537029
 MD5 (libosip2-2.2.2.tar.gz) = 40ee3ec89030f0d6dfdb2cf6100e6685
 SHA256 (libosip2-2.2.2.tar.gz) = 4e13febd65a2f8f18cb55151cd10f5f0888bf1e7dc2a4c0d54f39f170255de1c
 SIZE (libosip2-2.2.2.tar.gz) = 664050
diff --git a/net/linphone-base/files/patch-configure b/net/linphone-base/files/patch-configure
index 394bb877a114..fb6f6d5a1659 100644
--- a/net/linphone-base/files/patch-configure
+++ b/net/linphone-base/files/patch-configure
@@ -28,23 +28,3 @@
  for ac_func in getifaddrs
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-@@ -25210,9 +25189,8 @@
- 
- CPPFLAGS=$CPPFLAGS_save
- 
--LDFLAGS_save=$LDFLAGS
--LDFLAGS=$OSIP_LIBS
--LIBS_save=$LIBS
-+LIBS_save=$LDFLAGS
-+LIBS=$OSIP_LIBS
- 
- { echo "$as_me:$LINENO: checking for osip_message_init in -losipparser2" >&5
- echo $ECHO_N "checking for osip_message_init in -losipparser2... $ECHO_C" >&6; }
-@@ -25304,7 +25282,6 @@
-    { (exit 1); exit 1; }; }
- fi
- 
--LDFLAGS=$LDFLAGS_save
- LIBS=$LIBS_save
- 
- OSIP_LIBS="$OSIP_LIBS -losipparser2 -losip2"
diff --git a/net/linphone-base/files/patch-coreapi::linphonecore.c b/net/linphone-base/files/patch-coreapi::linphonecore.c
index 2b96bf3df5dd..b46618c64329 100644
--- a/net/linphone-base/files/patch-coreapi::linphonecore.c
+++ b/net/linphone-base/files/patch-coreapi::linphonecore.c
@@ -1,13 +1,24 @@
---- coreapi/linphonecore.c.orig	Fri Sep  8 18:16:44 2006
-+++ coreapi/linphonecore.c	Tue Sep 12 22:33:19 2006
-@@ -29,10 +29,8 @@
+--- coreapi/linphonecore.c.orig	Thu Apr  5 00:19:40 2007
++++ coreapi/linphonecore.c	Fri Apr 13 01:43:09 2007
+@@ -29,11 +29,9 @@
  #include "exevents.h"
  
  
 -#ifdef INET6  
  #ifndef WIN32
  #include <netdb.h>  
--#endif
  #endif
+-#endif
+ 
+ 
+ static const char *liblinphone_version=LIBLINPHONE_VERSION;
+@@ -1179,7 +1177,9 @@
+ 
+ void linphone_core_init_media_streams(LinphoneCore *lc){
+ 	lc->audiostream=audio_stream_new(linphone_core_get_audio_port(lc),linphone_core_ipv6_enabled(lc));
++#ifdef VIDEO_ENABLED
+ 	lc->videostream=video_stream_new(linphone_core_get_video_port(lc),linphone_core_ipv6_enabled(lc));
++#endif
+ }
  
- #include "enum.h"
+ void linphone_core_start_media_streams(LinphoneCore *lc, LinphoneCall *call){
diff --git a/net/linphone-base/files/patch-gnome::Makefile.in b/net/linphone-base/files/patch-gnome::Makefile.in
deleted file mode 100644
index c9bf78daeb20..000000000000
--- a/net/linphone-base/files/patch-gnome::Makefile.in
+++ /dev/null
@@ -1,40 +0,0 @@
---- gnome/Makefile.in.orig	Tue Jan 23 19:20:23 2007
-+++ gnome/Makefile.in	Sun Feb 25 15:31:13 2007
-@@ -73,8 +73,7 @@
- linphone_OBJECTS = $(am_linphone_OBJECTS)
- am__DEPENDENCIES_1 =
- @BUILD_GNOME_TRUE@linphone_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--@BUILD_GNOME_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
--@BUILD_GNOME_TRUE@	$(top_builddir)/coreapi/liblinphone.la
-+@BUILD_GNOME_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am__linphone_applet_SOURCES_DIST = linphone.c linphone.h gui_utils.c \
- 	gui_utils.h support.c support.h interface.c interface.h \
- 	callbacks.c callbacks.h presence.c presence.h propertybox.c \
-@@ -94,8 +93,7 @@
- @BUILD_GNOME_APPLET_TRUE@	linphone_applet-applet.$(OBJEXT)
- linphone_applet_OBJECTS = $(am_linphone_applet_OBJECTS)
- @BUILD_GNOME_APPLET_TRUE@linphone_applet_DEPENDENCIES =  \
--@BUILD_GNOME_APPLET_TRUE@	$(am__DEPENDENCIES_1) \
--@BUILD_GNOME_APPLET_TRUE@	$(top_builddir)/coreapi/liblinphone.la
-+@BUILD_GNOME_APPLET_TRUE@	$(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -332,7 +330,7 @@
- 
- @BUILD_GNOME_TRUE@linphone_LDADD = $(LIBGNOMEUI_LIBS) $(INTLLIBS) \
- @BUILD_GNOME_TRUE@				$(LIBGNOME_LIBS) \
--@BUILD_GNOME_TRUE@				$(top_builddir)/coreapi/liblinphone.la
-+@BUILD_GNOME_TRUE@				-llinphone
- 
- AM_CFLAGS = $(STRICT_OPTIONS) $(LIBGNOMEUI_CFLAGS) $(LIBGNOME_CFLAGS) $(GNOME_APPLETS_CFLAGS) $(IPV6_CFLAGS)	
- @BUILD_GNOME_APPLET_TRUE@gnome_appletdir = $(libexecdir)
-@@ -343,7 +341,7 @@
- @BUILD_GNOME_APPLET_TRUE@linphone_applet_CFLAGS = $(AM_CFLAGS) -DLINPHONE_APPLET
- @BUILD_GNOME_APPLET_TRUE@linphone_applet_LDADD = \
- @BUILD_GNOME_APPLET_TRUE@				$(GNOME_APPLETS_LIBS) \
--@BUILD_GNOME_APPLET_TRUE@				$(top_builddir)/coreapi/liblinphone.la
-+@BUILD_GNOME_APPLET_TRUE@				-llinphone
- 
- @BUILD_GNOME_APPLET_TRUE@serverdir = $(libdir)/bonobo/servers
- @BUILD_GNOME_APPLET_TRUE@server_in_files = GNOME_LinphoneApplet.server.in
diff --git a/net/linphone-base/files/patch-gtk__Makefile.in b/net/linphone-base/files/patch-gtk__Makefile.in
new file mode 100644
index 000000000000..f736802bf0e2
--- /dev/null
+++ b/net/linphone-base/files/patch-gtk__Makefile.in
@@ -0,0 +1,36 @@
+--- gtk/Makefile.in.orig	Tue Apr 10 05:06:20 2007
++++ gtk/Makefile.in	Fri Apr 13 03:49:05 2007
+@@ -73,7 +73,6 @@
+ am__DEPENDENCIES_1 =
+ @BUILD_GTK_TRUE@linphone_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ @BUILD_GTK_TRUE@	$(am__DEPENDENCIES_1) \
+-@BUILD_GTK_TRUE@	$(top_builddir)/coreapi/liblinphone.la \
+ @BUILD_GTK_TRUE@	$(am__DEPENDENCIES_1)
+ am__linphone_applet_SOURCES_DIST = linphone.c linphone.h gui_utils.c \
+ 	gui_utils.h support.c support.h interface.c interface.h \
+@@ -95,7 +94,6 @@
+ linphone_applet_OBJECTS = $(am_linphone_applet_OBJECTS)
+ @BUILD_GNOME_APPLET_TRUE@linphone_applet_DEPENDENCIES =  \
+ @BUILD_GNOME_APPLET_TRUE@	$(am__DEPENDENCIES_1) \
+-@BUILD_GNOME_APPLET_TRUE@	$(top_builddir)/coreapi/liblinphone.la \
+ @BUILD_GNOME_APPLET_TRUE@	$(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -335,7 +333,7 @@
+ @BUILD_GTK_TRUE@	$(linphone_common_sources)
+ 
+ @BUILD_GTK_TRUE@linphone_LDADD = $(LIBGTK_LIBS) $(INTLLIBS) \
+-@BUILD_GTK_TRUE@				$(top_builddir)/coreapi/liblinphone.la \
++@BUILD_GTK_TRUE@				-llinphone \
+ @BUILD_GTK_TRUE@				$(OSIP_LIBS)
+ 
+ AM_CFLAGS = $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS)	
+@@ -347,7 +345,7 @@
+ @BUILD_GNOME_APPLET_TRUE@linphone_applet_CFLAGS = $(AM_CFLAGS) $(GNOME_APPLETS_CFLAGS) -DLINPHONE_APPLET
+ @BUILD_GNOME_APPLET_TRUE@linphone_applet_LDADD = \
+ @BUILD_GNOME_APPLET_TRUE@				$(GNOME_APPLETS_LIBS) \
+-@BUILD_GNOME_APPLET_TRUE@				$(top_builddir)/coreapi/liblinphone.la \
++@BUILD_GNOME_APPLET_TRUE@				-llinphone \
+ @BUILD_GNOME_APPLET_TRUE@				$(OSIP_LIBS)
+ 
+ @BUILD_GNOME_APPLET_TRUE@serverdir = $(libdir)/bonobo/servers
diff --git a/net/linphone-base/files/patch-gnome-callbacks.c b/net/linphone-base/files/patch-gtk__callbacks.c
index b511a9c72232..3b36b7148914 100644
--- a/net/linphone-base/files/patch-gnome-callbacks.c
+++ b/net/linphone-base/files/patch-gtk__callbacks.c
@@ -1,6 +1,6 @@
---- gnome/callbacks.c.orig	Sat Jul  9 22:32:24 2005
-+++ gnome/callbacks.c	Thu Aug 25 23:44:43 2005
-@@ -595,9 +595,10 @@
+--- gtk/callbacks.c.orig	Wed Feb  7 18:11:10 2007
++++ gtk/callbacks.c	Fri Apr 13 03:42:46 2007
+@@ -626,9 +626,10 @@
                                          gpointer         user_data)
  {
  	gchar *sipurl;
diff --git a/net/linphone-base/files/patch-oRTP__src__stun_udp.c b/net/linphone-base/files/patch-oRTP__src__stun_udp.c
deleted file mode 100644
index 8591a5e4b146..000000000000
--- a/net/linphone-base/files/patch-oRTP__src__stun_udp.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- oRTP/src/stun_udp.c.orig	Fri Sep 22 16:19:58 2006
-+++ oRTP/src/stun_udp.c	Sun Feb 25 03:36:37 2007
-@@ -71,10 +71,10 @@
- #include <string.h>
- #include <stdio.h>
- #if !defined(WIN32) && !defined(_WIN32_WCE)
-+#include <sys/types.h> 
- #include <sys/ioctl.h>
- #include <sys/socket.h>
- #include <sys/time.h>
--#include <sys/types.h> 
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <netdb.h>
diff --git a/net/linphone-base/pkg-plist b/net/linphone-base/pkg-plist
index 8f667b1b5035..93c87cb61330 100644
--- a/net/linphone-base/pkg-plist
+++ b/net/linphone-base/pkg-plist
@@ -19,38 +19,20 @@ include/mediastreamer2/msv4l.h
 include/mediastreamer2/msvideo.h
 include/mediastreamer2/msvideoout.h
 include/mediastreamer2/waveheader.h
-include/ortp/event.h
-include/ortp/ortp.h
-include/ortp/payloadtype.h
-include/ortp/port.h
-include/ortp/rtcp.h
-include/ortp/rtp.h
-include/ortp/rtpsession.h
-include/ortp/rtpsignaltable.h
-include/ortp/sessionset.h
-include/ortp/str_utils.h
-include/ortp/stun.h
-include/ortp/stun_udp.h
-include/ortp/telephonyevents.h
 lib/liblinphone.a
 lib/liblinphone.la
 lib/liblinphone.so
-lib/liblinphone.so.7
+lib/liblinphone.so.8
 lib/libmediastreamer.a
 lib/libmediastreamer.la
 lib/libmediastreamer.so
 lib/libmediastreamer.so.0
-lib/libortp.a
-lib/libortp.la
-lib/libortp.so
-lib/libortp.so.5
 lib/libquickstream.a
 lib/libquickstream.la
 lib/libquickstream.so
 lib/libquickstream.so.0
 libdata/pkgconfig/linphone.pc
 libdata/pkgconfig/mediastreamer.pc
-libdata/pkgconfig/ortp.pc
 libexec/mediastream
 %%DATADIR%%/sounds/hello16000.wav
 %%DATADIR%%/sounds/hello8000.wav
@@ -63,6 +45,7 @@ libexec/mediastream
 %%DATADIR%%/sounds/rings/synth.wav
 %%DATADIR%%/sounds/rings/tapping.wav
 %%DATADIR%%/sounds/rings/toy.wav
+share/mediastreamer/images/nowebcamCIF.jpg
 %%NLS%%share/locale/cs/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/de/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/es/LC_MESSAGES/linphone.mo
@@ -77,9 +60,10 @@ libexec/mediastream
 %%NLS%%@dirrmtry share/locale/pl
 %%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/cs
+@dirrm share/mediastreamer/images
+@dirrm share/mediastreamer
 @dirrm %%DATADIR%%/sounds/rings
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%
-@dirrm include/ortp
 @dirrm include/mediastreamer2
 @dirrm include/linphone
diff --git a/net/linphone-base/pkg-plist.gui b/net/linphone-base/pkg-plist.gui
index 869f471afa4d..a722f7880a5d 100644
--- a/net/linphone-base/pkg-plist.gui
+++ b/net/linphone-base/pkg-plist.gui
@@ -2,6 +2,7 @@ bin/linphone
 libdata/bonobo/servers/GNOME_LinphoneApplet.server
 libexec/linphone_applet
 share/gnome/applications/linphone.desktop
+share/gnome/applications/linphone_applet.desktop
 share/gnome/gnome-2.0/ui/GNOME_LinphoneApplet.xml
 share/gnome/pixmaps/linphone/linphone.png
 share/gnome/pixmaps/linphone/linphone2.png