Update to 1.3.5.

PR:		ports/95595
Submitted by:	KATO Tsuguru <tkato432 (at) yahoo.com>

11 files changed, 123 insertions, 89 deletions

diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index 21e176f69a52..92b44dd1df6d 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -24,6 +24,7 @@ LIB_DEPENDS=	gsm.1:${PORTSDIR}/audio/gsm \
 		osip2.3:${PORTSDIR}/net/libosip2
 
 USE_GNOME=	glib20 gnomehack gnometarget intlhack pkgconfig
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 LIBTOOLFILES=	configure oRTP/configure
diff --git a/net/linphone-base/Makefile.common b/net/linphone-base/Makefile.common
index 35a04f0814bb..13cceac03ac7 100644
--- a/net/linphone-base/Makefile.common
+++ b/net/linphone-base/Makefile.common
@@ -3,7 +3,7 @@
 #
 
 LINPHONE_PORTNAME=	linphone
-LINPHONE_PORTVERSION=	1.3.0
+LINPHONE_PORTVERSION=	1.3.5
 LINPHONE_PORTREVISION=	0
 LINPHONE_PORTEPOCH=	1
 LINPHONE_MASTER_SITES=	http://simon.morlat.free.fr/download/stable/source/
diff --git a/net/linphone-base/distinfo b/net/linphone-base/distinfo
index 699404df251c..248ffec5d4ff 100644
--- a/net/linphone-base/distinfo
+++ b/net/linphone-base/distinfo
@@ -1,3 +1,3 @@
-MD5 (linphone-1.3.0.tar.gz) = a96ab62413949ec2977df38ea830f7ce
-SHA256 (linphone-1.3.0.tar.gz) = 29e8e6238b02a17058a2150df97be227428e43cd009f1f8eadb8b72eceb5daa3
-SIZE (linphone-1.3.0.tar.gz) = 7388450
+MD5 (linphone-1.3.5.tar.gz) = 522b08a22c5e1de281676cddd3f2bcf6
+SHA256 (linphone-1.3.5.tar.gz) = b1036fde820c928b877a7065a8e396a7aaf262df125da96c6f6b56f02097a1f3
+SIZE (linphone-1.3.5.tar.gz) = 7411961
diff --git a/net/linphone-base/files/patch-Makefile.in b/net/linphone-base/files/patch-Makefile.in
index 0933cf55ab48..4bd60b8d785c 100644
--- a/net/linphone-base/files/patch-Makefile.in
+++ b/net/linphone-base/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- Makefile.in.orig	Tue Mar 22 00:53:37 2005
-+++ Makefile.in	Wed Mar 23 18:51:15 2005
-@@ -274,9 +274,11 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- @BUILD_TRUESPEECH_TRUE@WIN32ACM_DIR = win32acm
+--- Makefile.in.orig	Tue Apr  4 17:18:50 2006
++++ Makefile.in	Wed Apr  5 12:43:31 2006
+@@ -289,9 +289,11 @@
+ 
+ # let make re-run automake upon need
+ ACLOCAL_AMFLAGS = -I m4
 -SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \
 +ifndef SUBDIRS
 +SUBDIRS = m4 support po ipkg oRTP lpc10-1.5 \
diff --git a/net/linphone-base/files/patch-configure b/net/linphone-base/files/patch-configure
index 00f442961b29..38e35fd9e371 100644
--- a/net/linphone-base/files/patch-configure
+++ b/net/linphone-base/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sat Mar  4 01:55:47 2006
-+++ configure	Sat Mar 11 01:28:23 2006
-@@ -23532,23 +23532,6 @@
+--- configure.orig	Sat Apr  1 01:54:31 2006
++++ configure	Sat Apr  1 01:54:31 2006
+@@ -23542,23 +23542,6 @@
  fi
  
  
@@ -24,3 +24,62 @@
  found_sound=no
  
  
