Added missed patch, thank Willard Dawson for report in bug #320739 and Rion for xmpp report.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 133 insertions, 2 deletions

diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog
index 9d6865c35e26..db1d23c1fff8 100644
--- a/net-voip/linphone/ChangeLog
+++ b/net-voip/linphone/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-voip/linphone
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.47 2010/05/20 13:05:12 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.48 2010/05/21 06:32:44 pva Exp $
+
+  21 May 2010; Peter Volkov <pva@gentoo.org>
+  +files/linphone-3.2.99.1-external-mediastreamer.patch:
+  Added missed patch, thank Willard Dawson for report in bug #320739 and
+  Rion for xmpp report.
 
 *linphone-3.3.0 (20 May 2010)
 
diff --git a/net-voip/linphone/Manifest b/net-voip/linphone/Manifest
index 41e3b6d2650d..1c62547cc5fb 100644
--- a/net-voip/linphone/Manifest
+++ b/net-voip/linphone/Manifest
@@ -4,6 +4,7 @@ AUX linphone-3.2.1-external-mediastreamer.patch 3591 RMD160 8fefd2f6de05ec7c1c96
 AUX linphone-3.2.1-linphone.desktop.patch 395 RMD160 2ae8271d7e5bf996a722cc31a51ab4786862476b SHA1 97d3f455108959563dfc2b165b61e33138bb6da1 SHA256 016fc455b710a6d1d5781fb2a6f9d820beb0519b821c122830f831d922799272
 AUX linphone-3.2.1-log-window-crash.patch 514 RMD160 2190f6023f4d97883316b3ff0aeb679a49fc7d2c SHA1 e7e5be8dae19ac9b16608daa9a205777e8905c76 SHA256 f0faa9d90aed4ea06fee608bc06785a757b8e6c25dea7ae6abdd954466a9759c
 AUX linphone-3.2.1-nls.patch 426 RMD160 19c1292f26fc7d36846d115ef5423635c4d8c828 SHA1 48c2ee4547e2e6db065856a5f7563fc45fd5f9a0 SHA256 e35323e1166fcf826ac9c4e53db62fb522846a7b0316353edffc1fb74fd43758
+AUX linphone-3.2.99.1-external-mediastreamer.patch 3596 RMD160 7c50fd52c204d48c32a572a5196dc622566fed65 SHA1 4da5689b8eecc261a75b59a00b733dbbf2cf15c6 SHA256 65c8bfec4ad8761ff2fd170d5e3e583a3f0635c45a2ada6b9b1be06a55df3ae3
 DIST linphone-3.1.1.tar.gz 7809388 RMD160 a2c1bb3c96bb95cabbe605de463af2993ae3e9ff SHA1 820fad3d273975cc8493d3dabf7959ef59fe7c4d SHA256 d4f4cbf9da3c0437a9f2e181eea611adbefc6b4a7073cf8d8f3ac0fe795c8eff
 DIST linphone-3.1.2.tar.gz 7732132 RMD160 21738be63d1cda9a710d22aaac647c7b6a0a45b6 SHA1 a44e03849977ac8e99589b2a021948c9643cdc3d SHA256 2e676f2bc6aeed7753458079355fc64362c75b530913e9226cd4abd9257cbf17
 DIST linphone-3.2.1.tar.gz 7906185 RMD160 8ed4b172dc2b9ad90d8bf4da82dbbc8b16e6b169 SHA1 ff5434372465ccfd059de1a26f4712f30f5f9ed7 SHA256 b34bf066e07895b4d7b51a4a64e2a7524ab1cb755c996ef208293228c7bc4e69
@@ -14,5 +15,5 @@ EBUILD linphone-3.2.1-r1.ebuild 3090 RMD160 736b8590992a2f618ec73f681902bfe63ceb
 EBUILD linphone-3.2.1-r2.ebuild 3168 RMD160 c90f83913871194d8d8297432516c9b31c8905b0 SHA1 fea5b007b774c1d436b6c863e220cefa84db44dd SHA256 700af0debdd337af6439c1b261b07ab59508d647f913fd3901173f5ef4a6646a
 EBUILD linphone-3.2.1.ebuild 2999 RMD160 bf83c752b2c40cfd4f751027d2737f9ae52fe4c5 SHA1 2042ec53f17950dc98b00ce9e0265fbd15462876 SHA256 262fa944c70d066efda49851448ebadc73f335c4fded97a203a90c988db19be8
 EBUILD linphone-3.3.0.ebuild 3132 RMD160 12845700ed7d055af883f7ff540ce2d3fd9f3b72 SHA1 322bbb115070b5e1e8f8a697d4d1319bf70fbd66 SHA256 42c3f67d6a3f506da3502f6907bfbce092e216020f55984463c63e9caff62fbe
-MISC ChangeLog 13517 RMD160 c480e1c5f123bc4dc6ae6b4bf74594c343cb0c68 SHA1 9f77d33631122919176351f3e5a1628e4506e895 SHA256 1235102905ab5a6487b132d8c272b55df4a696ae841f550d8d10059c96ced3dc
+MISC ChangeLog 13717 RMD160 779beb54fc3154e42d2b299292d6c50d6d7c2a0d SHA1 d4e29904026f0ff4d66968b437abf5f0d4fac60e SHA256 56475fb4c74ebf2cc11baa336420de19ec3b0e1882f6a20eba7ed8f5feac063e
 MISC metadata.xml 335 RMD160 0e09a4bd66327fe8397d95c19df4fa884886444b SHA1 b7056729ec82619f4edc4dfe90c5c53ec780f638 SHA256 008f606df7bbbc280b1a0b4a31a7b653858c7ccfe3c99f476547c037189f7fdf