+@@ -27917,12 +27900,12 @@
+         pkg_cv_SPEEX_CFLAGS="$SPEEX_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"speex >= 1.1.12\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "speex >= 1.1.12") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"speex >= 1.0.5\"") >&5
++  ($PKG_CONFIG --exists --print-errors "speex >= 1.0.5") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_SPEEX_CFLAGS=`$PKG_CONFIG --cflags "speex >= 1.1.12" 2>/dev/null`
++  pkg_cv_SPEEX_CFLAGS=`$PKG_CONFIG --cflags "speex >= 1.0.5" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -27935,12 +27918,12 @@
+         pkg_cv_SPEEX_LIBS="$SPEEX_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"speex >= 1.1.12\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "speex >= 1.1.12") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"speex >= 1.0.5\"") >&5
++  ($PKG_CONFIG --exists --print-errors "speex >= 1.0.5") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_SPEEX_LIBS=`$PKG_CONFIG --libs "speex >= 1.1.12" 2>/dev/null`
++  pkg_cv_SPEEX_LIBS=`$PKG_CONFIG --libs "speex >= 1.0.5" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -27959,14 +27942,14 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        SPEEX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "speex >= 1.1.12"`
++	        SPEEX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "speex >= 1.0.5"`
+         else
+-	        SPEEX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "speex >= 1.1.12"`
++	        SPEEX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "speex >= 1.0.5"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$SPEEX_PKG_ERRORS" >&5
+ 
+-	{ { echo "$as_me:$LINENO: error: Package requirements (speex >= 1.1.12) were not met:
++	{ { echo "$as_me:$LINENO: error: Package requirements (speex >= 1.0.5) were not met:
+ 
+ $SPEEX_PKG_ERRORS
+ 
+@@ -27977,7 +27960,7 @@
+ and SPEEX_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-echo "$as_me: error: Package requirements (speex >= 1.1.12) were not met:
++echo "$as_me: error: Package requirements (speex >= 1.0.5) were not met:
+ 
+ $SPEEX_PKG_ERRORS
+ 
diff --git a/net/linphone-base/files/patch-coreapi::linphonecore.c b/net/linphone-base/files/patch-coreapi::linphonecore.c
index b28ea91b165c..1d02c1922193 100644
--- a/net/linphone-base/files/patch-coreapi::linphonecore.c
+++ b/net/linphone-base/files/patch-coreapi::linphonecore.c
@@ -1,5 +1,5 @@
---- coreapi/linphonecore.c.orig	Thu Dec  8 02:37:31 2005
-+++ coreapi/linphonecore.c	Tue Dec 20 13:24:10 2005
+--- coreapi/linphonecore.c.orig	Sat Mar 11 00:19:17 2006
++++ coreapi/linphonecore.c	Sat Apr  1 00:57:53 2006
 @@ -36,9 +36,7 @@
  #include <arpa/inet.h>
  #include <time.h>
@@ -10,17 +10,3 @@
  
  #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 --git a/net/linphone-base/files/patch-mediastreamer2::Makefile.in b/net/linphone-base/files/patch-mediastreamer2::Makefile.in
index 06d72049f4c2..4a92796a9685 100644
--- a/net/linphone-base/files/patch-mediastreamer2::Makefile.in
+++ b/net/linphone-base/files/patch-mediastreamer2::Makefile.in
@@ -1,12 +1,25 @@
---- mediastreamer2/Makefile.in.orig	Wed Mar  8 19:41:19 2006
-+++ mediastreamer2/Makefile.in	Sat Mar 11 01:23:47 2006
-@@ -310,8 +310,7 @@
- 				msfileplayer.c 	msfileplayer.h waveheader.h\
- $(am__append_1)
- libmediastreamer2_la_LIBADD = $(top_builddir)/oRTP/src/libortp.la \
--				$(ALSA_LIBS) \
--				-lrt
-+				$(ALSA_LIBS)
- 
- INCLUDES = -I$(top_srcdir)/oRTP/include
+--- mediastreamer2/Makefile.in.orig	Sat Apr  1 00:58:16 2006
++++ mediastreamer2/Makefile.in	Sat Apr  1 00:59:37 2006
+@@ -64,7 +64,7 @@
+ libmediastreamer2_la_DEPENDENCIES =  \
+ 	$(top_builddir)/oRTP/src/libortp.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/gsmlib/libgsm.la $(am__DEPENDENCIES_2)
++	$(am__DEPENDENCIES_2)
+ am__libmediastreamer2_la_SOURCES_DIST = mscommon.c mscommon.h \
+ 	allfilters.h msfilter.c msfilter.h msvideo.h msqueue.c \
+ 	msqueue.h msticker.c msticker.h alaw.c g711common.h ulaw.c \
+@@ -360,11 +360,10 @@
+ 				$(ALSA_LIBS) \
+ 				$(ARTS_LIBS) \
+ 				$(SPEEX_LIBS) \
+-				$(top_builddir)/gsmlib/libgsm.la \
+-				-lrt\
++				-lgsm\
+ $(am__append_6)
+ libquickstream_la_LIBADD = libmediastreamer2.la
+-INCLUDES = -I$(top_srcdir)/oRTP/include -I$(top_srcdir)/gsmlib
++INCLUDES = -I$(top_srcdir)/oRTP/include
  ORTP_CFLAGS = `cat $(top_builddir)/oRTP/ortp.defs`
+ AM_CFLAGS = $(ORTP_CFLAGS) $(SPEEX_CFLAGS) $(STRICT_OPTIONS)
+ all: $(BUILT_SOURCES)
diff --git a/net/linphone-base/files/patch-mediastreamer2__mssync.c b/net/linphone-base/files/patch-mediastreamer2__mssync.c
deleted file mode 100644
index 59a35367ef65..000000000000
--- a/net/linphone-base/files/patch-mediastreamer2__mssync.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- mediastreamer2/mssync.c.orig	Sat Mar  4 06:07:01 2006
-+++ mediastreamer2/mssync.c	Sat Mar 11 01:21:51 2006
-@@ -194,6 +194,7 @@
- 	MSSync *s=(MSSync*)arg;
- 	uint64_t realtime;
- 	uint64_t orig=get_cur_time();
-+	int64_t diff;
- 	s->ticks=1;
- 	ms_mutex_lock(&s->lock);
- 	while(s->run){
-@@ -203,7 +204,7 @@
- 		s->time+=s->interval;
- 		while(1){
- 			realtime=get_cur_time()-orig;
--			int64_t diff=s->time-realtime;
-+			diff=s->time-realtime;
- 			if (diff>0){
- 				/* sleep until next tick */
- 				sleepMs(diff);
diff --git a/net/linphone-base/files/patch-mediastreamer2__oss.c b/net/linphone-base/files/patch-mediastreamer2__oss.c
new file mode 100644
index 000000000000..ee224e058009
--- /dev/null
+++ b/net/linphone-base/files/patch-mediastreamer2__oss.c
@@ -0,0 +1,13 @@
+--- mediastreamer2/oss.c.orig	Fri Mar 24 18:30:55 2006
++++ mediastreamer2/oss.c	Sat Apr  1 01:00:49 2006
+@@ -30,7 +30,10 @@
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+ #include <unistd.h>
++
++#ifdef HAVE_ALLOCA_H
+ #include <alloca.h>
++#endif
+ 
+ MSFilter *ms_oss_read_new(MSSndCard *card);
+ MSFilter *ms_oss_write_new(MSSndCard *card);
diff --git a/net/linphone-base/files/patch-oRTP__src__rtpparse.c b/net/linphone-base/files/patch-oRTP__src__rtpparse.c
deleted file mode 100644
index 972324a03631..000000000000
--- a/net/linphone-base/files/patch-oRTP__src__rtpparse.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- oRTP/src/rtpparse.c.orig	Wed Feb  1 01:06:16 2006
-+++ oRTP/src/rtpparse.c	Sat Mar 11 01:12:41 2006
-@@ -70,6 +70,7 @@
- 	int msgsize;
- 	RtpStream *rtpstream=&session->rtp;
- 	rtp_stats_t *stats=&rtpstream->stats;
-+	poly32_t *extseq;
- 	
- 	return_if_fail(mp!=NULL);
- 	
-@@ -120,7 +121,7 @@
- 	}else session->recv_ssrc=rtp->ssrc;
- 	
- 	/* update some statistics */
--	poly32_t *extseq=(poly32_t*)&rtpstream->hwrcv_extseq;
-+	extseq=(poly32_t*)&rtpstream->hwrcv_extseq;
- 	if (rtp->seq_number>extseq->split.lo){
- 		extseq->split.lo=rtp->seq_number;
- 	}else if (rtp->seq_number<200 && extseq->split.lo>((1<<16) - 200)){
diff --git a/net/linphone-base/pkg-plist b/net/linphone-base/pkg-plist
index 24bce0bc6183..458f79a854a5 100644
--- a/net/linphone-base/pkg-plist
+++ b/net/linphone-base/pkg-plist
@@ -40,15 +40,15 @@ libexec/mediastream
 %%DATADIR%%/sounds/rings/synth.wav
 %%DATADIR%%/sounds/rings/tapping.wav
 %%DATADIR%%/sounds/rings/toy.wav
-share/doc/linphone/mediastreamer/book1.html
-share/doc/linphone/mediastreamer/coreapi.html
-share/doc/linphone/mediastreamer/index.sgml
-share/doc/linphone/mediastreamer/mediastreamer-filters.html
-share/doc/linphone/mediastreamer/mediastreamer-msringplayer.html
-share/doc/linphone/mediastreamer/mediastreamer-mssync.html
-share/doc/linphone/mediastreamer/mediastreamer-running-processing-chains.html
-share/doc/linphone/mediastreamer/msfilterimplementations.html
-share/doc/linphone/mediastreamer/userapi.html
+%%DOCSDIR%%/mediastreamer/book1.html
+%%DOCSDIR%%/mediastreamer/coreapi.html
+%%DOCSDIR%%/mediastreamer/index.sgml
+%%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
 share/locale/cs/LC_MESSAGES/linphone.mo
 share/locale/de/LC_MESSAGES/linphone.mo
 share/locale/es/LC_MESSAGES/linphone.mo
@@ -59,8 +59,8 @@ share/locale/nl/LC_MESSAGES/linphone.mo
 share/locale/pl/LC_MESSAGES/linphone.mo
 share/locale/pt_BR/LC_MESSAGES/linphone.mo
 share/locale/sv/LC_MESSAGES/linphone.mo
-@dirrm share/doc/linphone/mediastreamer
-@dirrm share/doc/linphone
+@dirrm %%DOCSDIR%%/mediastreamer
+@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/sounds/rings
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%