diff --git a/net-voip/linphone/files/linphone-3.2.99.1-external-mediastreamer.patch b/net-voip/linphone/files/linphone-3.2.99.1-external-mediastreamer.patch
new file mode 100644
index 000000000000..f4403d76973b
--- /dev/null
+++ b/net-voip/linphone/files/linphone-3.2.99.1-external-mediastreamer.patch
@@ -0,0 +1,125 @@
+=== modified file 'configure.in'
+--- configure.in	2010-04-09 04:05:31 +0000
++++ configure.in	2010-04-09 04:10:45 +0000
+@@ -360,7 +360,26 @@
+ 
+ AC_SUBST(STRICT_OPTIONS)
+ 
+-AC_CONFIG_SUBDIRS( mediastreamer2 )
++AC_ARG_ENABLE(external-mediastreamer,
++      [  --enable-external-mediastreamer Use external mediastreamer library],
++      [case "${enableval}" in
++        yes) external_mediastreamer=true ;;
++        no)  external_mediastreamer=false ;;
++        *) AC_MSG_ERROR(bad value ${enableval} for --enable-external-mediastreamer) ;;
++      esac],[external_mediastreamer=false])
++
++if test "$external_mediastreamer" = 'true'; then
++	LP_CHECK_MSTREAMER
++else
++	AC_CONFIG_SUBDIRS( mediastreamer2 )
++	MSTREAMER_CFLAGS="-I\$(top_srcdir)/mediastreamer2/include"
++	MSTREAMER_LIBS="\$(top_builddir)/mediastreamer2/src/libmediastreamer.la"
++fi
++
++AC_SUBST(MSTREAMER_CFLAGS)
++AC_SUBST(MSTREAMER_LIBS)
++
++AM_CONDITIONAL(EXTERNAL_MSTREAMER, [test "$external_mediastreamer" = 'true'])
+ 
+ dnl check for db2html (docbook) to generate html user manual
+ AC_CHECK_PROG(have_sgmltools,sgmltools, yes, no)
+
+=== modified file 'console/Makefile.am'
+--- console/Makefile.am	2010-04-09 04:05:31 +0000
++++ console/Makefile.am	2010-04-09 04:10:45 +0000
+@@ -9,7 +9,7 @@
+ 	-I$(top_srcdir)/coreapi\
+ 	$(ORTP_CFLAGS) \
+ 	-I$(top_srcdir)/exosip \
+-	-I$(top_srcdir)/mediastreamer2/include
++	$(MSTREAMER_CFLAGS)
+ 
+ 
+ 
+@@ -22,7 +22,7 @@
+ linphonec_SOURCES = linphonec.c linphonec.h commands.c
+ linphonec_CFLAGS=$(COMMON_CFLAGS) $(CONSOLE_FLAGS)
+ linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS)  \
+-		$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
++		$(MSTREAMER_LIBS) \
+ 		$(ORTP_LIBS) \
+ 		$(SPEEX_LIBS) \
+ 		$(OSIP_LIBS)
+@@ -41,7 +41,7 @@
+ 
+ sipomatic_LDADD= 	$(INTLLIBS)  \
+ 			$(top_builddir)/coreapi/liblinphone.la \
+-			$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
++			$(MSTREAMER_LIBS) \
+ 			$(ORTP_LIBS) \
+ 			$(SPEEX_LIBS) \
+ 			$(OSIP_LIBS)
+
+=== modified file 'coreapi/Makefile.am'
+--- coreapi/Makefile.am	2010-04-09 04:05:31 +0000
++++ coreapi/Makefile.am	2010-04-09 04:10:45 +0000
+@@ -10,7 +10,7 @@
+ 
+ INCLUDES = \
+ 	-I$(top_srcdir)\
+-	-I$(top_srcdir)/mediastreamer2/include
++	$(MSTREAMER_CFLAGS)
+ 
+ 
+ lib_LTLIBRARIES=liblinphone.la
+@@ -41,7 +41,7 @@
+ 
+ liblinphone_la_LIBADD= \
+ 		$(EXOSIP_LIBS) \
+-		$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
++		$(MSTREAMER_LIBS) \
+ 		$(ORTP_LIBS)
+ 
+ if BUILD_WIN32
+
+=== modified file 'gtk-glade/Makefile.am'
+--- gtk-glade/Makefile.am	2010-04-09 04:05:31 +0000
++++ gtk-glade/Makefile.am	2010-04-09 04:11:22 +0000
+@@ -47,8 +47,8 @@
+ 			loginframe.c \
+ 			linphone.h 
+ 
+-linphone_3_LDADD=$(top_builddir)/oRTP/src/libortp.la \
+-		$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
++linphone_3_LDADD=$(ORTP_LIBS) \
++		$(MSTREAMER_LIBS) \
+ 		$(top_builddir)/coreapi/liblinphone.la \
+ 			$(LIBGTK_LIBS) $(INTLLIBS) \
+ 			$(LIBGLADE_LIBS)
+@@ -77,7 +77,7 @@
+ 
+ 
+ AM_CFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \
+-		-I$(top_srcdir)/mediastreamer2/include/ \
++		$(MSTREAMER_CFLAGS) \
+ 		$(ORTP_CFLAGS) \
+ 		$(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
+ 		$(OSIP_CFLAGS) 
+
+=== added file 'm4/mstreamer.m4'
+--- m4/mstreamer.m4	1970-01-01 00:00:00 +0000
++++ m4/mstreamer.m4	2010-02-11 15:16:28 +0000
+@@ -0,0 +1,11 @@
++AC_DEFUN([LP_CHECK_MSTREAMER],[
++
++PKG_CHECK_MODULES([MSTREAMER], [mediastreamer >= 2.2.3], , [ms_failed=true])
++
++if test "$ms_failed" = "true"; then
++	AC_MSG_ERROR("External mediastreamer library not found")
++fi
++
++AC_SUBST([MSTREAMER_LIBS])
++AC_SUBST([MSTREAMER_CFLAGS])
++])
+